Merge branch 'master' into autodownloader

This commit is contained in:
Jack 2015-12-03 21:09:26 -05:00
commit f15b67d386
3 changed files with 25 additions and 14 deletions

14
.gitignore vendored
View file

@ -1 +1,15 @@
*.pyc *.pyc
*.xml
.idea/.name
*.iml
*.log
*.txt
lbrynet.egg-info/PKG-INFO
*.egg

View file

@ -8,7 +8,7 @@ Download the file https://raw.githubusercontent.com/lbryio/lbry-setup/master/lbr
Once it's done building, type: Once it's done building, type:
./lbrycrd/src/lbrycrdd -server -daemon -gen ./lbrycrd/src/lbrycrdd -server -daemon
lbrynet-gui lbrynet-gui
@ -91,12 +91,13 @@ In order to use lbrynet-console or lbrynet-gui, lbyrcrdd must be running.
If you ran the easy install script, the lbrycrd folder will be in the directory you ran lbry_setup.sh from. Otherwise it is the root of the cloned lbrycrd repository. Go to that directory. If you ran the easy install script, the lbrycrd folder will be in the directory you ran lbry_setup.sh from. Otherwise it is the root of the cloned lbrycrd repository. Go to that directory.
./src/lbrycrdd -server -daemon
If you want to mine LBC, also use the flag '-gen', so:
./src/lbrycrdd -server -daemon -gen ./src/lbrycrdd -server -daemon -gen
It will take a few minutes for your client to download the whole block chain. It will take a few minutes for your client to download the whole block chain.
Once it has caught up, it will start mining coins.
If you don't want to mine, leave off the '-gen' flag.
lbrycrdd must be running in order for lbrynet to function. lbrycrdd must be running in order for lbrynet to function.
@ -112,19 +113,15 @@ In your terminal:
lbrynet-console lbrynet-console
You should now be presented with a list of options. You should be presented with a prompt.
Watch It's a Wonderful Life via LBRY Watch It's a Wonderful Life via LBRY
Choose the option labeled Add a stream from a short name by typing the number next to it and pressing the enter key. Type into the prompt:
You will be prompted for a name. Type in "wonderfullife" and hit enter. After a few seconds, you will prompted to choose what you want to do with the file. Select the option labeled Stream. get wonderfullife
You will be shown some options related to the file which you do not care about. Type 'n' and hit enter. To shut it down, type ctrl-c at any time or enter 'exit' into the prompt.
You will be prompted to choose if you really want to download this file. Type 'y' and hit enter.
To shut it down, type ctrl-c at any time or enter the option to shut down from the main menu.
### Option 2) Running lbrynet-gui ### Option 2) Running lbrynet-gui

View file

@ -8,7 +8,7 @@ from setuptools import setup, find_packages
setup(name='lbrynet', setup(name='lbrynet',
version='0.0.4', version='0.0.4',
packages=find_packages(), packages=find_packages(),
install_requires=['pycrypto', 'twisted', 'miniupnpc', 'yapsy', 'seccure', 'python-bitcoinrpc', 'txJSON-RPC', 'requests', 'unqlite', 'leveldb'], install_requires=['pycrypto', 'twisted', 'miniupnpc', 'yapsy', 'seccure', 'python-bitcoinrpc==0.1', 'txJSON-RPC', 'requests', 'unqlite', 'leveldb'],
entry_points={ entry_points={
'console_scripts': [ 'console_scripts': [
'lbrynet-console = lbrynet.lbrynet_console.LBRYConsole:launch_lbry_console', 'lbrynet-console = lbrynet.lbrynet_console.LBRYConsole:launch_lbry_console',