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

Merge branch 'master' of github.com:lbryio/lbry

Browse source
This commit is contained in:
Jimmy Kiselak 2016-01-22 18:16:14 -05:00
commit 0840ac7d06
2 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lbrynet/lbrynet_daemon/LBRYDaemon.py
View file

@ -100,6 +100,7 @@ class LBRYDaemon(xmlrpc.XMLRPC):
def _disp_startup(): def _disp_startup():
print "Started LBRYnet daemon" print "Started LBRYnet daemon"
print "The daemon can be shut down by running 'stop-lbrynet-daemon' in a terminal"
return defer.succeed(None) return defer.succeed(None)
d = defer.Deferred() d = defer.Deferred()
@ -572,7 +573,7 @@ class LBRYDaemon(xmlrpc.XMLRPC):
print str(err.getTraceback()) print str(err.getTraceback())
return err return err
d = defer.Deferred() d = defer.Deferred()
d.addCallback(lambda _: webbrowser.open("https://cdn.rawgit.com/jackrobison/lbry.io/local/view/page/demo.html")) d.addCallback(lambda _: webbrowser.open("file://" + str(os.path.join(self.download_directory, "lbryio/view/page/gui.html"))))
d.addErrback(_disp_err) d.addErrback(_disp_err)
d.callback(None) d.callback(None)

62
lbrynet/lbrynet_daemon/LBRYURIHandler/LBRYURIHandler.py
View file

@ -16,42 +16,44 @@ def main(args):
daemon = xmlrpclib.ServerProxy('http://localhost:7080/') daemon = xmlrpclib.ServerProxy('http://localhost:7080/')
try: try:
b = daemon.get_balance() balance = daemon.get_balance()
is_running = True is_running = True
if len(args) > 1:
print 'Too many args', args
elif is_running:
if args[0][7:] == 'lbry':
daemon.render_gui()
elif args[0][7:] == 'settings':
r = daemon.get_settings()
html = "<body>" + json.dumps(r) + "</body>"
r = daemon.render_html(html)
else:
if float(balance) > 0.0:
r = daemon.get(args[0][7:])
print r
path = r['path']
if path[0] != '/':
path = '/' + path
print path
filename = path.split('/')[len(path.split('/')) - 1]
extension = path.split('.')[len(path.split('.')) - 1]
if extension in ['mp4', 'flv', 'mov']:
html = render_video(path)
daemon.render_html(html)
else:
webbrowser.open('file://' + str(path))
except: except:
webbrowser.open('http://lbry.io/get') webbrowser.open('http://lbry.io/get')
is_running = False is_running = False
if len(args) > 1:
print 'Too many args', args
elif is_running:
if args[0][7:] == 'lbry':
daemon.render_gui()
elif args[0][7:] == 'settings':
r = daemon.get_settings()
html = "<body>" + json.dumps(r) + "</body>"
r = daemon.render_html(html)
else:
r = daemon.get(args[0][7:])
print r
path = r['path']
if path[0] != '/':
path = '/' + path
print path
filename = path.split('/')[len(path.split('/')) - 1]
extension = path.split('.')[len(path.split('.')) - 1]
if extension in ['mp4', 'flv', 'mov']:
html = render_video(path)
daemon.render_html(html)
else:
webbrowser.open('file://' + str(path))
if __name__ == "__main__": if __name__ == "__main__":
main(sys.argv[1:]) main(sys.argv[1:])