From 2b1af8eea2d41742a345052ca7914ae7d147044b Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 14 Sep 2016 22:27:57 -0400 Subject: [PATCH] delete lbry file with an abandoned claim --- lbrynet/lbryfilemanager/LBRYFileDownloader.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lbrynet/lbryfilemanager/LBRYFileDownloader.py b/lbrynet/lbryfilemanager/LBRYFileDownloader.py index be6232aa5..653e9fd01 100644 --- a/lbrynet/lbryfilemanager/LBRYFileDownloader.py +++ b/lbrynet/lbryfilemanager/LBRYFileDownloader.py @@ -10,6 +10,9 @@ from lbrynet.lbryfilemanager.LBRYFileStatusReport import LBRYFileStatusReport from lbrynet.interfaces import IStreamDownloaderFactory from lbrynet.lbryfile.StreamDescriptor import save_sd_info from twisted.internet import defer +import logging + +log = logging.getLogger(__name__) class ManagedLBRYFileDownloader(LBRYFileSaver): @@ -48,11 +51,16 @@ class ManagedLBRYFileDownloader(LBRYFileSaver): self.claim_id = claim_id return defer.succeed(None) + def _notify_bad_claim(name, txid): + log.error("Error loading name claim for lbry file: lbry://%s, tx %s does not contain a valid claim", name, txid) + log.warning("lbry file for lbry://%s, tx %s has no claim, deleting it", name, txid) + return self.lbry_file_manager.delete_lbry_file(self) + def _save_claim(name, txid): self.uri = name self.txid = txid d = self.wallet.get_claimid(name, txid) - d.addCallback(_save_claim_id) + d.addCallbacks(_save_claim_id, lambda err: _notify_bad_claim(name, txid)) return d d.addCallback(_save_sd_hash)