--

soeren-kirchner · Nov 8, 2019 · 6582159 · 6582159
1 parent 5576011
commit 6582159
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/examples/pyimgbatch-short.json b/examples/pyimgbatch-short.json
@@ -3,10 +3,10 @@
     "comment": "some sample pictures",
     "source": "webset/source",
     "dest": "webset/dest",
-    "prefix": "default-prefix.",
+    "prefix": "web.",
     "configs": [
         { "width": 180, "suffix": ".w180", "webset": "@3x" },
-        { "width": 300, "suffix": ".w400", "webset": "@3x" },
+        { "width": 300, "suffix": ".w300", "webset": "@3x" },
         { "width": 400, "suffix": ".w400", "webset": "@3x" },
         { "height": 800, "prefix": "preview.", "webset": "@3x" }
     ]

diff --git a/examples/pyimgbatch.json b/examples/pyimgbatch.json
@@ -11,7 +11,7 @@
             "prefix": "web.",
             "configs": [
                 { "width": 180, "suffix": ".w180", "webset": "@3x" },
-                { "width": 300, "suffix": ".w400", "webset": "@3x" },
+                { "width": 300, "suffix": ".w300", "webset": "@3x" },
                 { "width": 400, "suffix": ".w400", "webset": "@3x" },
                 { "height": 800, "prefix": "preview.", "webset": "@3x" }
             ]

diff --git a/pyimgbatch/__main__.py b/pyimgbatch/__main__.py
@@ -14,18 +14,24 @@ def main():
     args = get_args()
     if args.debug:
         logging.getLogger().setLevel(logging.DEBUG)
-
     logging.debug(args)
-    pib = PyImgBatch(vars(args))
+
+    pib = PyImgBatch(prepare_arguments(args))
     pib.exec()
 
 
+def prepare_arguments(args):
+    args_prep = vars(args)
+    args_prep['subfolder'] = not args_prep['nosubfolder']
+    return args_prep
+
+
 def get_args():
     parser = argparse.ArgumentParser()
 
     file_handling_group = parser.add_argument_group('file handling')
     file_handling_group.add_argument('-c', '--configfile', type=str,
-                                     default='imagebatch.json', help='configuration file')
+                                     default='imagebatch.json', help='configuration file')  # TODO: remove
     file_handling_group.add_argument('-p', '--project', type=str,
                                      default='pyimagebatch.json', help='configuration file')
     file_handling_group.add_argument('-s', '--source', type=str,
@@ -34,6 +40,8 @@ def get_args():
                                      help='destination folder for the processed images')
     file_handling_group.add_argument('-o', '--override', action='store_true',
                                      default=False, help='overrides existing files')
+    file_handling_group.add_argument('--nosubfolder', action='store_true',
+                                     default=False, help='overrides existing files')
 
     output_group = parser.add_argument_group('output / user interaction')
     output_group.add_argument('--no-progress', action='store_true',

diff --git a/pyimgbatch/pyimgbatch.py b/pyimgbatch/pyimgbatch.py
@@ -136,7 +136,7 @@ def ext(self):
 
     @property
     def with_subfolder(self):
-        return self._value(CONFKEY.WEBSETADDON, '')
+        return self._value(CONFKEY.SUBFOLDER, False)
 
     @property
     def destination_size(self):