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