From 39a7f37f3584a357b117c5905e92e539e42a3642 Mon Sep 17 00:00:00 2001 From: Job Evers Date: Thu, 28 Jul 2016 11:43:47 -0500 Subject: [PATCH] muck with pending_claims... still not sure this is correct --- lbrynet/lbrynet_daemon/LBRYDaemon.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lbrynet/lbrynet_daemon/LBRYDaemon.py b/lbrynet/lbrynet_daemon/LBRYDaemon.py index 89b07e504..adbbe7ff8 100644 --- a/lbrynet/lbrynet_daemon/LBRYDaemon.py +++ b/lbrynet/lbrynet_daemon/LBRYDaemon.py @@ -608,20 +608,25 @@ class LBRYDaemon(jsonrpc.JSONRPC): return txid def _check_pending_claims(self): - def _start_file(name): + # TODO: this was blatantly copied from jsonrpc_start_lbry_file. Be DRY. + def _start_file(f): + d = self.lbry_file_manager.toggle_lbry_file_running(f) + return defer.succeed("Started LBRY file") + + def _get_and_start_file(name): d = defer.succeed(self.pending_claims.pop(name)) d.addCallback(lambda _: self._get_lbry_file("name", name, return_json=False)) d.addCallback(lambda l: _start_file(l) if l.stopped else "LBRY file was already running") def _process_lbry_file(name, lbry_file): # lbry_file is an instance of ManagedLBRYFileDownloader or None + # TODO: check for sd_hash in addition to txid ready_to_start = ( lbry_file and - self.pending_claims[name] == lbry_file.txid and - not isinstance(lbry_file['metadata'], str) + self.pending_claims[name] == lbry_file.txid ) if ready_to_start: - _start_file(name) + _get_and_start_file(name, lbry_file) else: re_add_to_pending_claims(name)