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

default on launching ui if daemon already running when command is called

Browse source 
-also update deb version
This commit is contained in:
Jack 2016-04-17 20:16:35 -04:00
parent 7b9d84f528
commit 99b3cdd45d
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lbrynet/lbrynet_daemon/LBRYDaemonControl.py
View file

@ -74,9 +74,13 @@ def start():
parser.add_argument('--no-launch', dest='launchui', action="store_false") parser.add_argument('--no-launch', dest='launchui', action="store_false")
parser.set_defaults(launchui=True) parser.set_defaults(launchui=True)
args = parser.parse_args()
try: try:
JSONRPCProxy.from_url(API_CONNECTION_STRING).is_running() JSONRPCProxy.from_url(API_CONNECTION_STRING).is_running()
log.info("lbrynet-daemon is already running") log.info("lbrynet-daemon is already running")
if args.launchui:
webbrowser.open(UI_ADDRESS)
return return
except: except:
pass pass
@ -88,8 +92,6 @@ def start():
print "JSONRPC API is available at " + API_CONNECTION_STRING print "JSONRPC API is available at " + API_CONNECTION_STRING
print "To quit press ctrl-c or call 'stop' via the API" print "To quit press ctrl-c or call 'stop' via the API"
args = parser.parse_args()
if args.branch == "HEAD": if args.branch == "HEAD":
GIT_CMD_STRING = "git ls-remote https://github.com/lbryio/lbry-web-ui.git | grep %s | cut -f 1" % args.branch GIT_CMD_STRING = "git ls-remote https://github.com/lbryio/lbry-web-ui.git | grep %s | cut -f 1" % args.branch
DIST_URL = "https://raw.githubusercontent.com/lbryio/lbry-web-ui/master/dist.zip" DIST_URL = "https://raw.githubusercontent.com/lbryio/lbry-web-ui/master/dist.zip"

2
packaging/ubuntu/lbry.desktop
View file

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Version=0.2.1 Version=0.2.2
Name=LBRY Name=LBRY
# Only KDE 4 seems to use GenericName, so we reuse the KDE strings. # Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413. # From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.