From 1e73b2437df014ba1b02ebe1f553e321760bb4fb Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 22 Jan 2016 09:44:38 -0500 Subject: [PATCH] Update daemon and uri handler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add command to stop daemon from the terminal If lbrynet-daemon isn’t running the uri handler will now redirect to lbry.io/get --- lbrynet/lbrynet_daemon/LBRYDaemonStopper.py | 21 +++++++++++++++++++ .../LBRYURIHandler/LBRYURIHandler.py | 10 +++++++-- setup.py | 3 ++- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 lbrynet/lbrynet_daemon/LBRYDaemonStopper.py diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonStopper.py b/lbrynet/lbrynet_daemon/LBRYDaemonStopper.py new file mode 100644 index 000000000..4e42708e9 --- /dev/null +++ b/lbrynet/lbrynet_daemon/LBRYDaemonStopper.py @@ -0,0 +1,21 @@ +import xmlrpclib + + +def main(): + daemon = xmlrpclib.ServerProxy("http://localhost:7080/") + try: + b = daemon.get_balance() + is_running = True + except: + is_running = False + + if is_running: + try: + daemon.stop() + except: + print "LBRYnet daemon stopped" + else: + print "LBRYnet daemon wasn't running" + +if __name__ == '__main__': + main() \ No newline at end of file diff --git a/lbrynet/lbrynet_daemon/LBRYURIHandler/LBRYURIHandler.py b/lbrynet/lbrynet_daemon/LBRYURIHandler/LBRYURIHandler.py index 153b6eb95..e4e66a500 100644 --- a/lbrynet/lbrynet_daemon/LBRYURIHandler/LBRYURIHandler.py +++ b/lbrynet/lbrynet_daemon/LBRYURIHandler/LBRYURIHandler.py @@ -15,11 +15,17 @@ def main(args): daemon = xmlrpclib.ServerProxy('http://localhost:7080/') + try: + b = daemon.get_balance() + is_running = True + except: + webbrowser.open('http://lbry.io/get') + is_running = False + if len(args) > 1: print 'Too many args', args - else: - + elif is_running: if args[0][7:] == 'lbry': daemon.render_gui() diff --git a/setup.py b/setup.py index 9caa0e8eb..948dff97d 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,7 @@ setup(name='lbrynet', '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-daemon = lbrynet.lbrynet_daemon.LBRYDaemon:main', + 'stop-lbrynet-daemon = lbrynet.lbrynet_daemon.LBRYDaemonStopper:main', ] }, data_files=[ @@ -43,4 +44,4 @@ setup(name='lbrynet', ] ) ] - ) + ) \ No newline at end of file