Fix download count for conflict paths

api/download.py

@@ -229,6 +229,7 @@ class Download(base.RequestHandler):
     def _path_from_container(self, container, used_subpaths, ids_of_paths, _id):
         def _find_new_path(path, list_used_subpaths, ids_of_paths, _id):
             """from the input path finds a path that hasn't been used"""
+
             path = str(path).replace('/', '_')
             if path in list_used_subpaths:
                 return path
@@ -238,10 +239,11 @@ class Download(base.RequestHandler):
             i = 0
             while True:
                 modified_path = path + '_' + str(i)
-                if modified_path not in list_used_subpaths:
+                if modified_path not in ids_of_paths.keys():
                     ids_of_paths[modified_path] = _id
                     return modified_path
                 i += 1
+
         path = None
         if not path and container.get('label'):
             path = container['label']
@@ -257,7 +259,9 @@ class Download(base.RequestHandler):
             path = container['code']
         if not path:
             path = 'untitled'
-        path = _find_new_path(path, used_subpaths.get(id, []), ids_of_paths, _id)
+
+        path = _find_new_path(path, used_subpaths.get(_id, []), ids_of_paths, _id)
+
         used_subpaths[_id] = used_subpaths.get(_id, []) + [path]
         return path
 

tests/integration_tests/python/test_download.py

@@ -8,8 +8,10 @@ def test_download(data_builder, file_form, as_admin, api_db):
     project = data_builder.create_project(label='project1')
     session = data_builder.create_session(label='session1')
     session2 = data_builder.create_session(label='session1')
+    session3 = data_builder.create_session(label='session1')
     acquisition = data_builder.create_acquisition(session=session)
     acquisition2 = data_builder.create_acquisition(session=session2)
+    acquisition3 = data_builder.create_acquisition(session=session3)
 
     # upload the same file to each container created and use different tags to
     # facilitate download filter tests:
@@ -21,6 +23,9 @@ def test_download(data_builder, file_form, as_admin, api_db):
     as_admin.post('/acquisitions/' + acquisition2 + '/files', files=file_form(
         file_name, meta={'name': file_name, 'type': 'csv'}))
 
+    as_admin.post('/acquisitions/' + acquisition3 + '/files', files=file_form(
+        'test.txt', meta={'name': file_name, 'type': 'text'}))
+
     as_admin.post('/sessions/' + session + '/files', files=file_form(
         file_name, meta={'name': file_name, 'type': 'csv', 'tags': ['plus']}))
 
@@ -55,10 +60,13 @@ def test_download(data_builder, file_form, as_admin, api_db):
 
     # Verify a single file in tar with correct file name
     found_second_session = False
+    found_third_session = False
     for tarinfo in tar:
         assert os.path.basename(tarinfo.name) == file_name
         if 'session1_0' in str(tarinfo.name):
             found_second_session = True
+        if 'session1_1' in str(tarinfo.name):
+            found_third_session = True
     assert found_second_session
 
     tar.close()
@@ -223,7 +231,7 @@ def test_analysis_download(data_builder, file_form, as_admin, default_payload):
         zip_file.writestr('two.csv', 'sample\ndata\n')
     zip_cont.seek(0)
 
-    # analysis for testing most of the download functionality 
+    # analysis for testing most of the download functionality
     # analysis_files and new_analysis_files refer to this analyisis
     analysis1 = as_admin.post('/sessions/' + session + '/analyses', files=file_form(
         'one.csv', ('two.zip', zip_cont),
@@ -231,9 +239,9 @@ def test_analysis_download(data_builder, file_form, as_admin, default_payload):
     )).json()['_id']
 
     # Analyis Only for testing that inputs are in their own folder
-    r = as_admin.post('/sessions/' + session + '/analyses', 
+    r = as_admin.post('/sessions/' + session + '/analyses',
         json={
-            'analysis': {'label': 'test'}, 
+            'analysis': {'label': 'test'},
             'job': {
                 'gear_id': gear,
                 'inputs': {
@@ -241,7 +249,7 @@ def test_analysis_download(data_builder, file_form, as_admin, default_payload):
                         'name': 'one.csv',
                         'type': 'acquisition',
                         'id': acquisition
-                    }, 
+                    },
                     'zip': {
                         'name': 'two.zip',
                         'type': 'acquisition',
@@ -249,7 +257,7 @@ def test_analysis_download(data_builder, file_form, as_admin, default_payload):
                     }
                 }
             }
-        }, 
+        },
         params={'job':True}
     )
     assert r.ok
@@ -508,12 +516,12 @@ def test_summary(data_builder, as_admin, file_form):
     r = as_admin.post('/download/summary', json=[{"level":"project", "_id":project}])
     assert r.ok
     assert len(r.json()) == 1
-    assert r.json().get("csv", {}).get("count",0) == 4 
+    assert r.json().get("csv", {}).get("count",0) == 4
 
     r = as_admin.post('/download/summary', json=[{"level":"session", "_id":session}])
     assert r.ok
     assert len(r.json()) == 1
-    assert r.json().get("csv", {}).get("count",0) == 2 
+    assert r.json().get("csv", {}).get("count",0) == 2
 
     r = as_admin.post('/download/summary', json=[{"level":"acquisition", "_id":acquisition},{"level":"acquisition", "_id":acquisition2}])
     assert r.ok
@@ -527,7 +535,7 @@ def test_summary(data_builder, as_admin, file_form):
         file_name, meta={'label': 'test', 'inputs':[{'name':file_name}]}))
     assert r.ok
     analysis = r.json()['_id']
-    
+
     r = as_admin.post('/download/summary', json=[{"level":"analysis", "_id":analysis}])
     assert r.ok
     assert len(r.json()) == 1