From d12182e8c678ce37197f7af15e3e2e9869cf082e Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Thu, 16 Mar 2023 09:42:11 +0100
Subject: [PATCH] possible fix for upscaler & removal of lib

---
 bin/__pycache__/handler.cpython-310.pyc | Bin 5664 -> 5657 bytes
 bin/__pycache__/probe.cpython-310.pyc   | Bin 0 -> 2071 bytes
 bin/handler.py                          |  12 ++---
 bin/probe.py                            |  56 ++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 6 deletions(-)
 create mode 100644 bin/__pycache__/probe.cpython-310.pyc
 create mode 100644 bin/probe.py

diff --git a/bin/__pycache__/handler.cpython-310.pyc b/bin/__pycache__/handler.cpython-310.pyc
index 6e18d2fbcec792c98a287417d0e733d22d964043..b82cb66366923c84f4fa1722d1bde6be8d5adf36 100644
GIT binary patch
delta 86
zcmZ3WGgF5*pO=@50SIia3Z<N$$ScbjH&I)8V}O7lW7OtEK?O#}TbrANc$vjGlQQ%4
i3X1ZRQg1N>nMFE4Jw@7+SBYluu`zN$APX0x5HkSV9~5^0

delta 94
zcmbQKvp|P8pO=@50SK(cg;K6g<dtPin5eDHl*P8uPe73I*5-IY1xCiG%?(1l%+h>G
pnR$9SnMrzSX}JZd>9?4H{9DXGfg+vBi$yc|I2fUjg^N*$832Gc7j6Im

diff --git a/bin/__pycache__/probe.cpython-310.pyc b/bin/__pycache__/probe.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..13a866551a628b5ccb7c52f223d221af0c9d7d76
GIT binary patch
literal 2071
zcmZWq&2Ah;5bmD8ogLeW2__*CA_E7)O7R-y0<x?KDL7z|mM959j6mbr>7Mo2^Rwyh
zvE$9Ggjh@A0tcSJk+|e3cnU6k<-{v+2~{)eO$@#2n*OP-s;;lU+Hz&ZBhdc%^Ada1
zA>=Qdyxv@xd<tD=AQ)jZBSHJ60iC$8Vq`{c1|}unlH#I8xOIG;68trLcDwf-Dd-Vl
zCbLdR;CxP)&72d$9Nw9kfy+GRvhE2Dx~w~*fyd|r(p&l)Jd#0=YIjF*5e+jQQ(T%i
z8@>=RxdUDP24X~}RFRsT(&uDGKO;Zfo*Ff&jjLp8Dx)@)IWxqqW@OC_d8;--=knC5
z>8Z`=sZ$%z>2pd+Z84*w;-hBWgmtT3e|+t+`#)W?(Y?FSHRrmZ33sq2TVL>O%!Qv+
zMXb`Y@Kxy#t2ASNT;_RHFh5HR?nh!&<-AbRFDvDjiO<ql^(W@~)9GMhJe~GB+L5JD
zoN4QTA4~0}GA*QvikJ%nF0W0ggm$9wm={btNh$J3^=$1N9D!}Atwz!VO%Jtw7-bcI
zLBs_(_|Kh<y)x$;`%#g~jj<^Ad938d-3Rw~@@T{#rHq%~jAa~UT-+69p}>AP;71$7
zv_SPC?~jl5^|&k!xlm#2E>vY0=Pbm#h3L79AiWF1GFGWe*P!Efl^Q=9i;+deDyYQJ
z&oy&ClkdQQlYlZ37|%#T8D++a8<@|CMFI=*ZEAa4h*HGXYX)$Pj|I)h4?rlQXia9u
zsR6K?HGtm04v!_YY7?Z*2pBU4lN(Q`K1YN8hmvz&Dh4xzXbdPpj(x^elxDr2qitCM
z&f*QQuiY?Ai&TZ7K>7f3iou!Y3o1QJTassqHX%h~4K&1CAYM@24Z}E#q=bVAjkt*7
zO%T_hOC+iXNwZ!$rbj0iwlT2&nJd5=+!j&J!%%x+n3t@|aJ(FbkE<wacN%MYW$q{D
zS$5{DaribmY`o$<uA*1Wo=etfd$UfGG?>R{n7}SUa2@DhL6<*+s2gOE?IRobWdSSA
z8U2{xxF(}!r0Bi@J9OW~j`iRdYig%t3Or;T;NOkfs2%2Rk=ow3*m6p0=Xd%m{oa^%
zrY@}6tb1UJE#)w;?$qwg{E4d0satnWyKD&|1qfFn4khD$RrvF`ePrMsAUWo7nxvfh
zNtyxufQN#sN)&$NfBE3+0nEmNOJHQwuof7J$6Dn3p65fmAElDZ&1Q`A%?7*8-6YA!
zeAI8?+1>QhWZ}GZA;Cvc7V8r(N}oST6_f(TZ!YYht*BU-Ywh@{oJR;TAEjy!jEs1}
zMH<gvXwIbs!uHSEd5CvC_iAG>J>+Ohr2G(!4UhdOj^S`xjPR1@&hPHFr+0UKz#SgA
zI>zdRx!_M?KE~v<9w*D|a<4oJ+sZRpX=hNBc$7;hWM!hQeOVR{d*-V*53JdPH#pE8
zmF66>E3m=~EEE&FQpx%!4H0@?Qy8=-t09De!D{;+gi~ni-p;-4U<r$9RitsGxc1sK
zV^W((E3Sh%ZD(b~q;?p`jb2x~h&-}FTtT1jp}?0ckY}2XgG;X&o!2#OB9BcVaZAtz
zOSRq50*%PaATD&5sYfpx7Vs6zoky3U%!!+@)iav=4SGvWVB&pP3ogcG2LErEPT7x!
zaa+@ucJeV4{pJN|xZ^^lO-Fb841)HaXkB;0F!~RxUq$I|wPoQprnw2!B`!6fCS!QU
MOV?ao^<3}Dzy6ON7XSbN

literal 0
HcmV?d00001

diff --git a/bin/handler.py b/bin/handler.py
index df1d42a..fc53012 100644
--- a/bin/handler.py
+++ b/bin/handler.py
@@ -10,8 +10,8 @@
 
 import os
 import sys
-import bin.lib.ffmpeg
-ffmpeg = bin.lib.ffmpeg
+import bin.probe
+ffmpeg = bin.probe
 import configparser
 import time
 import shutil
@@ -69,7 +69,7 @@ class Handler:
             if self.os_type == "linux":
                 self.command = f"wine {fsrpath} -QualityMode {quality_setting} {self.filepath} {output_path}"
             elif self.os_type == "win32":
-                self.command = f"{fsrpath} -QualityMode {quality_setting} {self.filepath} {output_path}"
+                self.command = f"FidelityFX_CLI -QualityMode {quality_setting} {self.filepath} {output_path}"
             else:
                 print("OS CURRENTLY UNSUPPORTED!")
                 return False
@@ -79,7 +79,7 @@ class Handler:
             if self.os_type == "linux":
                 self.command = f"wine {fsrpath} -Scale {quality_setting} {quality_setting} {self.filepath} {output_path}"
             elif self.os_type == "win32":
-                self.command = f"{fsrpath} -Scale {quality_setting} {quality_setting} {self.filepath} {output_path}"
+                self.command = f"FidelityFX_CLI -Scale {quality_setting} {quality_setting} {self.filepath} {output_path}"
             else:
                 print("OS CURRENTLY UNSUPPORTED!")
                 return False            
@@ -190,7 +190,7 @@ class Handler:
                 if self.os_type == "linux":
                     self.command = f"wine {fsrpath} -QualityMode {quality_setting} {self.files_handle}"
                 elif self.os_type == "win32":
-                    self.command = f"{fsrpath} -QualityMode {quality_setting} {self.files_handle}"
+                    self.command = f"FidelityFX_CLI -QualityMode {quality_setting} {self.files_handle}"
                 else:
                     print("OS CURRENTLY UNSUPPORTED!")
                     return False
@@ -199,7 +199,7 @@ class Handler:
                     if self.os_type == "linux":
                         self.command = f"wine {fsrpath} -Scale {quality_setting} {self.files_handle} {self.tmppath}"
                     elif self.os_type == "win32":
-                        self.command = f"{fsrpath} -Scale {quality_setting} {self.files_handle} {self.tmppath}"
+                        self.command = f"FidelityFX_CLI -Scale {quality_setting} {self.files_handle} {self.tmppath}"
                     else:
                         print("OS CURRENTLY UNSUPPORTED!")
                         return False
diff --git a/bin/probe.py b/bin/probe.py
new file mode 100644
index 0000000..b867b0f
--- /dev/null
+++ b/bin/probe.py
@@ -0,0 +1,56 @@
+import json
+import subprocess
+
+try:
+    from collections.abc import Iterable
+except ImportError:
+    from collections import Iterable
+
+def convert_kwargs_to_cmd_line_args(kwargs):
+    """Helper function to build command line arguments out of dict."""
+    args = []
+    for k in sorted(kwargs.keys()):
+        v = kwargs[k]
+        if isinstance(v, Iterable) and not isinstance(v, str):
+            for value in v:
+                args.append('-{}'.format(k))
+                if value is not None:
+                    args.append('{}'.format(value))
+            continue
+        args.append('-{}'.format(k))
+        if v is not None:
+            args.append('{}'.format(v))
+    return args
+
+class Error(Exception):
+    def __init__(self, cmd, stdout, stderr):
+        super(Error, self).__init__(
+            '{} error (see stderr output for detail)'.format(cmd)
+        )
+        self.stdout = stdout
+        self.stderr = stderr
+
+def probe(filename, cmd='ffprobe', timeout=None, **kwargs):
+    """Run ffprobe on the specified file and return a JSON representation of the output.
+
+    Raises:
+        :class:`ffmpeg.Error`: if ffprobe returns a non-zero exit code,
+            an :class:`Error` is returned with a generic error message.
+            The stderr output can be retrieved by accessing the
+            ``stderr`` property of the exception.
+    """
+    args = [cmd, '-show_format', '-show_streams', '-of', 'json']
+    args += convert_kwargs_to_cmd_line_args(kwargs)
+    args += [filename]
+
+    p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+    communicate_kwargs = {}
+    if timeout is not None:
+        communicate_kwargs['timeout'] = timeout
+    out, err = p.communicate(**communicate_kwargs)
+    if p.returncode != 0:
+        raise Error('ffprobe', out, err)
+    return json.loads(out.decode('utf-8'))
+
+
+__all__ = ['probe']