Merge branch 'development'

INSTALL.md

@@ -1,38 +1,14 @@
-Prerequisites
--------------
-
-To use the LBRYWallet, which enables spending and accepting LBRYcrds in exchange for data, the
-LBRYcrd application (insert link to LBRYcrd website here) must be installed and running. If
-this is not desired, the testing client can be used to simulate trading points, which is
-built into LBRYnet.
-
-on Ubuntu:
-
-```
-sudo apt-get install libgmp3-dev build-essential python-dev python-pip
-```
-
-Getting the source
-------------------
-
-Don't you already have it?
-
-Setting up the environment
+#### Installing lbrynet on Linux
 --------------------------
 
-It's recommended that you use a virtualenv
-
-```
-sudo apt-get install python-virtualenv
-cd <source base directory>
-virtualenv .
-source bin/activate
-```
+The following packages are necessary (the following are their names on Ubuntu):
+libgmp3-dev build-essential python2.7 python2.7-dev python-pip
 
-(to deactivate the virtualenv, enter 'deactivate')
+To install them on Ubuntu:
+sudo apt-get install libgmp3-dev build-essential python2.7 python2.7-dev python-pip
 
-```
-python setup.py install
+python setup.py build bdist_egg
+sudo python setup.py install
 ```
 
 this will install all of the libraries and a few applications

MANIFEST.in

@@ -0,0 +1,2 @@
+include lbrynet/lbrynet_console/plugins/blindrepeater.yapsy-plugin
+recursive-include lbrynet/lbrynet_gui *.gif *.ico *.xbm *.conf

README.md

@@ -37,7 +37,7 @@ See [INSTALL](INSTALL.md)
 ## Developers
 
 Documentation: doc.lbry.io
-Source code: trac.lbry.io/browser
+Source code: https://github.com/lbryio/lbry
 
 To contribute to the development of LBRYnet or lbrynet-console, contact jimmy@lbry.io
 

RUNNING.md

@@ -9,20 +9,38 @@ Download the file https://raw.githubusercontent.com/lbryio/lbry-setup/master/lbr
 Once it's done building, type:
 
 ```
-./lbrycrd/src/lbrycrdd -server -daemon
-lbrynet-gui
+lbrynet-console
 ```
 
-A window should show up with an entry box
+A console application will load, and after a moment you will be presented with a ">" signifying
+that the console is ready for commands.
 
-Type wonderfullife into the box, hit go, and choose to stream or save
+If it's your first time running lbrynet-console, you should be given some credits to test the
+network. If they don't show up within a minute or two, let us know, and we'll send you some.
 
-To stop lbrycrdd: `./lbrycrd/src/lbrycrd-cli stop`
+After your credits have shown up, type
+
+```
+get wonderfullife
+```
+
+into the prompt and hit enter.
+
+You will be asked if you want to cancel, change options, save, and perhaps stream the file.
+
+Enter 's' for save and then hit enter.
+
+The file should start downloading. Enter the command 'status' to check on the status of files
+that are in the process of being downloaded.
+
+To stop lbrynet-console, enter the command 'exit'.
 
 
 ## Slightly longer install guide
 
-### Installing lbrycrd from source
+### Installing lbrycrd, the full blockchain client
+
+Note: this process takes upwards of an hour and is not necessary to use lbrynet.
 
 ```
 git clone --depth=1 -b alpha https://github.com/lbryio/lbrycrd.git
@@ -89,11 +107,21 @@ sudo python setup.py install
 
 ## Slightly longer running guide
 
-###In order to use lbrynet-console or lbrynet-gui, lbyrcrd must be running.
+### lbrynet-console can be set to use lbrycrdd instead of the built in lightweight client.
+
+To run lbrynet-console with lbrycrdd:
+
+```
+lbrynet-console </path/to/lbrycrdd>
+```
+
+If lbrycrdd is not already running, lbrynet will launch it at that path, and will shut it down
+when lbrynet exits. If lbrycrdd is already running, lbrynet will not launch it and will not
+shut it down, but it will connect to it and use it.
 
-### Running lbrycrd
+### Running lbrycrdd manually
 
-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.
+From the lbrycrd directory, run:
 
 ```
 ./src/lbrycrdd -server -daemon
@@ -105,37 +133,14 @@ If you want to mine LBC, also use the flag '-gen', so:
 ./src/lbrycrdd -server -daemon -gen
 ```
 
-It will take a few minutes for your client to download the whole block chain.
+Warning: This will put a heavy load on your CPU
 
-lbrycrdd must be running in order for lbrynet to function.
+It will take a few minutes for your client to download the whole block chain.
 
-To shut lbrycrdd down: from the lbrycrd directory, run
+To shut lbrycrdd down: from the lbrycrd directory, run:
 
 ```
 ./src/lbrycrd-cli stop
 ```
 
-### Option 1) Running lbrynet-console
-
-If you used the virtualenv instructions above, make sure the virtualenv is still active. If not, reactivate it according to the instructions above, under "Installing lbrynet from source"
-
-In your terminal: `lbrynet-console`
-
-You should be presented with a prompt.
-
-Watch It's a Wonderful Life via LBRY
-
-Type into the prompt: `get wonderfullife`
-
-To shut it down, press ctrl-c at any time or enter `exit` into the prompt.
-
-### Option 2) Running lbrynet-gui
-
-If you used the virtualenv instructions above, make sure the virtualenv is still active. If not, reactivate it according to the instructions above, under "Installing lbrynet from source"
-
-In your terminal: `lbrynet-gui`
-
-A window should pop up with an entry box. Type `wonderfullife` into the box, hit go, and then choose to save it or stream it.
-Enjoy!
-
 Any questions or problems, email jimmy@lbry.io

lbrynet/__init__.py

@@ -1,4 +1,8 @@
 import logging
 
 
-logging.getLogger(__name__).addHandler(logging.NullHandler())
+logging.getLogger(__name__).addHandler(logging.NullHandler())
+
+
+version = (0, 2, 0)
+__version__ = ".".join([str(x) for x in version])

lbrynet/conf.py

@@ -26,4 +26,18 @@
 POINTTRADER_SERVER = 'http://ec2-54-187-192-68.us-west-2.compute.amazonaws.com:2424'
 #POINTTRADER_SERVER = 'http://127.0.0.1:2424'
 
-CRYPTSD_FILE_EXTENSION = ".cryptsd"
+CRYPTSD_FILE_EXTENSION = ".cryptsd"
+
+API_INTERFACE = "localhost"
+API_ADDRESS = "lbryapi"
+API_PORT = 5279
+ICON_PATH = "app.icns"
+APP_NAME = "LBRY"
+DEFAULT_WALLET = "lbryum"
+
+API_CONNECTION_STRING = "http://%s:%i/%s" % (API_INTERFACE, API_PORT, API_ADDRESS)
+UI_ADDRESS = "http://" + API_INTERFACE + ":" + str(API_PORT)
+
+PROTOCOL_PREFIX = "lbry"
+
+DEFAULT_TIMEOUT = 30