WID-70. Send final filename from client-side and add suffix only for …

…the basic unicore files.

src/components/JobOutputFiles.tsx

@@ -119,7 +119,14 @@ export const JobOutput = (props: Types.JobOutputProps): JSX.Element => {
    * @param file - name of the file to be downloaded from this jobs working dir
    */
   async function downloadToCurrentPath(file: string): Promise<void> {
-    const downloadedFileName = `${file}_${jobId}`;
+    let downloadedFileName = file;
+    if (
+      ['stdout', 'stderr', 'UNICORE_SCRIPT_EXIT_CODE'].includes(
+        downloadedFileName
+      )
+    ) {
+      downloadedFileName = `${file}_${jobId}`;
+    }
     if (
       fileExists(downloadedFileName) &&
       !(await confirmReDownload(downloadedFileName))
@@ -131,8 +138,9 @@ export const JobOutput = (props: Types.JobOutputProps): JSX.Element => {
     console.log('File browser path: ', path);
     const dataToSend = {
       job_url: jobUrl,
-      file: file,
-      path: path
+      in_file: file,
+      path: path,
+      out_file: downloadedFileName
     };
     try {
       setDownloading(true);

tvbextunicore/handlers.py

@@ -100,8 +100,9 @@ def post(self, *args):
         post_params = self.get_json_body()
         try:
             path = post_params['path']
-            file = post_params['file']
+            unicore_file = post_params['in_file']
             job_url = post_params['job_url']
+            drive_file = post_params['out_file']
         except KeyError as e:
             LOGGER.error(e)
             self.set_status(400, 'Request body missing required params!')
@@ -116,7 +117,8 @@ def post(self, *args):
 
         try:
             unicore_wrapper = UnicoreWrapper()
-            message = unicore_wrapper.download_file(job_url, file, path)
+            drive_file_path = os.path.join(path, drive_file)
+            message = unicore_wrapper.download_file(job_url, unicore_file, drive_file_path)
             response = build_response(DownloadStatus.SUCCESS, message)
         except FileNotExistsException as e:
             LOGGER.error(e)

tvbextunicore/tests/test_unicore_wrapper.py

@@ -113,13 +113,6 @@ def get_jobs(self, offset, num):
         return self.__generate_list_of_jobs()
 
 
-def test_ensure_format_is_respected():
-    job = MockPyUnicoreResource('10', None, None, None)
-    file_name = UnicoreWrapper._prepare_output_filename('test_file', job)
-    assert file_name == 'test_file_10', 'Changing this filename format affects functionality on the client-side! ' \
-                                        'Please check they are kept in sync!'
-
-
 def test_get_jobs(mocker):
     os.environ['CLB_AUTH'] = "test_auth_token"
 

tvbextunicore/unicore_wrapper/unicore_wrapper.py

@@ -137,11 +137,6 @@ def get_job_output(self, job_url):
             outputs[k] = {'is_file': v.isfile()}
         return outputs
 
-    @staticmethod
-    def _prepare_output_filename(file_name, job):
-        # TODO: take file extension into consideration?
-        return f'{file_name}_{job.job_id}'
-
     def download_file(self, job_url, file_name, path=None):
         # type: (str, str, str) -> str
         """
@@ -154,15 +149,11 @@ def download_file(self, job_url, file_name, path=None):
         if not wd.get(file_name, False):
             raise FileNotExistsException(f'{file_name} does not exist as output of {job_url}!')
 
-        final_name = self._prepare_output_filename(file_name, job)
-
         # We need the 'if' below to support download from cell
         if path is None:
-            file_path = final_name
-        else:
-            file_path = os.path.join(path, final_name)
+            path = file_name
 
-        wd[file_name].download(file_path)
+        wd[file_name].download(path)
         return 'Downloaded successfully!'
 
     def stream_file(self, job_url, file, offset=0, size=-1):