diff --git a/oml/item/scan.py b/oml/item/scan.py index 14a95b1..a5b7881 100644 --- a/oml/item/scan.py +++ b/oml/item/scan.py @@ -214,6 +214,11 @@ def run_import(options=None): os.unlink(f_import) if listname: listitems.append(file.item.id) + if state.activity.get('cancel'): + state.activity = {} + return + if not state.tasks.connected: + return if time.time() - last > 5: last = time.time() state.activity = { @@ -224,11 +229,6 @@ def run_import(options=None): } trigger_event('activity', state.activity) - if state.activity.get('cancel'): - state.activity = {} - return - if not state.tasks.connected: - return with db.session(): if listname and listitems: l = List.get(settings.USER_ID, listname)