Merge branch 'h/requirements-fix'

Author: bitdruid

pywaybackup/__version__.py

@@ -1 +1 @@
-__version__ = "0.6.0"
+__version__ = "0.6.1"

pywaybackup/archive.py

@@ -1,7 +1,6 @@
 #import threading
 import requests
 import os
-import magic
 import gzip
 import threading
 import time
@@ -266,23 +265,4 @@ def download(download_entry, connection, status_message):
             v.write(status_message)
             return False
     v.write(f"FAILED  -> download, append to failed_urls: {download_url}")
-    return False
-
-
-# scan output folder and guess mimetype for each file
-# if add file extension if not present
-# def detect_filetype(filepath):
-#     v.write(f"\nDetecting filetypes...")
-#     path = Path(filepath)
-#     if not path.is_dir():
-#         v.write(f"\n-----> ERROR: {filepath} is not a directory"); return
-#     for file_path in path.rglob("*"):
-#         if file_path.is_file():
-#             file_extension = file_path.suffix
-#             if not file_extension:
-#                 mime_type = magic.from_file(str(file_path), mime=True)
-#                 file_extension = mime_type.split("/")[-1]
-#                 new_file_path = file_path.with_suffix('.' + file_extension)
-#                 file_path.rename(new_file_path)
-#                 v.write(f"NO EXT -> {file_path}")
-#                 v.write(f"   NEW -> {new_file_path}")
+    return False

pywaybackup/main.py

@@ -22,7 +22,6 @@ def main():
     optional.add_argument('-o', '--output', type=str, help='Output folder')
     optional.add_argument('-v', '--verbosity', type=str, default="standard", choices=["standard", "progress", "json"], help='Verbosity level')
     special = parser.add_argument_group('special')
-    #special.add_argument('--detect-filetype', action='store_true', help='If a file has no extension, try to detect the filetype')
     special.add_argument('--retry', type=int, default=0, metavar="X-TIMES", help='Retry failed downloads (opt tries as int, else infinite)')
     special.add_argument('--worker', type=int, default=1, metavar="AMOUNT", help='Number of worker (simultaneous downloads)')
 
@@ -46,8 +45,6 @@ def main():
         else:
             archive.download_list(snapshots, args.output, args.retry, args.worker)            
             archive.remove_empty_folders(args.output)
-        # if args.detect_filetype:
-        #     archive.detect_filetype(args.output)
     v.close()
 
 if __name__ == "__main__":

requirements.txt

@@ -1,2 +1,2 @@
-python-magic==0.4.27
-requests==2.31.0
+requests==2.31.0
+tqdm==4.66.2