Merge pull request #6 from safeers/master

Optimised code in filemover.py

Author: codeperfectplus

filemover.py

@@ -24,15 +24,15 @@
 """)
 
 folder_ex = {
-    "Programming Files": [".ipynb", ".py", ".java", ".cs", ".js", ".vsix", ".jar"],
-    "Compressed": [".zip", ".rar", ".arj", ".gz", ".sit", ".sitx", ".sea", ".ace", ".bz2", ".7z"],
-    "Applications": [".exe", ".msi"],
-    "Pictures":  [".jpeg", ".jpg", ".png", ".gif", ".tiff", ".raw", ".webp", ".jfif", ".ico", ".psd", ".svg", ".ai"],
-    "Videos":  [".mp4", ".webm", ".mkv", ".MPG", ".MP2", ".MPEG", ".MPE", ".MPV", ".OGG", ".M4P", ".M4V", ".WMV", ".MOV", ".QT", ".FLV", ".SWF", ".AVCHD", ".avi", ".mpg", ".mpe", ".mpeg", ".asf", ".wmv", ".mov", ".qt", ".rm", ],
-    "Documents": [".txt", ".pdf", ".doc", ".xlsx", ".pdf", ".ppt", ".pps", ".docx", ".pptx"],
-    "Music":  [".mp3", ".wav", ".wma", ".mpa", ".ram", ".ra", ".aac", ".aif", ".m4a", ".tsa"],
-    "Torrents": [".torrent"],
-    "Other": [],
+    "Programming Files": set([".ipynb", ".py", ".java", ".cs", ".js", ".vsix", ".jar"]),
+    "Compressed": set([".zip", ".rar", ".arj", ".gz", ".sit", ".sitx", ".sea", ".ace", ".bz2", ".7z"]),
+    "Applications": set([".exe", ".msi"]),
+    "Pictures":  set([".jpeg", ".jpg", ".png", ".gif", ".tiff", ".raw", ".webp", ".jfif", ".ico", ".psd", ".svg", ".ai"]),
+    "Videos":  set([".mp4", ".webm", ".mkv", ".MPG", ".MP2", ".MPEG", ".MPE", ".MPV", ".OGG", ".M4P", ".M4V", ".WMV", ".MOV", ".QT", ".FLV", ".SWF", ".AVCHD", ".avi", ".mpg", ".mpe", ".mpeg", ".asf", ".wmv", ".mov", ".qt", ".rm"]),
+    "Documents": set([".txt", ".pdf", ".doc", ".xlsx", ".pdf", ".ppt", ".pps", ".docx", ".pptx"]),
+    "Music":  set([".mp3", ".wav", ".wma", ".mpa", ".ram", ".ra", ".aac", ".aif", ".m4a", ".tsa"]),
+    "Torrents": set([".torrent"]),
+    "Other": set([])
 }
 
 

filemovergui.py

@@ -1,3 +1,9 @@
+import os
+
+import tkinter as tk
+from os import path
+from shutil import move
+
 print(r"""
    ______            __         ____               ____             __     ____   __            
   / ____/____   ____/ /___     / __ \ ___   _____ / __/___   _____ / /_   / __ \ / /__  __ _____
@@ -17,59 +23,58 @@
   | //                       Website : http://codeperfectplus.herokuapp.com            //|
   |  --------------------------------------------------------------------------------------
 """)
-import os
-from os import path
-from shutil import move
-import tkinter as tk
 
 
-def create_folder():
-    paths = [
-        "Programming File",
-        "Compressed",
-        "Application",
-        "Picture",
-        "Video",
-        "Documents",
-        "Music",    
-        "Torrents"
-    ]
-    for root in paths:
+folder_ex = {
+    "Programming Files": set([".ipynb", ".py", ".java", ".cs", ".js", ".vsix", ".jar"]),
+    "Compressed": set([".zip", ".rar", ".arj", ".gz", ".sit", ".sitx", ".sea", ".ace", ".bz2", ".7z"]),
+    "Applications": set([".exe", ".msi"]),
+    "Pictures":  set([".jpeg", ".jpg", ".png", ".gif", ".tiff", ".raw", ".webp", ".jfif", ".ico", ".psd", ".svg", ".ai"]),
+    "Videos":  set([".mp4", ".webm", ".mkv", ".MPG", ".MP2", ".MPEG", ".MPE", ".MPV", ".OGG", ".M4P", ".M4V", ".WMV", ".MOV", ".QT", ".FLV", ".SWF", ".AVCHD", ".avi", ".mpg", ".mpe", ".mpeg", ".asf", ".wmv", ".mov", ".qt", ".rm"]),
+    "Documents": set([".txt", ".pdf", ".doc", ".xlsx", ".pdf", ".ppt", ".pps", ".docx", ".pptx"]),
+    "Music":  set([".mp3", ".wav", ".wma", ".mpa", ".ram", ".ra", ".aac", ".aif", ".m4a", ".tsa"]),
+    "Torrents": set([".torrent"]),
+    "Other": set([])
+}
+
+
+def create_folders():
+    """Creates the required folders to organize files ('Pictures', 'Videos'...).
+    """
+    for root in folder_ex:
         try:
             os.mkdir(root)
+            print(f"'{root:20}' Created ✔")
         except OSError:
-            print("Folder Already Exists")
-
-pic = [".jpeg", ".jpg", ".png", ".gif", ".tiff", ".raw", ".webp", ".jfif", ".ico", ".psd", ".svg", ".ai"]
-pytho = [".ipynb", ".java", ".cs", ".js", ".vsix",".jar"]
-txt = [".txt", ".pdf", ".doc", ".pdf", ".ppt", ".pps", ".docx", ".pptx"]
-music = [".mp3", ".wav", ".wma", ".mpa", ".ram", ".ra", ".aac", ".aif", ".m4a", ".tsa"]
-zip = [".zip", ".rar", ".arj", ".gz", ".sit", ".sitx", ".sea", ".ace", ".bz2", ".7z"]
-app = [".exe", ".msi"]
-vid = [".mp4",".webm",".mkv",".MPG",".MP2",".MPEG",".MPE",".MPV",".OGG",".M4P",".M4V",
-    ".WMV",".MOV",".QT",".FLV",".SWF",".AVCHD",".avi",".mpg",".mpe",".mpeg",".asf",
-    ".wmv",".mov",".qt",".rm",]
-torrents = [".torrent"]
-
-def transfer(arr,name,ex,file):
-    for i in range(len(arr)):
-        if ex == arr[i]:
-            move(file,name)
+            print(f"'{root:20}' Already Exists")
+
+
+def get_folder(ext):
+    """Returns the Folder that corresponds to the given extension.
+
+    Args:
+        ext (String): The extension of the file.
+
+    Returns:
+        String: The name of the Folder that holds the ext.
+    """
+    for f, ex in folder_ex.items():
+        if ext in ex:
+            return f
+    return "Other"
+
+
 
 def start():
-    for files in os.listdir():
-        try:
-            _, ex = path.splitext(files)
-            transfer(pic,"Picture",ex,files)
-            transfer(vid,"Video",ex,files)
-            transfer(pytho,"Programming File",ex,files)
-            transfer(txt,"Documents",ex,files)
-            transfer(music,"Music",ex,files)
-            transfer(torrents,"Torrents",ex,files)
-            transfer(txt,"Application",ex,files)
-            transfer(zip,"Compressed",ex,files)
-        except:
-            print("Couldn't move file ", files)
+    for file in os.listdir():
+        # Check it's not filemover.py, a hidden file or a directory
+        if file != __file__ and file[0] != '.' and path.isfile(file):
+            try:
+                _, ex = path.splitext(file)
+                folder = get_folder(ex)
+                move(file, folder)
+            except:
+                print("Couldn't move file ", file)
 
 
 if __name__ == "__main__":      
@@ -91,13 +96,18 @@ def start():
     btn = tk.Button(
         master=frame_a,
         text="Create Folder",
-        command=create_folder,
+        command=create_folders,
         bg="green",
         width=20,
         height=5,
     )
     btn2 = tk.Button(
-        master=frame_b, text="Move Now", command=start, bg="red", width=20, height=5
+        master=frame_b, 
+        text="Move Now", 
+        command=start, 
+        bg="red", 
+        width=20, 
+        height=5
     )
     lbl = tk.Label(
         master=window,