Don't show 0 while downloading headers from amazon, fix uri handler

This commit is contained in:
Jack 2016-05-06 14:31:44 -04:00
parent 43b541bb7d
commit f3d3a0e57f
2 changed files with 7 additions and 4 deletions

View file

@ -1181,9 +1181,12 @@ class LBRYDaemon(jsonrpc.JSONRPC):
r['message'] = self.connection_problem[1] r['message'] = self.connection_problem[1]
r['is_lagging'] = True r['is_lagging'] = True
elif self.startup_status[0] == LOADING_WALLET_CODE: elif self.startup_status[0] == LOADING_WALLET_CODE:
r['message'] = r['message'] % (str(self.session.wallet.blocks_behind_alert) + " blocks behind") if self.session.wallet.blocks_behind_alert != 0:
r['progress'] = self.session.wallet.catchup_progress r['message'] = r['message'] % (str(self.session.wallet.blocks_behind_alert) + " blocks behind")
r['progress'] = self.session.wallet.catchup_progress
else:
r['message'] = "Catching up with the blockchain"
r['progress'] = 0
log.info("[" + str(datetime.now()) + "] daemon status: " + str(r)) log.info("[" + str(datetime.now()) + "] daemon status: " + str(r))
return self._render_response(r, OK_CODE) return self._render_response(r, OK_CODE)

View file

@ -26,7 +26,7 @@ ARG=${1:-}
if [ -z "$ARG" ]; then if [ -z "$ARG" ]; then
URL="" URL=""
else else
URL="view?name=$(urlencode "$(echo "$ARG" | cut -c 8-)")" URL="?watch=$(urlencode "$(echo "$ARG" | cut -c 8-)")"
fi fi
/usr/bin/xdg-open "http://localhost:5279/$URL" /usr/bin/xdg-open "http://localhost:5279/$URL"