dupekill 1.2!dupekill-1.2

1 files changed, 17 insertions, 17 deletions

diff --git a/dupekill b/dupekill
index 91a059b..ff9e3b2 100755
--- a/dupekill
+++ b/dupekill
@@ -31,17 +31,7 @@ from optparse import OptionParser
 #
 # You have been warned. >:3
 
-def dupekill():
-    usage = "Usage: %prog [options] {path}"
-    parser = OptionParser(usage=usage)
-    parser.add_option("-d", "--dry", dest='dry_run', action='store_true', default=False, help="displays a list of files dupekill will delete if you run it again without this flag")
-    parser.add_option("-r", "--recursive", dest='recursive', action='store_true', default=False, help="Recurses into all directories below the starting point")
-    parser.add_option("-v", "--verbose", dest='verbose', action='store_true', default=False, help="Provide more detailed output")
-    (options, args) = parser.parse_args()
-    if args and os.path.isdir(args[0]):
-        path = os.path.abspath(args[0])
-    else:
-        path = os.getcwd()
+def dupekill(dry_run=False, recursive=False, verbose=False, path=os.getcwd()):
 
     if not os.path.isdir(path):
         print("Error: Unable to fetch directory to work with.")
@@ -56,7 +46,7 @@ def dupekill():
         for root, dirs, file in file_list:
             ignore_dirs = ['.git', '.config']
             for dir in ignore_dirs:
-                if options.recursive == True:
+                if recursive == True:
                     # Recursion still needs to ignore certain dirs
                     if dir in dirs:
                         dirs.remove(dir)
@@ -75,28 +65,38 @@ def dupekill():
                     # We want to count these, even if it's a dry run.
                     deleted_files += 1
 
-                    if not options.dry_run:
+                    if not dry_run:
                         os.remove(os.path.join(root, item))
 
-                    if options.verbose:
+                    if verbose:
                         print("Dupe", os.path.join(root, item), "found.")
 
                 else:
                     hashList.append(hash)
 
-                    if options.verbose:
+                    if verbose:
                         print("New file", os.path.join(root, item))
 
         # Print a summary
         print()
 
-        if options.dry_run:
+        if dry_run:
             print("THIS IS A DRY RUN! NO FILES WILL BE ALTERED!")
 
         print(processed_files, "files processed,", deleted_files, "deleted.\n")
 
 if __name__ == '__main__':
     try:
-        dupekill()
+        usage = "Usage: %prog [options] {path}"
+        parser = OptionParser(usage=usage)
+        parser.add_option("-d", "--dry", dest='dry_run', action='store_true', default=False, help="displays a list of files dupekill will delete if you run it again without this flag")
+        parser.add_option("-r", "--recursive", dest='recursive', action='store_true', default=False, help="Recurses into all directories below the starting point")
+        parser.add_option("-v", "--verbose", dest='verbose', action='store_true', default=False, help="Provide more detailed output")
+        (options, args) = parser.parse_args()
+        if args and os.path.isdir(args[0]):
+            path = os.path.abspath(args[0])
+        else:
+            path = os.getcwd()
+        dupekill(options.dry_run, options.recursive, options.verbose, path)
     except KeyboardInterrupt:
         print("Aborted")