4.0.0 new argument parsing mechanism and project structure

src/wrappers/waifu2x_ncnn_vulkan.py

@@ -4,7 +4,7 @@
 Name: Waifu2x NCNN Vulkan Driver
 Creator: SAT3LL
 Date Created: June 26, 2019
-Last Modified: November 15, 2019
+Last Modified: May 4, 2020
 
 Editor: K4YT3X
 Last Modified: February 22, 2020
@@ -14,6 +14,7 @@ for waifu2x_ncnn_vulkan.
 """
 
 # built-in imports
+import argparse
 import os
 import shlex
 import subprocess
@@ -23,7 +24,7 @@ import threading
 from avalon_framework import Avalon
 
 
-class Waifu2xNcnnVulkan:
+class WrapperMain:
     """This class communicates with waifu2x ncnn vulkan engine
 
     An object will be created for this class, containing information
@@ -43,6 +44,22 @@ class Waifu2xNcnnVulkan:
 
         self.print_lock = threading.Lock()
 
+    @staticmethod
+    def parse_arguments(arguments):
+        parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter, add_help=False)
+        parser.add_argument('--help', action='help', help='show this help message and exit')
+        parser.add_argument('-v', action='store_true', help='verbose output')
+        # parser.add_argument('-i', type=pathlib.Path, help='input image path (jpg/png) or directory')
+        # parser.add_argument('-o', type=pathlib.Path, help='output image path (png) or directory')
+        parser.add_argument('-n', type=int, choices=range(-1, 4), help='denoise level')
+        parser.add_argument('-s', type=int, choices=range(1, 3), help='upscale ratio')
+        parser.add_argument('-t', type=int, help='tile size (>=32)')
+        parser.add_argument('-m', type=str, help='waifu2x model path')
+        parser.add_argument('-g', type=int, help='gpu device to use')
+        parser.add_argument('-j', type=str, help='thread count for load/proc/save')
+        parser.add_argument('-x', action='store_true', help='enable tta mode')
+        return parser.parse_args(arguments)
+
     def upscale(self, input_directory, output_directory, scale_ratio):
         """This is the core function for WAIFU2X class
 
@@ -59,21 +76,24 @@ class Waifu2xNcnnVulkan:
 
         # list to be executed
         # initialize the list with waifu2x binary path as the first element
-        execute = [str(self.driver_settings['path'])]
+        execute = [self.driver_settings.pop('path')]
 
         for key in self.driver_settings.keys():
 
             value = self.driver_settings[key]
 
-            # is executable key or null or None means that leave this option out (keep default)
-            if key == 'path' or value is None or value is False:
+            # null or None means that leave this option out (keep default)
+            if value is None or value is False:
                 continue
             else:
                 if len(key) == 1:
                     execute.append(f'-{key}')
                 else:
                     execute.append(f'--{key}')
-                execute.append(str(value))
+
+                # true means key is an option
+                if value is not True:
+                    execute.append(str(value))
 
         # return the Popen object of the new process created
         self.print_lock.acquire()