From 13a4d7680696ef5f179308410440d01f5ec28c19 Mon Sep 17 00:00:00 2001
From: piyx <piyx.abhishek@gmail.com>
Date: Sun, 18 Oct 2020 11:07:08 -0700
Subject: [PATCH] simplity os check

---
 organize.py | 93 +++++++++++++++++++----------------------------------
 1 file changed, 33 insertions(+), 60 deletions(-)

diff --git a/organize.py b/organize.py
index ba3d9a2..7ef1cbe 100644
--- a/organize.py
+++ b/organize.py
@@ -14,74 +14,47 @@ def organize_files(drive):
     operating_system = platform.system()
     if operating_system == "Windows":  # Windows
         drive = drive + "\\"
-        if not os.path.exists(drive):
-            print(f"ERROR! {drive} is not a valid location")
-            return
-        files = os.listdir(drive)
-        extns = {os.path.splitext(file)[1].strip(".") for file in files}
-
-        # Create Folders
-        for ext in extns:
-            folder = foldername(ext)
-            if folder and not os.path.exists(drive + folder):
-                os.makedirs(drive + folder)
-
-        # Move Files To Folders
-        for file in files:
-            if file in [FILE_NAME, EXT_NAME]:
-                continue
-            ext = os.path.splitext(file)[1].strip(".")
-            folder = foldername(ext)
-            if not folder:
-                continue
-
-            src = drive + file
-            dest = drive + folder + "/" + file
-
-            if not os.path.exists(dest):
-                shutil.move(src, dest)
-                print(f"Moved {file} to {folder}")
-
-        print(f"\nSUCCESS! All files organized in {drive}")
-
     elif operating_system == "Darwin":  # Mac
         drive = os.path.expanduser(drive)
-        if not os.path.exists(drive):
-            print(f"ERROR! {drive} is not a valid location")
-            return
-        files = os.listdir(drive)
-        extns = {os.path.splitext(file)[1].strip(".") for file in files}
-        # Create Folders
-        for ext in extns:
-            folder = foldername(ext)
-            if folder and not os.path.exists(os.path.join(drive, folder)):
-                os.makedirs(os.path.join(drive, folder))
-
-        # Move Files To Folders
-        for file in files:
-            if file in [FILE_NAME, EXT_NAME]:
-                continue
-            ext = os.path.splitext(file)[1].strip(".")
-            folder = foldername(ext)
-            if not folder:
-                continue
-
-            src = os.path.join(drive, file)
-            dest = os.path.join(drive, folder, file)
-
-            if not os.path.exists(dest):
-                shutil.move(src, dest)
-                print(f"Moved {file} to {folder}")
+    else:
+        print(f"Operating system {operating_system} not currently supported")
+        sys.exit(0)
+    if not os.path.exists(drive):
+        print(f"ERROR! {drive} is not a valid location")
+        return
+    files = os.listdir(drive)
+    extns = {os.path.splitext(file)[1].strip(".") for file in files}
+
+    # Create Folders
+    for ext in extns:
+        folder = foldername(ext)
+        if folder and not os.path.exists(drive + folder):
+            os.makedirs(drive + folder)
+
+    # Move Files To Folders
+    for file in files:
+        if file in [FILE_NAME, EXT_NAME]:
+            continue
+        ext = os.path.splitext(file)[1].strip(".")
+        folder = foldername(ext)
+        if not folder:
+            continue
+
+        src = drive + file
+        dest = drive + folder + "/" + file
+
+        if not os.path.exists(dest):
+            shutil.move(src, dest)
+            print(f"Moved {file} to {folder}")
 
         print(f"\nSUCCESS! All files organized in {drive}")
-    else:
-        print(f"{operating_system} not currently supported")
 
 
 if __name__ == "__main__":
     try:
-        location = sys.argv[1]
-        organize_files(location)
+        # location = sys.argv[1]
+        # organize_files(location)
+        organize_files('~/Trash')
     except Exception as e:
         print("USAGE: python organize.py <location>")
         print(e)