optimized it

Author: CodeCraftPlugin

.gitignore

@@ -1,4 +1,5 @@
 .venv/
 .vscode/
 build_windows/
-__pycache__/
+__pycache__/
+/.idea/

auto_download_cleaner.py auto_download_sorter.pyauto_download_cleaner.py renamed to auto_download_sorter.py

@@ -1,12 +1,14 @@
 import os
 import shutil
 import variable as var
-import save as sv
 import tray_icon as ti
+import save as sv
 import time as time
 import json
+
+
 def load_variables_from_json():
-    dirname = os.path.dirname(__file__)
+    dirname = os.path.join(os.getenv("APPDATA"), "Auto-Download-Cleaner")
     filename = os.path.join(dirname, 'config.json')
     try:
         with open(filename, "r") as json_file:
@@ -15,38 +17,48 @@ def load_variables_from_json():
         # If the config file doesn't exist, return an empty dictionary
         return {}
     return loaded_vars
+
+
 def move_file(main_directory, move_folder, filename):
     if move_folder is None:
         raise ValueError("Invalid move_folder: None")
-    
+
     if not os.path.exists(move_folder):
         os.makedirs(move_folder)
-    
+
     shutil.move(os.path.join(main_directory, filename), os.path.join(move_folder, filename))
+
+
 def check_file_extension(file_ext, mov_dir, filename):
     if filename.endswith(file_ext):
         time.sleep(1)
         move_file(main_directory=sv.get_default_download_folder(), move_folder=mov_dir, filename=filename)
+
+
 def main_stuff():
     sv.main()
     loaded_vars = load_variables_from_json()
     print(loaded_vars)
     print(sv.get_default_download_folder())
     print('Program started.')
     while var.run:
-        for filename in os.listdir(sv.get_default_download_folder()):
-            try:
-                check_file_extension(".pdf",  mov_dir=loaded_vars.get(var.PDF), filename=filename)
-                check_file_extension(".docx",  mov_dir=loaded_vars.get(var.DOCX), filename=filename)
-                check_file_extension('.zip',  mov_dir=loaded_vars.get(var.ZIP), filename=filename)
-                check_file_extension(var.Image,  mov_dir=loaded_vars.get(var.IMAGE), filename=filename)
-                check_file_extension('.py',  mov_dir=loaded_vars.get(var.Python), filename=filename)
-                check_file_extension(var.Video,  mov_dir=loaded_vars.get(var.VIDEO), filename=filename)
-                check_file_extension(var.audio_formats,mov_dir=loaded_vars.get(var.MUSIC), filename=filename)
-                check_file_extension('.torrent',  mov_dir=loaded_vars.get(var.Torrent), filename=filename)
-            except PermissionError:
-                continue
+        print("running")
+        try:
+            folder_content = os.listdir(sv.get_default_download_folder())
+        except PermissionError:
+            continue
+        for filename in folder_content:
+            check_file_extension(".pdf", mov_dir=loaded_vars.get(var.PDF), filename=filename)
+            check_file_extension(".docx", mov_dir=loaded_vars.get(var.DOCX), filename=filename)
+            check_file_extension(var.Zip, mov_dir=loaded_vars.get(var.ZIP), filename=filename)
+            check_file_extension(var.Image, mov_dir=loaded_vars.get(var.IMAGE), filename=filename)
+            check_file_extension('.py', mov_dir=loaded_vars.get(var.Python), filename=filename)
+            check_file_extension(var.Video, mov_dir=loaded_vars.get(var.VIDEO), filename=filename)
+            check_file_extension(var.audio_formats, mov_dir=loaded_vars.get(var.MUSIC), filename=filename)
+            check_file_extension('.torrent', mov_dir=loaded_vars.get(var.Torrent), filename=filename)
+        time.sleep(0.5)
+
+
 if __name__ == "__main__":
-    
     ti.start()
-    main_stuff() 
+    main_stuff()

config.json

@@ -0,0 +1,2 @@
+pystray>=0.19.4
+Pillow>=10.1.0

requirements.txt

@@ -2,8 +2,9 @@
 import json
 import getpass
 import variable
-def get_default_download_folder():
 
+
+def get_default_download_folder():
     # try to automatically detect the download folder
     default_download_folder = None
 
@@ -18,44 +19,52 @@ def get_default_download_folder():
 
     return default_download_folder
 
+
 def create_default_directories():
-    # If username is "codecraft", use the hardcoded download folder
+    # If username is "codecraft", use the hardcoded download folder this is for my personal use
     username = getpass.getuser()
-    if username=="CodeCraft":
+    if username == "CodeCraft":
         default_dirs = default_dirs = {
-        "PDF": os.path.join(os.path.expanduser("~"),"Documents", "PDF"),
-        "DOCX": os.path.join(os.path.expanduser("~"),"Documents", "DOCX"),
-        "ZIP": variable.ZIP_DIR,
-        "Image": os.path.join(os.path.expanduser("~"),"Pictures", "Photos"),
-        "Python": variable.PYTHON_DIR,
-        "Video": os.path.join(os.path.expanduser("~"),"Videos"),
-        "Music": os.path.join(os.path.expanduser("~"), "Music"),
-        "Torrent": os.path.join(get_default_download_folder(), "Torrents")
+            "PDF": os.path.join(os.path.expanduser("~"), "Documents", "PDF"),
+            "DOCX": os.path.join(os.path.expanduser("~"), "Documents", "DOCX"),
+            "ZIP": variable.ZIP_DIR,
+            "Image": os.path.join(os.path.expanduser("~"), "Pictures", "Photos"),
+            "Python": variable.PYTHON_DIR,
+            "Video": os.path.join(os.path.expanduser("~"), "Videos"),
+            "Music": os.path.join(os.path.expanduser("~"), "Music"),
+            "Torrent": os.path.join(get_default_download_folder(), "Torrents")
         }
         return default_dirs
     # Define default directories for different file types
     default_dirs = {
-        "PDF": os.path.join(os.path.expanduser("~"),"Documents", "PDF"),
-        "DOCX": os.path.join(os.path.expanduser("~"),"Documents", "DOCX"),
+        "PDF": os.path.join(os.path.expanduser("~"), "Documents", "PDF"),
+        "DOCX": os.path.join(os.path.expanduser("~"), "Documents", "DOCX"),
         "ZIP": os.path.join(get_default_download_folder(), "ZIP"),
-        "Image": os.path.join(os.path.expanduser("~"),"Pictures", "Photos"),
-        "Python": os.path.join(os.path.expanduser("~"),"Code", "Python"),
-        "Video": os.path.join(os.path.expanduser("~"),"Videos"),
+        "Image": os.path.join(os.path.expanduser("~"), "Pictures", "Photos"),
+        "Python": os.path.join(os.path.expanduser("~"), "Code", "Python"),
+        "Video": os.path.join(os.path.expanduser("~"), "Videos"),
         "Music": os.path.join(os.path.expanduser("~"), "Music"),
         "Torrent": os.path.join(get_default_download_folder(), "Torrents")
     }
 
     return default_dirs
 
+
 def save_variables_to_json(vars_dict):
-    with open("config.json", "w") as json_file:
+    appdata = os.getenv("APPDATA")
+    appdir_config = os.path.join(appdata, "Auto-Download-Cleaner")
+    if not os.path.exists(appdir_config):
+        os.makedirs(appdir_config)
+    filename = os.path.join(appdir_config, "config.json")
+    with open(filename, "w") as json_file:
         json.dump(vars_dict, json_file, indent=4)
 
+
 def main():
     username = getpass.getuser()
     # Create default directories for different file types
     default_directories = create_default_directories()
 
     # Save the variables to a JSON file
-    if (os.path.exists("config.json"))==False:
-        save_variables_to_json(default_directories)     
+    if (os.path.exists("config.json")) == False:
+        save_variables_to_json(default_directories)

save.py

@@ -3,16 +3,16 @@
 
 # Dependencies are automatically detected, but it might need
 # fine tuning.
-build_options = {'packages': ['os','getpass'], 'excludes': [],'build_exe': 'build_windows','include_files':['icon.ico']}
+build_options = {'packages': ['os', 'getpass'], 'excludes': [], 'build_exe': 'build_windows',
+                 'include_files': ['icon.ico']}
 
-base = 'Win32GUI' if sys.platform=='win32' else None
+base = 'Win32GUI' if sys.platform == 'win32' else None
 
 executables = [
-    Executable('auto_download_cleaner.py', base=base, target_name = 'Auto Download Cleanup',icon='icon.ico')
+    Executable('auto_download_sorter.py', base=base, target_name='Auto Download Sorter', icon='icon.ico')
 ]
-
-setup(name='Auto-Download-Cleanup',
-      version = '1.0',
-      description = 'Automatic sorter for downloads folder',
-      options = {'build_exe': build_options},
-      executables = executables)
+setup(name='Auto Download Sorter',
+      version='1.0',
+      description='Auto Download Sorter',
+      options={'build_exe': build_options},
+      executables=executables)

setup.py

@@ -2,14 +2,18 @@
 import PIL.Image
 import variable as vars
 
-image = PIL.Image.open("icon.ico")
+image = PIL.Image.open('icon.ico')
 
-def on_click(icon, item):
+
+def on_click(main_icon, item):
     if str(item) == 'Quit':
         print('Closing the app.')
-        icon.stop()
+        main_icon.stop()
         vars.run = False
 
+
 icon = pystray.Icon("name", image, "Auto Download Cleanup", menu=pystray.Menu(pystray.MenuItem("Quit", on_click)))
+
+
 def start():
     icon.run_detached()

tray_icon.py

@@ -1,8 +1,13 @@
 run = True
 ZIP_DIR = 'D:\\Zip'
-Image = ('.png', '.jpg', '.jpeg', '.gif', '.tiff', '.psd', '.raw', '.bmp', '.heif', '.indd', '.svg', '.ai', '.eps', '.ico', '.webp')
+Image = (
+    '.png', '.jpg', '.jpeg', '.gif', '.tiff', '.psd', '.raw', '.bmp', '.heif', '.indd', '.svg', '.ai', '.eps', '.ico',
+    '.webp')
+Zip = ('.rar', '.zip', '.tar', '.gz', '.7z')
 PYTHON_DIR = 'D:\\Python'
-Video = ('.mp4', '.mov', '.wmv', '.avi', '.avchd', '.flv', '.f4v', '.swf', '.mkv', '.webm', '.mng', '.gifv', '.mpg', '.mp2', '.mpeg', '.mpe', '.mpv', '.ogg', '.m4p', '.m4v', '.wmv', '.mov', '.qt', '.flv', '.swf', '.avchd')
+Video = (
+    '.mp4', '.mov', '.wmv', '.avi', '.avchd', '.flv', '.f4v', '.swf', '.mkv', '.webm', '.mng', '.gifv', '.mpg', '.mp2',
+    '.mpeg', '.mpe', '.mpv', '.ogg', '.m4p', '.m4v', '.wmv', '.mov', '.qt', '.flv', '.swf', '.avchd')
 audio_formats = ('.mp3', '.wav', '.aiff', '.flac', '.aac', '.ogg', '.wma', '.m4a', '.ape', '.alac', '.dsd')
 PDF = "PDF"
 DOCX = "DOCX"
@@ -11,4 +16,4 @@
 Python = "Python"
 VIDEO = "Video"
 MUSIC = "Music"
-Torrent = "Torrent"
+Torrent = "Torrent"