Fixed returns on failed files for ARCHIVE_GET

cedadev · Dec 19, 2024 · 87f16bd · 87f16bd
1 parent f6a351b
commit 87f16bd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/nlds_processors/archive/s3_to_tarfile_disk.py b/nlds_processors/archive/s3_to_tarfile_disk.py
@@ -71,7 +71,7 @@ def put(
         self.filelist_hash = self._generate_filelist_hash()
         completelist, failedlist = self._check_files_exist()
         if len(failedlist) > 0:
-            return [], failedlist, None
+            return [], failedlist, "", 0
 
         # make or find the holding folder on the disk
         try:
@@ -147,7 +147,7 @@ def get(
         tarfile: str,
         filelist: List[PathDetails],
         chunk_size: int,
-    ) -> tuple[List[PathDetails], List[PathDetails], str, int]:
+    ) -> tuple[List[PathDetails], List[PathDetails]]:
         """Stream from a tarfile on disk to Object Store"""
         if self.filelist != []:
             raise ValueError(f"self.filelist is not Empty: {self.filelist[0]}")

diff --git a/nlds_processors/archive/s3_to_tarfile_stream.py b/nlds_processors/archive/s3_to_tarfile_stream.py
@@ -306,7 +306,7 @@ def get(
         tarfile: str,
         filelist: List[PathDetails],
         chunk_size: int,
-    ) -> tuple[List[PathDetails], List[PathDetails], str, int]:
+    ) -> tuple[List[PathDetails], List[PathDetails]]:
         raise NotImplementedError
 
     @abstractmethod

diff --git a/nlds_processors/archive/s3_to_tarfile_tape.py b/nlds_processors/archive/s3_to_tarfile_tape.py
@@ -100,7 +100,7 @@ def put(
         self.filelist_hash = self._generate_filelist_hash()
         completelist, failedlist = self._check_files_exist()
         if len(failedlist) > 0:
-            return [], failedlist, None
+            return [], failedlist, "", 0
 
         # Make or find holding folder on the tape server
         status, _ = self.tape_client.mkdir(self.holding_tapepath, MkDirFlags.MAKEPATH)
@@ -165,7 +165,7 @@ def get(
         tarfile: str,
         filelist: List[PathDetails],
         chunk_size: int,
-    ) -> tuple[List[PathDetails], List[PathDetails], str, int]:
+    ) -> tuple[List[PathDetails], List[PathDetails]]:
         """Stream from a tarfile on tape to Object Store"""
         if self.filelist != []:
             raise ValueError(f"self.filelist is not Empty: {self.filelist[0]}")