From ff174439c393afc55399bb9b6a1698c9f3075fc5 Mon Sep 17 00:00:00 2001
From: Francesco Siddi <francesco.siddi@gmail.com>
Date: Fri, 8 Jan 2016 14:20:07 +0100
Subject: [PATCH] Tweaks to management functions

---
 pillar/application/__init__.py |  4 +++-
 pillar/manage.py               | 23 +++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pillar/application/__init__.py b/pillar/application/__init__.py
index 32f65e4d..3e3e95f2 100644
--- a/pillar/application/__init__.py
+++ b/pillar/application/__init__.py
@@ -251,7 +251,9 @@ def update_file_name(item):
     def _update_name(item, file_id):
         files_collection = app.data.driver.db['files']
         f = files_collection.find_one({'_id': file_id})
-        if f and f['backend'] == 'gcs':
+        status = item['properties']['status']
+        if f and f['backend'] == 'gcs' and status != 'processing':
+            # Process only files that are on GCS and that are not processing
             try:
                 storage = GoogleCloudStorageBucket(str(item['project']))
                 blob = storage.Get(f['file_path'], to_dict=False)
diff --git a/pillar/manage.py b/pillar/manage.py
index 01438738..efc62096 100644
--- a/pillar/manage.py
+++ b/pillar/manage.py
@@ -463,7 +463,7 @@ def files_verify_project():
     """Verify for missing or conflicting node/file ids"""
     nodes_collection = app.data.driver.db['nodes']
     files_collection = app.data.driver.db['files']
-    issues = dict(missing=[], conflicting=[])
+    issues = dict(missing=[], conflicting=[], processing=[])
 
     def _parse_file(item, file_id):
         f = files_collection.find_one({'_id': file_id})
@@ -471,6 +471,9 @@ def files_verify_project():
             if 'project' in item and 'project' in f:
                 if item['project'] != f['project']:
                     issues['conflicting'].append(item['_id'])
+                if 'status' in item['properties'] \
+                    and item['properties']['status'] == 'processing':
+                    issues['processing'].append(item['_id'])
         else:
             issues['missing'].append(
                 "{0} missing {1}".format(item['_id'], file_id))
@@ -483,17 +486,13 @@ def files_verify_project():
             for f in item['properties']['files']:
                 _parse_file(item, f['file'])
 
-    if issues:
-        print "The following issues were detected:"
-        if issues['missing']:
-            print "Missing:"
-            for i in issues['missing']:
-                print i
-            print "==="
-        if issues['conflicting']:
-            print "Conflicts:"
-            for i in issues['conflicting']:
-                print i
+    print "==="
+    print "Issues detected:"
+    for k, v in issues.iteritems():
+        print "{0}:".format(k)
+        for i in v:
+            print i
+        print "==="
 
 if __name__ == '__main__':
     manager.run()