Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

fix errors

Browse source
This commit is contained in:
Job Evers-Meltzer 2016-09-25 18:32:56 -07:00
parent 7dbeb1f2cf
commit a099e2db6a
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lbrynet/lbrynet_daemon/Daemon.py
View file

@ -25,7 +25,7 @@ from txjsonrpc.web import jsonrpc
from txjsonrpc.web.jsonrpc import Handler from txjsonrpc.web.jsonrpc import Handler
from lbrynet import __version__ as lbrynet_version from lbrynet import __version__ as lbrynet_version
from lbryum.version import UM_VERSION as lbryum_version from lbryum.version import LBRYUM_VERSION as lbryum_version
from lbrynet import analytics from lbrynet import analytics
from lbrynet.core.PaymentRateManager import PaymentRateManager from lbrynet.core.PaymentRateManager import PaymentRateManager
from lbrynet.core.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory from lbrynet.core.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory
@ -621,7 +621,7 @@ class Daemon(jsonrpc.JSONRPC):
try: try:
r = urlopen("https://raw.githubusercontent.com/lbryio/lbryum/master/lib/version.py").read().split('\n') r = urlopen("https://raw.githubusercontent.com/lbryio/lbryum/master/lib/version.py").read().split('\n')
version = next(line.split("=")[1].split("#")[0].replace(" ", "") version = next(line.split("=")[1].split("#")[0].replace(" ", "")
for line in r if "UM_VERSION" in line) for line in r if "LBRYUM_VERSION" in line)
version = version.replace("'", "") version = version.replace("'", "")
log.info( log.info(
"remote lbryum %s > local lbryum %s = %s", "remote lbryum %s > local lbryum %s = %s",
@ -812,11 +812,11 @@ class Daemon(jsonrpc.JSONRPC):
def _upload_log(self, log_type=None, exclude_previous=False, force=False): def _upload_log(self, log_type=None, exclude_previous=False, force=False):
if self.upload_log or force: if self.upload_log or force:
for lm, lp in [('lbrynet', lbrynet_log)]: #, ('lbryum', lbryum_log)]: for lm, lp in [('lbrynet', lbrynet_log)]:
if os.path.isfile(lp): if os.path.isfile(lp):
if exclude_previous: if exclude_previous:
f = open(lp, "r") f = open(lp, "r")
f.seek(PREVIOUS_NET_LOG) # if lm == 'lbrynet' else PREVIOUS_UM_LOG) f.seek(PREVIOUS_NET_LOG)
log_contents = f.read() log_contents = f.read()
f.close() f.close()
else: else:

2
lbrynet/lbrynet_daemon/UIManager.py
View file

@ -11,7 +11,7 @@ from twisted.internet import defer
from twisted.internet.task import LoopingCall from twisted.internet.task import LoopingCall
from lbrynet.conf import DEFAULT_UI_BRANCH, LOG_FILE_NAME from lbrynet.conf import DEFAULT_UI_BRANCH, LOG_FILE_NAME
from lbrynet import __version__ as lbrynet_version from lbrynet import __version__ as lbrynet_version
from lbryum.version import UM_VERSION as lbryum_version from lbryum.version import LBRYUM_VERSION as lbryum_version
from zipfile import ZipFile from zipfile import ZipFile
from appdirs import user_data_dir from appdirs import user_data_dir

10
setup.py
View file

@ -57,9 +57,9 @@ console_scripts = [
# 'lbrynet-rpc-node-cli = lbrynet.node_rpc_cli:main', # 'lbrynet-rpc-node-cli = lbrynet.node_rpc_cli:main',
# 'lbrynet-lookup-hosts-for-hash = lbrynet.dht_scripts:get_hosts_for_hash_in_dht', # 'lbrynet-lookup-hosts-for-hash = lbrynet.dht_scripts:get_hosts_for_hash_in_dht',
# 'lbrynet-announce_hash_to_dht = lbrynet.dht_scripts:announce_hash_to_dht', # 'lbrynet-announce_hash_to_dht = lbrynet.dht_scripts:announce_hash_to_dht',
'lbrynet-daemon = lbrynet.lbrynet_daemon.LBRYDaemonControl:start', 'lbrynet-daemon = lbrynet.lbrynet_daemon.DaemonControl:start',
'stop-lbrynet-daemon = lbrynet.lbrynet_daemon.LBRYDaemonControl:stop', 'stop-lbrynet-daemon = lbrynet.lbrynet_daemon.DaemonControl:stop',
'lbrynet-cli = lbrynet.lbrynet_daemon.LBRYDaemonCLI:main' 'lbrynet-cli = lbrynet.lbrynet_daemon.DaemonCLI:main'
] ]
if platform == LINUX: if platform == LINUX:
@ -303,7 +303,7 @@ elif platform == WINDOWS:
) )
daemon_exe = Executable( daemon_exe = Executable(
script=os.path.join(daemon_dir, 'LBRYDaemonControl.py'), script=os.path.join(daemon_dir, 'DaemonControl.py'),
icon=win_icon, icon=win_icon,
# shortcutName="lbrynet-daemon", # shortcutName="lbrynet-daemon",
# shortcutDir='DesktopFolder', # shortcutDir='DesktopFolder',
@ -311,7 +311,7 @@ elif platform == WINDOWS:
) )
cli_exe = Executable( cli_exe = Executable(
script=os.path.join(daemon_dir, 'LBRYDaemonCLI.py'), script=os.path.join(daemon_dir, 'DaemonCLI.py'),
icon=win_icon, icon=win_icon,
# shortcutName="lbrynet-cli", # shortcutName="lbrynet-cli",
# shortcutDir='DesktopFolder', # shortcutDir='DesktopFolder',