From 807276fcc3cd6dd9e3e36e29cef264a79b9d2f34 Mon Sep 17 00:00:00 2001
From: k4yt3x <k4yt3x@k4yt3x.com>
Date: Sat, 3 Aug 2019 23:15:19 -0400
Subject: [PATCH] fixing converter frame filename issues

---
 bin/upscaler.py          | 6 +++---
 bin/waifu2x_converter.py | 9 ---------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/bin/upscaler.py b/bin/upscaler.py
index 76c35f2..9614da2 100644
--- a/bin/upscaler.py
+++ b/bin/upscaler.py
@@ -4,7 +4,7 @@
 Name: Video2X Upscaler
 Author: K4YT3X
 Date Created: December 10, 2018
-Last Modified: July 27, 2019
+Last Modified: August 3, 2019
 
 Dev: SAT3LL
 
@@ -131,7 +131,7 @@ class Upscaler:
                     if self.total_frames_upscaled >= self.total_frames:
                         return
 
-                    # adds the detla into the progress bar
+                    # adds the delta into the progress bar
                     progress_bar.update(delta)
                 except FileNotFoundError:
                     pass
@@ -170,7 +170,7 @@ class Upscaler:
 
             w2.upscale(self.extracted_frames, self.upscaled_frames, self.scale_ratio, self.threads, self.image_format, self.upscaler_exceptions)
             for image in [f for f in self.upscaled_frames.iterdir() if f.is_file()]:
-                renamed = re.sub(f'_\[.*-.*\]\[x(\d+(\.\d+)?)\]\.{self.image_format}', f'.{self.image_format}', image)
+                renamed = re.sub(f'_\[.*-.*\]\[x(\d+(\.\d+)?)\]\.{self.image_format}', f'.{self.image_format}', str(image))
                 (self.upscaled_frames / image).rename(self.upscaled_frames / renamed)
 
             self.progress_bar_exit_signal = True
diff --git a/bin/waifu2x_converter.py b/bin/waifu2x_converter.py
index 3590570..6f9bf9a 100644
--- a/bin/waifu2x_converter.py
+++ b/bin/waifu2x_converter.py
@@ -48,15 +48,6 @@ class Waifu2xConverter:
             # overwrite config file settings
             self.waifu2x_settings['input'] = input_directory
             self.waifu2x_settings['output'] = output_directory
-
-            # temporary fix for https://github.com/DeadSix27/waifu2x-converter-cpp/issues/109
-            """
-            self.waifu2x_settings['i'] = input_directory
-            self.waifu2x_settings['o'] = output_directory
-            self.waifu2x_settings['input'] = None
-            self.waifu2x_settings['output'] = None
-            """
-
             self.waifu2x_settings['scale-ratio'] = scale_ratio
             self.waifu2x_settings['jobs'] = jobs
             self.waifu2x_settings['output-format'] = image_format