LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

Merge branch 'master' into blob-prices

Browse source
This commit is contained in:
Jack 2016-09-30 12:36:10 -04:00
commit 0a612ba36c
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bumpversion.cfg
View file

@ -1,5 +1,5 @@
[bumpversion] [bumpversion]
current_version = 0.5.0 current_version = 0.6.2
commit = True commit = True
tag = True tag = True

2
lbrynet/__init__.py
View file

@ -1,6 +1,6 @@
import logging import logging
__version__ = "0.5.0" __version__ = "0.6.2"
version = tuple(__version__.split('.')) version = tuple(__version__.split('.'))
logging.getLogger(__name__).addHandler(logging.NullHandler()) logging.getLogger(__name__).addHandler(logging.NullHandler())

6
packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py
View file

@ -27,7 +27,7 @@ if not os.path.isfile(lbrycrdd_path_conf):
f.write(lbrycrdd_path) f.write(lbrycrdd_path)
f.close() f.close()
from lbrynet.lbrynet_daemon.LBRYDaemonServer import LBRYDaemonServer, LBRYDaemonRequest from lbrynet.lbrynet_daemon.DaemonServer import DaemonServer, DaemonRequest
from lbrynet.conf import API_PORT, API_INTERFACE, ICON_PATH, APP_NAME from lbrynet.conf import API_PORT, API_INTERFACE, ICON_PATH, APP_NAME
from lbrynet.conf import UI_ADDRESS from lbrynet.conf import UI_ADDRESS
@ -75,11 +75,11 @@ class LBRYDaemonApp(AppKit.NSApplication):
sys.exit(0) sys.exit(0)
lbry = LBRYDaemonServer() lbry = DaemonServer()
d = lbry.start() d = lbry.start()
d.addCallback(lambda _: webbrowser.open(UI_ADDRESS)) d.addCallback(lambda _: webbrowser.open(UI_ADDRESS))
lbrynet_server = server.Site(lbry.root) lbrynet_server = server.Site(lbry.root)
lbrynet_server.requestFactory = LBRYDaemonRequest lbrynet_server.requestFactory = DaemonRequest
reactor.listenTCP(API_PORT, lbrynet_server, interface=API_INTERFACE) reactor.listenTCP(API_PORT, lbrynet_server, interface=API_INTERFACE)
def openui_(self, sender): def openui_(self, sender):

2
packaging/ubuntu/lbry.desktop
View file

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Version=0.5.0 Version=0.6.2
Name=LBRY Name=LBRY
Comment=The world's first user-owned content marketplace Comment=The world's first user-owned content marketplace
Icon=lbry Icon=lbry

6
packaging/windows/lbry-win32-app/LBRYWin32App.py
View file

@ -18,7 +18,7 @@ try:
except ImportError: except ImportError:
import win32gui import win32gui
from lbrynet.lbrynet_daemon.LBRYDaemonServer import LBRYDaemonServer, LBRYDaemonRequest from lbrynet.lbrynet_daemon.DaemonServer import DaemonServer, DaemonRequest
from lbrynet.conf import API_PORT, API_INTERFACE, ICON_PATH, APP_NAME from lbrynet.conf import API_PORT, API_INTERFACE, ICON_PATH, APP_NAME
from lbrynet.conf import UI_ADDRESS, API_CONNECTION_STRING, LOG_FILE_NAME from lbrynet.conf import UI_ADDRESS, API_CONNECTION_STRING, LOG_FILE_NAME
from packaging.uri_handler.LBRYURIHandler import LBRYURIHandler from packaging.uri_handler.LBRYURIHandler import LBRYURIHandler
@ -284,11 +284,11 @@ def main(lbry_name=None):
systray_thread.daemon = True systray_thread.daemon = True
systray_thread.start() systray_thread.start()
lbry = LBRYDaemonServer() lbry = DaemonServer()
d = lbry.start() d = lbry.start()
d.addCallback(lambda _: LBRYURIHandler.open_address(lbry_name)) d.addCallback(lambda _: LBRYURIHandler.open_address(lbry_name))
lbrynet_server = server.Site(lbry.root) lbrynet_server = server.Site(lbry.root)
lbrynet_server.requestFactory = LBRYDaemonRequest lbrynet_server.requestFactory = DaemonRequest
try: try:
reactor.listenTCP(API_PORT, lbrynet_server, interface=API_INTERFACE) reactor.listenTCP(API_PORT, lbrynet_server, interface=API_INTERFACE)
except error.CannotListenError: except error.CannotListenError: