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

have uri handler check if app is running

Browse source 
-checks if LBRY.app is running, starts it if it isn’t

-delete unused function in LBRYDaemon
This commit is contained in:
Jack 2016-03-23 19:49:14 -04:00
parent 13acbfb64f
commit 94398071eb
3 changed files with 35 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lbrynet/lbrynet_daemon/Apps/LBRYURIHandler.py
View file

@ -3,9 +3,12 @@ import json
import webbrowser import webbrowser
import sys import sys
from time import sleep from time import sleep
import subprocess
from jsonrpc.proxy import JSONRPCProxy from jsonrpc.proxy import JSONRPCProxy
from lbrynet.conf import API_CONNECTION_STRING, UI_ADDRESS
API_CONNECTION_STRING = "http://localhost:5279/lbryapi"
UI_ADDRESS = "http://localhost:5279"
class LBRYURIHandler(object): class LBRYURIHandler(object):
@ -15,27 +18,42 @@ class LBRYURIHandler(object):
self.daemon = JSONRPCProxy.from_url(API_CONNECTION_STRING) self.daemon = JSONRPCProxy.from_url(API_CONNECTION_STRING)
def check_status(self): def check_status(self):
status = None
try: try:
self.daemon.is_running() status = json.loads(self.daemon.is_running())['result']
if self.start_timeout < 30 and not status:
sleep(1)
self.start_timeout += 1
self.check_status()
elif status:
return True
else:
exit(1)
except: except:
if self.started_daemon:
if self.start_timeout < 30: if self.start_timeout < 30:
sleep(1) sleep(1)
self.start_timeout += 1 self.start_timeout += 1
self.check_status() self.check_status()
else: else:
exit(1) exit(1)
else:
os.system("open /Applications/LBRY.app")
self.started_daemon = True
self.start_timeout += 1
self.check_status()
def handle(self, lbry_name): def handle(self, lbry_name):
self.check_status() lbry_process = [d for d in subprocess.Popen(['ps','aux'], stdout=subprocess.PIPE).stdout.readlines()
if 'LBRY.app' in d]
try:
status = json.loads(self.daemon.is_running())['result']
except:
pass
if lbry_name == "lbry": if lbry_process:
self.check_status()
started = False
else:
os.system("open /Applications/LBRY.app")
self.check_status()
started = True
if lbry_name == "lbry" or lbry_name == "" and not started:
webbrowser.get('safari').open(UI_ADDRESS) webbrowser.get('safari').open(UI_ADDRESS)
else: else:
r = json.loads(self.daemon.get({'name': lbry_name})) r = json.loads(self.daemon.get({'name': lbry_name}))

4
lbrynet/lbrynet_daemon/LBRYDaemon.py
View file

@ -1136,10 +1136,6 @@ class LBRYindex(resource.Resource):
return resource.Resource.getChild(self, name, request) return resource.Resource.getChild(self, name, request)
def render_GET(self, request): def render_GET(self, request):
def _disp(r):
log.info(r)
return "<html><table style='width:100%'>" + ''.join(r) + "</html>"
return static.File(os.path.join(self.ui_dir, "index.html")).render_GET(request) return static.File(os.path.join(self.ui_dir, "index.html")).render_GET(request)

2
setup_uri_handler.py
View file

@ -4,7 +4,7 @@ import os
APP = [os.path.join('lbrynet', 'lbrynet_daemon', 'Apps', 'LBRYURIHandler.py')] APP = [os.path.join('lbrynet', 'lbrynet_daemon', 'Apps', 'LBRYURIHandler.py')]
DATA_FILES = [] DATA_FILES = []
OPTIONS = {'argv_emulation': True, OPTIONS = {'argv_emulation': True,
'packages': ['lbrynet', 'jsonrpc'], 'packages': ['jsonrpc'],
'plist': { 'plist': {
'LSUIElement': True, 'LSUIElement': True,
'CFBundleURLTypes': [ 'CFBundleURLTypes': [