📢 Command-based structure, support for remix and remake.

Author: alexjc

src/texturize/__main__.py

@@ -6,16 +6,15 @@
  |_| |_|\___|\__,_|_|  \__,_|_|  \__\___/_/\_\\__|\__,_|_|  |_/___\___|
 
 Usage:
-    texturize SOURCE... [--size=WxH] [--output=FILE] [--variations=V] [--seed=SEED]
-                        [--mode=MODE] [--octaves=O] [--threshold=H] [--iterations=I]
-                        [--device=DEVICE] [--precision=PRECISION] [--quiet] [--verbose]
+    texturize remix SOURCE... [options]
+    texturize remake TARGET like SOURCE [options]
     texturize --help
 
 Examples:
-    texturize samples/grass.webp --size=1440x960 --output=result.png
-    texturize samples/gravel.png --iterations=200 --precision=1e-5
-    texturize samples/sand.tiff  --output=tmp/{source}-{octave}.webp
-    texturize samples/brick.jpg  --device=cpu
+    texturize remix samples/grass.webp --size=1440x960 --output=result.png
+    texturize remix samples/gravel.png --iterations=200 --precision=1e-5
+    texturize remix samples/sand.tiff  --output=tmp/{source}-{octave}.webp
+    texturize remix samples/brick.jpg  --device=cpu
 
 Options:
     SOURCE                  Path to source image to use as texture.
@@ -43,17 +42,18 @@
 # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 
+import os
 import glob
 import itertools
 
 import docopt
-import progressbar
 from schema import Schema, Use, And, Or
 
 import torch
 
 from . import __version__
-from .api import process_single_file, ansi, ConsoleLog
+from . import api, io, commands
+from .logger import ansi, ConsoleLog
 
 
 def validate(config):
@@ -64,6 +64,7 @@ def split_size(size: str):
     sch = Schema(
         {
             "SOURCE": [str],
+            "TARGET": Or(None, str),
             "size": And(Use(split_size), tuple),
             "output": str,
             "variations": Use(int),
@@ -86,30 +87,51 @@ def split_size(size: str):
 def main():
     # Parse the command-line options based on the script's documentation.
     config = docopt.docopt(__doc__[356:], version=__version__, help=False)
+    command = [cmd for cmd in ("remix", "remake") if config[cmd]][0]
+
     # Ensure the user-specified values are correct.
     config = validate(config)
-    filenames, seed, quiet, verbose, help = [
-        config.pop(k) for k in ("SOURCE", "seed", "quiet", "verbose", "help")
+    sources, target, output, seed, mode = [
+        config.pop(k) for k in ("SOURCE", "TARGET", "output", "seed", "mode")
     ]
 
     # Setup the output logging and display the logo!
-    log = ConsoleLog(quiet, verbose)
+    log = ConsoleLog(config.pop("quiet"), config.pop("verbose"))
     log.notice(ansi.PINK + "    " + __doc__[:356] + ansi.ENDC)
-    if help is True:
+    if config.pop("help") is True:
         log.notice(__doc__[356:])
         return
 
     # Scan all the files based on the patterns specified.
-    files = itertools.chain.from_iterable(glob.glob(s) for s in filenames)
+    files = itertools.chain.from_iterable(glob.glob(s) for s in sources)
     for filename in files:
         # If there's a random seed, use the same for all images.
         if seed is not None:
             torch.manual_seed(seed)
             torch.cuda.manual_seed(seed)
 
+        source_img = io.load_image_from_file(filename)
+        target_img = io.load_image_from_file(target) if target else None
+
+        if command == "remix":
+            cmd = commands.Remix(source_img, mode=mode)
+        if command == "remake":
+            cmd = commands.Remake(source_img, target_img, mode=mode)
+            config["octaves"] = 1
+            config["size"] = target_img.size
+
         # Process the files one by one, each may have multiple variations.
         try:
-            result = process_single_file(filename, log, **config)
+            config["output"] = output
+            config["output"] = config["output"].replace(
+                "{source}", os.path.splitext(os.path.basename(filename))[0]
+            )
+            if target:
+                config["output"] = config["output"].replace(
+                    "{target}", os.path.splitext(os.path.basename(target))[0]
+                )
+
+            result = api.process_single_command(cmd, log, **config)
             log.notice(ansi.PINK + "\n=> result:", result, ansi.ENDC)
         except KeyboardInterrupt:
             print(ansi.PINK + "\nCTRL+C detected, interrupting..." + ansi.ENDC)