split by max number of files

files/FolderSplit.py

@@ -4,7 +4,7 @@ import os, sys
 import math, shutil, re
 from random import shuffle
 
-VERSION = "0.1"
+VERSION = "0.2"
 
 
 def setup_options():
@@ -37,6 +37,13 @@ def setup_options():
         default=False,
         help="Split files only, skipping folders",
     )
+    parser.add_argument(
+        "--dry",
+        action="store_true",
+        dest="dry",
+        default=False,
+        help="Dry run",
+    )
     parser.add_argument(
         "-r",
         "--regexp",
@@ -44,16 +51,27 @@ def setup_options():
         action="store",
         dest="regexp",
         default="",
-        help="Regular expression for splitting. When set, order regexp used, -n not used.",
+        help="Regular expression for splitting. When set, order regexp used, -n or -i not used.",
     )
     parser.add_argument(
         "-n",
         "-N",
         type=int,
+        default=None,
         action="store",
         dest="n",
-        help="Number of subfolders to split into.",
+        help="Number of subfolders to split into. Default 10.",
     )
+    parser.add_argument(
+        "-i",
+        "-I",
+        type=int,
+        default=None,
+        action="store",
+        dest="i",
+        help="Max number of files in one folder. Can not be used together with -n or -r",
+    )
+
     parser.add_argument(
         "path",
         type=str,
@@ -63,11 +81,15 @@ def setup_options():
         help="Folder to split.",
     )
     options = parser.parse_args()
-    if options.n == None and options.regexp == "":
+    if options.n is None and options.i is None and options.regexp == "":
         parser.print_help()
-        parser.error("Either -n or -r must be passed")
+        parser.error("Either -n, -i or -r must be passed")
     if options.regexp != "":
         options.order = "regexp"
+    if options.regexp == "":
+        if not options.i is None and not options.n is None:
+            parser.print_help()
+            parser.error("Both -n and -i cannot be used at the same time.")
     return options
 
 
@@ -159,6 +181,7 @@ def regexmatches(inFiles, opts):
     uniqlabel = sorted(set(matches))
     print("Unique matches", uniqlabel)
     print("Not matching %d files." % skipped)
+    outFolders = []
     for x in uniqlabel:
         outFolders.append(os.path.join(opts.path, x))
     return (outFolders, uniqlabel, matcher)
@@ -177,35 +200,50 @@ def report(outFolders):
         print(os.path.basename(x) + ":" + str(n))
 
 
+def main():
     """Splits a folder input in N outputs"""
     options = setup_options()
-outFolders = []
     method = options.order.lower().strip()
     # list files, and remove hidden  (.files)
     inFiles = sorted(filter(lambda x: not x.startswith("."), os.listdir(options.path)))
     if options.files:
         inFiles = [f for f in inFiles if os.path.isfile(os.path.join(options.path, f))]
 
+    if options.n:
+        n = options.n
+        i = math.ceil(len(inFiles) / n)
+    else:
+        n = math.ceil(len(inFiles) / options.i)
+        i = options.i
+
     if method == "regexp":
         (outFolders, uniqlabel, matcher) = regexmatches(inFiles, options)
-    input("correct?")
     else:
-    padding = "{:0" + str(len(str(options.n))) + "d}"
+        print("Splitting to {} folders, <={} files / folder".format(n, i))
-    for x in range(options.n):
+        outFolders = []
-        outFolders.append(os.path.join(options.path, ("folder-" + padding).format(x + 1)))
+        padding = "{:0" + str(len(str(n))) + "d}"
+        for x in range(n):
+            outFolders.append(
+                os.path.join(options.path, ("folder-" + padding).format(x + 1))
+            )
 
+    if options.dry:
+        print("Not doing anything, --dry")
+        return
     for x in outFolders:
         if not os.path.isdir(x):
             os.mkdir(x)
-if method == "random":
-    shuffle(inFiles)
-    portorder(inFiles, options.path, outFolders, options.n, options.move)
     if method == "regexp":
         regexorder(inFiles, options.path, outFolders, matcher, uniqlabel, options.move)
+    if method == "random":
+        shuffle(inFiles)
+        portorder(inFiles, options.path, outFolders, n, options.move)
     if method == "sparse":
-    portorder(inFiles, options.path, outFolders, options.n, options.move)
+        portorder(inFiles, options.path, outFolders, n, options.move)
     if method == "sequence":
-    fileorder(inFiles, options.path, outFolders, options.n, options.move)
+        fileorder(inFiles, options.path, outFolders, n, options.move)
-
-
     report(outFolders)
+
+
+if __name__ == "__main__":
+    main()