From 4eb2c8e63e718144ef4a0dfd7437cc016904ffe6 Mon Sep 17 00:00:00 2001
From: K4YT3X <k4t@protonmail.com>
Date: Sat, 29 Sep 2018 11:02:36 -0400
Subject: [PATCH] reverting code back to batch waifu2x upscaling according to
 @VanTanev 's issue

---
 video2x.py | 11 ++---------
 waifu2x.py | 27 +++++++++++----------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/video2x.py b/video2x.py
index e4b6e53..4ea5954 100644
--- a/video2x.py
+++ b/video2x.py
@@ -152,15 +152,8 @@ def video2x():
 
     # Upscale images one by one using waifu2x
     avalon.info('Starting to upscale extracted images')
-    for (dirpath, dirnames, filenames) in os.walk(FRAMES):
-        file_list = tqdm(filenames, ascii=True)
-        for file in file_list:
-            if file[-4:].lower() == '.png':
-                image_path = '{}\\{}'.format(dirpath, file)
-                file_list.set_description('Upscaling: {}'.format(file))
-                # avalon.dbgInfo('Upscaling: {}'.format(image_path))
-                w2.upscale(image_path, UPSCALED, args.width, args.height)
-    avalon.info('Extraction complete')
+    w2.upscale(FRAMES, UPSCALED, args.width, args.height)
+    avalon.info('Conversion complete')
 
     # Frames to Video
     avalon.info('Converting extracted frames into video')
diff --git a/waifu2x.py b/waifu2x.py
index 97aecee..514de98 100644
--- a/waifu2x.py
+++ b/waifu2x.py
@@ -28,20 +28,15 @@ class WAIFU2X:
         self.method = method
         self.model_type = model_type
 
-    def upscale(self, file, upscaled, width, height):
-        """This is the core function for WAIFU2X class
+    def upscale(self, folderin, folderout, width, height):
+            """This is the core function for WAIFU2X class
 
-        [description]
-
-        Arguments:
-            file {string} -- input image
-            upscaled {string} -- output folder path
-            width {int} -- output video width
-            height {int} -- output video height
-            model_type {string} -- model to use for upscaling
-        """
-        file_id = file.split('extracted_')[-1].split('.png')[0]
-        output_file = '{}\\{}{}{}'.format(upscaled, 'extracted_', file_id, '.png')
-        execute = "{} -p {} -I png -i {} -e png -o {} -w {} -h {} -n 3 -m noise_scale -y {}".format(
-            self.waifu2x_path, self.method, file, output_file, width, height, self.model_type)
-        subprocess.call(execute, stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
+            Arguments:
+                folderin {string} -- source folder path
+                folderout {string} -- output folder path
+                width {int} -- output video width
+                height {int} -- output video height
+            """
+            execute = "{} -p {} -I png -i {} -e png -o {} -w {} -h {} -n 3 -m noise_scale -y {}".format(
+                self.waifu2x_path, self.method, folderin, folderout, width, height, self.model_type)
+            subprocess.call(execute)