avoid name collisions in support files

fame/core/analysis.py

@@ -109,10 +109,10 @@ def add_support_file(self, module_name, name, filepath):
         self.log('debug', "Adding support file '{}' at '{}'".format(name, filepath))
 
         if fame_config.remote:
-            response = send_file_to_remote(filepath, '/analyses/{}/support_file'.format(self['_id']))
+            response = send_file_to_remote(filepath, '/analyses/{}/support_file/{}'.format(self['_id'], module_name))
             dstfilepath = response.json()['path']
         else:
-            dirpath = os.path.join(fame_config.storage_path, 'support_files', str(self['_id']))
+            dirpath = os.path.join(fame_config.storage_path, 'support_files', module_name, str(self['_id']))
             dstfilepath = os.path.join(dirpath, os.path.basename(filepath))
 
             # Create parent dirs if they don't exist

web/templates/analyses/show.html

@@ -5,7 +5,7 @@
 {% macro support_files(module) -%}
     {% if 'support_files' in analysis %}
         {% for support_file in analysis.support_files[module] %}
-            <li><a href="{{url_for('AnalysesView:download_support_file', id=analysis._id, filename=support_file[1])}}" target="_blank"><i class="pe-7s-link"></i> Download {{support_file[0]}}</a></li>
+            <li><a href="{{url_for('AnalysesView:download_support_file', id=analysis._id, module=module, filename=support_file[1])}}" target="_blank"><i class="pe-7s-link"></i> Download {{support_file[0]}}</a></li>
             {{name}}
         {% endfor %}
     {% endif %}

web/views/analyses.py

@@ -346,22 +346,32 @@ def add_generated_file(self, id):
         return jsonify({'path': filepath})
 
     @requires_permission('worker')
-    @route('/<id>/support_file', methods=['POST'])
-    def add_support_file(self, id):
-        filepath = self._save_analysis_file(id, os.path.join(fame_config.storage_path, 'support_files'))
+    @route('/<id>/support_file/<module>', methods=['POST'])
+    def add_support_file(self, id, module):
+        filepath = self._save_analysis_file(id, os.path.join(fame_config.storage_path, 'support_files', module))
 
         return jsonify({'path': filepath})
 
-    @route('/<id>/download/<filename>')
-    def download_support_file(self, id, filename):
+    @route('/<id>/download/<module>/<filename>')
+    def download_support_file(self, id, module, filename):
         """Download a support file.
 
         .. :quickref: Analysis; Download a support file.
 
         :param id: id of the analysis.
+        :param module: name of the module.
         :param filename: name of the file to download.
         """
         analysis = get_or_404(current_user.analyses, _id=id)
-        filepath = os.path.join(fame_config.storage_path, 'support_files', str(analysis['_id']), secure_filename(filename))
 
-        return file_download(filepath)
+        filepath = os.path.join(fame_config.storage_path, 'support_files', module, str(analysis['_id']), secure_filename(filename))
+        if os.path.isfile(filepath):
+            return file_download(filepath)
+        else:
+            # This code is here for compatibility
+            # with older analyses
+            filepath = os.path.join(fame_config.storage_path, 'support_files', str(analysis['_id']), secure_filename(filename))
+            if os.path.isfile(filepath):
+                return file_download(filepath)
+            else:
+                abort(404)