From ceffe456db96911da85d060bcb5c3079ac53b63c Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Mon, 25 Jan 2016 12:18:24 +0530
Subject: [PATCH] fix import state before import started

---
 oml/item/api.py                 |  9 ++++++---
 oml/item/scan.py                | 17 +++++++++--------
 static/js/importExportDialog.js |  1 +
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/oml/item/api.py b/oml/item/api.py
index 230be98..db816b1 100644
--- a/oml/item/api.py
+++ b/oml/item/api.py
@@ -328,9 +328,12 @@ def _import(data):
             mode copy|move
         }
     '''
-    if 'cancel' in state.activity:
-        del state.activity['cancel']
-    state.tasks.queue('import', data)
+    if os.path.exists(data['path']):
+        state.activity = {
+            'activity': 'import',
+            'path': data['path'],
+        }
+        state.tasks.queue('import', data)
     return {}
 actions.register(_import, 'import', cache=False)
 
diff --git a/oml/item/scan.py b/oml/item/scan.py
index a8170db..fd5a7e5 100644
--- a/oml/item/scan.py
+++ b/oml/item/scan.py
@@ -233,13 +233,14 @@ def run_import(options=None):
         remove_empty_folders(prefix, True)
 
 def import_folder():
-    import_path = settings.preferences['importPath']
-    logger.debug('scan importPath %s', import_path)
-    if os.path.exists(import_path):
-        run_import({
-            'path': import_path,
-            'mode': 'move'
-        })
-        remove_empty_folders(import_path, True)
+    if not (state.activity and state.activity.get('activity') == 'import'):
+        import_path = settings.preferences['importPath']
+        logger.debug('scan importPath %s', import_path)
+        if os.path.exists(import_path):
+            run_import({
+                'path': import_path,
+                'mode': 'move'
+            })
+            remove_empty_folders(import_path, True)
     if state.main:
         state.main.call_later(10*60, lambda: state.tasks.queue('scanimport'))
diff --git a/static/js/importExportDialog.js b/static/js/importExportDialog.js
index afce7bc..156aa79 100644
--- a/static/js/importExportDialog.js
+++ b/static/js/importExportDialog.js
@@ -111,6 +111,7 @@ oml.ui.importExportDialog = function() {
                     : renderForm('export', isActive)
                 );
             that.options({content: $outerPanel});
+            setButton(result.data);
         });
     });