Merge pull request #5 from CoolCoderCarl/develop

Develop
CoolCoderCarl · May 17, 2022 · f406b2a · f406b2a
2 parents 83ec663 + e4dfbdc
commit f406b2a
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/butler.py b/butler.py
@@ -10,27 +10,34 @@
     ".ini",
     ".doc",
     ".docx",
+    ".rtf",
     ".pdf",
     ".xlsx",
     ".xls",
+    ".pptx",
     ".zip",
+    ".7z",
+    ".gz",
+    ".bz",
+    ".gzip",
+    ".bzip",
     ".iso",
+    ".mkv",
+    ".mov",
     ".bmp",
     ".jpg",
     ".png",
     ".exe",
     ".msi",
     ".msu",
-    ".rtf",
-    ".pptx",
     ".conf",
     ".cfg",
     ".net",
     ".deny",
     ".allow",
 ]
 
-archives_extension = [".zip", ".7z", ".gz", ".bz", ".gzip", ".bzip"]
+archives_extension = [".zip", ".7z", ".gz", ".bz", ".gzip", ".bzip", ".iso"]
 
 target_dir_name = "ALL"
 
@@ -82,9 +89,8 @@ def create_archive(dir_to_archive: str):
                     for a_ext in archives_extension:
                         if filename.endswith(a_ext):
                             pass
-                        else:
-                            zip_path = os.path.join(folder_name, filename)
-                            zip_obj.write(zip_path, basename(zip_path))
+                    zip_path = os.path.join(folder_name, filename)
+                    zip_obj.write(zip_path, basename(zip_path))
 
 
 parser = argparse.ArgumentParser(