Update files to v1.1

Clean Downloads.py

@@ -8,9 +8,17 @@
     "resort_folders": 0,
     "make_other_folder": 0,
     "sort_folders": 0,
-    "downloads_path": ""
+    "downloads_path": "",
+    "os": "mac",
+    "recognized_images": [".png", ".apng", ".jpeg", ".jpg", ".jfif", ".pjpeg", ".pjp", ".gif", ".svg", ".webp", ".tiff", ".bmp", ".ico", ".icns", ".heic"],
+    "recognized_zips": [".zip", ".sitx", ".7z", ".rar", ".gz", ".tar", ".tar.gz"],
+    "recognized_videos": [".mp4", ".mov", ".mpg", ".wmv", ".rm"],
+    "recognized_apps": [".app", ".pkg", ".dmg", ".exe"],
+    "recognized_text": [".txt", ".rtf", ".log", ".doc", ".docx", ".pdf", ".json", ".readme", ".pages", ".py", ".jar", ".java"],
+    "recognized_audio": [".mp3", ".wav", ".aif", ".mid", ".band", ".m4a"]
 }
 
+# Read from config.json
 try:
     with open("dc-data/config") as config_file:
         config = json.load(config_file)
@@ -19,39 +27,52 @@
     print("JSON File Not Found, Config Reset.")
 print("")
 
-images = [".png", ".apng", ".jpeg", ".jpg", ".jfif", ".pjpeg", ".pjp", ".gif", ".svg", ".webp", ".tiff", ".bmp", ".ico",
-          ".icns", ".heic"]
-zips = [".zip", ".sitx", ".7z", ".rar", ".gz", ".tar", ".tar.gz"]
-videos = [".mp4", ".mov", ".mpg", ".wmv", ".rm"]
-apps = [".app", ".pkg", ".dmg", ".exe"]
-text_files = [".txt", ".rtf", ".log", ".doc", ".docx", ".pdf", ".json", ".readme", ".pages", ".py", ".jar", ".java"]
-audio_types = [".mp3", ".wav", ".aif", ".mid", ".band", ".m4a"]
+images = config["recognized_images"]
+zips = config["recognized_zips"]
+videos = config["recognized_videos"]
+apps = config["recognized_apps"]
+text_files = config["recognized_text"]
+audio_types = config["recognized_audio"]
 
 # Setup Main Tkinter Window
 root = tk.Tk()
 root.title("Downloads Cleaner")
-root.geometry("372x185")
+
+if config["os"] == "win":
+    root.geometry("308x185")
+else:
+    root.geometry("372x185")
 root.geometry("+100+100")
 root.resizable(False, False)
 root.iconphoto(False, tk.PhotoImage(file="dc-data/icon.png"))
 
+# UI Style
 style = ttk.Style()
-style.theme_use("aqua")
+style.theme_use("default")
 
-# Tkinter Functions & Vars
+# Tkinter vars
 resort_folders = tk.IntVar(value=config["resort_folders"])
 make_other_folder = tk.IntVar(value=config["make_other_folder"])
 sort_folders = tk.IntVar(value=config["sort_folders"])
 path = tk.StringVar(value=config["downloads_path"])
 
 status = tk.StringVar(value="")
 
+# Updates config.json
 def changePrefs():
+    global config
     config = {
         "resort_folders": resort_folders.get(),
         "make_other_folder": make_other_folder.get(),
         "sort_folders": sort_folders.get(),
-        "downloads_path": path.get()
+        "downloads_path": path.get(),
+        "os": config["os"],
+        "recognized_images": images,
+        "recognized_zips": zips,
+        "recognized_videos": videos,
+        "recognized_apps": apps,
+        "recognized_text": text_files,
+        "recognized_audio": audio_types
     }
     with open("dc-data/config", "w") as config_file:
         json.dump(config, config_file)
@@ -65,6 +86,7 @@ def changePrefs():
 
     global downloads_contents
 
+# Cleans the folder
 def clean():
     changePrefs()
     global status
@@ -73,27 +95,35 @@ def clean():
     try:
         print("Clean Cycle Started!")
         print("")
+
         downloads_contents = os.listdir(path.get())
+
         if bool(resort_folders.get()):
             for i in downloads_contents:
                 type = os.path.splitext(i)[1].casefold()
+
                 if type == "":
                     if i == "Images" or i == "ZIP Files" or i == "Videos" or i == "Apps" or i == "Text Files" or i == "Other" or i == "Audio Files":
                         for d in os.listdir(path.get() + "/" + i):
                             global item_path
                             type = os.path.splitext(d)[1].casefold()
+
                             if bool(sort_folders.get()) and type == "":
                                 os.rename(path.get() + "/" + i + "/" + d, path.get() + "/" + d)
                                 print(d + " Was Moved To Your Downloads Folder.")
                                 print("")
+
                             elif not type == "":
                                 os.rename(path.get() + "/" + i + "/" + d, path.get() + "/" + d)
                                 print(d + " Was Moved To Your Downloads Folder.")
                                 print("")
+
         downloads_contents = os.listdir(path.get())
+
         for i in downloads_contents:
             folder = None
             type = os.path.splitext(i)[1].casefold()
+
             if type in images:
                 folder = "Images"
             elif type in zips:
@@ -119,9 +149,11 @@ def clean():
                     print("'" + folder + "' Folder Created.")
                 except:
                     print("'" + folder + "' Folder Already Exists.")
+
                 os.rename(path.get() + "/" + i, path.get() + "/" + folder + "/" + i)
                 print("'" + i + "' Was Moved To The '" + folder + "' Folder.")
                 print("")
+
         print("Clean Cycle Finished!")
         root.destroy()
     except:
@@ -130,31 +162,39 @@ def clean():
         status_bar.config(fg="red")
         status.set(value="Something went wrong.")
 
-# UI Elements
+# Title
 title = tk.Label(root, text="Options:")
 title.grid(column=0, row=0, padx=5, pady=5, sticky="w")
 
+# Resort folders button
 resort_folders_checkbox = tk.Checkbutton(root, text="Resort folders created by Downloads Cleaner", command=changePrefs, variable=resort_folders)
 resort_folders_checkbox.grid(column=0, row=1, padx=15, pady=2, sticky="w", columnspan=2)
 
+# Make other folder button
 make_other_folder_checkbox = tk.Checkbutton(root, text="Make an 'Other' folder", command=changePrefs, variable=make_other_folder)
 make_other_folder_checkbox.grid(column=0, row=2, padx=15, pady=2, sticky="w", columnspan=2)
 
+# Sort user folders button
 sort_folders_checkbox = tk.Checkbutton(root, text="Move user-created folders to the 'Other' folder", command=changePrefs, variable=sort_folders)
 if not bool(make_other_folder.get()):
     sort_folders_checkbox.config(state="disabled")
 sort_folders_checkbox.grid(column=0, row=3, padx=15, pady=2, sticky="w", columnspan=2)
 
+# Start clean button
 start_clean_butt = tk.Button(root, text="Done", command=clean)
 start_clean_butt.grid(column=1, row=5, sticky="es", padx=0, pady=5)
 
+# Bottom of window status bar
 status_bar = tk.Label(root, textvariable=status, fg="white")
 status_bar.grid(column=0, row=5, sticky="ws", padx=5, pady=5)
 
+# Title for downloads folder path
 path_title = tk.Label(root, text="Path Of Downloads Folder:")
 path_title.grid(column=0, row=4, padx=5, pady=5, sticky="w")
 
+# Downloads folder path text box
 path_input = tk.Entry(root, textvariable=path)
 path_input.grid(column=1, row=4, padx=0, sticky="w")
 
+# Tkinter mainloop
 root.mainloop()

dc-data/config

@@ -1 +1 @@
-{"resort_folders": 0, "make_other_folder": 0, "sort_folders": 0, "downloads_path": ""}
+{"resort_folders": 0, "make_other_folder": 0, "sort_folders": 0, "downloads_path": "", "os": "mac", "recognized_images": [".png", ".apng", ".jpeg", ".jpg", ".jfif", ".pjpeg", ".pjp", ".gif", ".svg", ".webp", ".tiff", ".bmp", ".ico", ".icns", ".heic"], "recognized_zips": [".zip", ".sitx", ".7z", ".rar", ".gz", ".tar", ".tar.gz"], "recognized_videos": [".mp4", ".mov", ".mpg", ".wmv", ".rm"], "recognized_apps": [".app", ".pkg", ".dmg", ".exe"], "recognized_text": [".txt", ".rtf", ".log", ".doc", ".docx", ".pdf", ".json", ".readme", ".pages", ".py", ".jar", ".java"], "recognized_audio": [".mp3", ".wav", ".aif", ".mid", ".band", ".m4a"]}