From fb04c9fef06005c1160795e903b4605e377f1180 Mon Sep 17 00:00:00 2001 From: j Date: Mon, 21 Jan 2019 12:25:48 +0530 Subject: [PATCH 1/2] don't remove pending downloads --- oml/item/scan.py | 2 ++ oml/tor.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/oml/item/scan.py b/oml/item/scan.py index d700aea..8d374af 100644 --- a/oml/item/scan.py +++ b/oml/item/scan.py @@ -201,6 +201,8 @@ def run_scan(): if gone: for id in gone: i = Item.get(id) + if i.info.get('mediastate') == 'transferring': + continue path = i.get_path() if not path or not os.path.exists(path): logger.debug('cleaning orphaned record %s %s', i, path) diff --git a/oml/tor.py b/oml/tor.py index f7aa595..18180c1 100644 --- a/oml/tor.py +++ b/oml/tor.py @@ -155,7 +155,9 @@ class Tor(object): self.controller.add_event_listener(self.event_listener) self.controller.add_status_listener(self.status_listener) self.connected = True - self.socks_port = int(self.controller.get_conf('SocksPort').split(' ')[0]) + port = self.controller.get_conf('SocksPort') + if port: + self.socks_port = int(port.split(' ')[0]) self.publish() state.online = self.is_online() return True From f104a688f203220610001a29e4457ce27252c016 Mon Sep 17 00:00:00 2001 From: j Date: Mon, 21 Jan 2019 12:31:01 +0530 Subject: [PATCH 2/2] delay debug output --- oml/item/scan.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oml/item/scan.py b/oml/item/scan.py index 8d374af..04a58c9 100644 --- a/oml/item/scan.py +++ b/oml/item/scan.py @@ -195,9 +195,9 @@ def run_scan(): if len(ids) != len(books): logger.debug('number of books %s vs number of ids %s', len(books), len(ids)) if library_items != len(books): - logger.debug('number of books %s vs number of items in library %s', len(books), library_items) library_items = set([str(i) for i in user.library.items]) gone = library_items - ids + first = True if gone: for id in gone: i = Item.get(id) @@ -205,6 +205,9 @@ def run_scan(): continue path = i.get_path() if not path or not os.path.exists(path): + if first: + logger.debug('number of books %s vs number of items in library %s', len(books), library_items) + first = False logger.debug('cleaning orphaned record %s %s', i, path) i.remove_file() missing = ids - library_items