ddi-fw 0.0.24__py3-none-any.whl → 0.0.26__py3-none-any.whl

ddi_fw/utils/zip_helper.py

@@ -40,8 +40,8 @@ class ZipHelper:
     def zip_as_multipart(self, zip_name, file_path, output_path, chunk_size):
         parent_folder = os.path.dirname(file_path)
 
-        parts_path = f"{parent_folder}/parts"
-        create_folder_if_not_exists(parts_path)
+        # parts_path = f"{parent_folder}/parts"
+        # create_folder_if_not_exists(parts_path)
         # file_name, file_extension = os.path.splitext(file_path)
         # file_name = os.path.basename(file_path)
         file_name, folder = get_file_name_and_folder(file_path)
@@ -52,15 +52,17 @@ class ZipHelper:
             self.zip_single_file(zip_name, file_path, output_path)
         else:
             return
-        with open(file_path, 'rb') as f:
+        with open(output_path+'/'+zip_name+'.zip', 'rb') as f:
             chunk_number = 1
             while True:
                 chunk = f.read(chunk_size)
                 if not chunk:
                     break
-                with open(f"{parts_path}/{file_name}.part{chunk_number:03}", 'wb') as chunk_file:
+                with open(f"{output_path}/{zip_name}.zip.part{chunk_number:03}", 'wb') as chunk_file:
                     chunk_file.write(chunk)
                 chunk_number += 1
+        if os.path.exists(output_path+'/'+zip_name+'.zip'):
+            os.remove(output_path+'/'+zip_name+'.zip')
 
     def zip(self, zip_prefix, input_path, output_path, chunk_size):
         files_paths = [input_path+'/' + p for p in os.listdir(input_path)]
@@ -87,6 +89,13 @@ class ZipHelper:
                 for file_path in value:
                     zipObj.write(file_path, basename(file_path))
 
+    def extract_single_file(self, file_path, output_path):
+        with z.ZipFile(file_path, 'r') as z1:
+             z1.extractall(path=output_path)
+
+    '''
+    Extract zip files from the given path to the output path
+    '''
     def extract(self, input_path, output_path):
         files_paths = [input_path+'/' + p for p in os.listdir(input_path)]
         if not os.path.exists(output_path):
@@ -97,13 +106,13 @@ class ZipHelper:
                     z1.extractall(path=output_path)
                     print(f'{file_path} has been extracted')
 
-    def extract_multiparts(self, output_path, parts_path, output_file):
-        input_parts = [parts_path+'/' + p for p in os.listdir(parts_path)]
+    def extract_multiparts(self, input_path, output_path, output_file):
+        parts = [input_path+'/' + p for p in os.listdir(input_path)]
         with open(f"{output_path}/{output_file}", 'wb') as outfile:
-            for part in input_parts:
+            for part in parts:
                 with open(part, 'rb') as infile:
                     outfile.write(infile.read())
-        self.extract(parts_path, output_path)
+        self.extract_single_file(f"{output_path}/{output_file}", output_path)
 
 
 # if __name__ == "__main__":

{ddi_fw-0.0.24.dist-info → ddi_fw-0.0.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ddi_fw
-Version: 0.0.24
+Version: 0.0.26
 Summary: Do not use :)
 Author-email: Kıvanç Bayraktar <bayraktarkivanc@gmail.com>
 Maintainer-email: Kıvanç Bayraktar <bayraktarkivanc@gmail.com>

{ddi_fw-0.0.24.dist-info → ddi_fw-0.0.26.dist-info}/RECORD

@@ -78,8 +78,8 @@ ddi_fw/test/type_guarding_test.py,sha256=KxjyBxohDu7lwpejalCj-REjtJ-k1S1wQbOB6TG
 ddi_fw/utils/__init__.py,sha256=nhNU_sEp55xsZ5VtvhozjKg6r4GWP6SJI13v8F_jbCg,217
 ddi_fw/utils/enums.py,sha256=19eJ3fX5eRK_xPvkYcukmug144jXPH4X9zQqtsFBj5A,671
 ddi_fw/utils/utils.py,sha256=Na6Y8mY-CFbQjrgd9xC8agcrjVvTj_7KIXqFm1H_3qU,3549
-ddi_fw/utils/zip_helper.py,sha256=oOnXlMVaH1Bj5EZpcOIxQMfKnLcuwamQCEOIuN288HQ,4976
-ddi_fw-0.0.24.dist-info/METADATA,sha256=eKPBSBXAX-ooVfz_FTeKNPsV7aU3byQ7IDS_FVAOK78,1541
-ddi_fw-0.0.24.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-ddi_fw-0.0.24.dist-info/top_level.txt,sha256=PMwHICFZTZtcpzQNPV4UQnfNXYIeLR_Ste-Wfc1h810,7
-ddi_fw-0.0.24.dist-info/RECORD,,
+ddi_fw/utils/zip_helper.py,sha256=tnzA5SwiIbXxNygR9WGQmT7wQ9BEssJHNziQDHlavTM,5378
+ddi_fw-0.0.26.dist-info/METADATA,sha256=Q6MCymz9sAM4SVPw0miBH8gVhq4W9ZmkF5NV9s9e8Rc,1541
+ddi_fw-0.0.26.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+ddi_fw-0.0.26.dist-info/top_level.txt,sha256=PMwHICFZTZtcpzQNPV4UQnfNXYIeLR_Ste-Wfc1h810,7
+ddi_fw-0.0.26.dist-info/RECORD,,