Merge pull request #157 from statisticsnorway/archived-files

MICNO-684: Added check that input file not already exist in input_dir/archive

Author: linnbjornerud

job_executor/adapter/local_storage.py

@@ -409,10 +409,12 @@ def archive_input_files(dataset_name: str):
     Archives the input .tar files if not already archived
     """
     archive_dir = INPUT_DIR / "archive"
-    tar_file = INPUT_DIR / f"{dataset_name}.tar"
+    tar_filename = f"{dataset_name}.tar"
+    archived_tar_file = archive_dir / tar_filename
+    tar_file = INPUT_DIR / tar_filename
     if not archive_dir.exists():
         os.makedirs(archive_dir, exist_ok=True)
-    if tar_file.exists():
+    if tar_file.exists() and not os.path.isfile(archived_tar_file):
         shutil.move(str(tar_file), str(archive_dir))