From 0b0b2da00f8722e8bf7fbbc50d3223d3894129fa Mon Sep 17 00:00:00 2001 From: janis Date: Thu, 16 Mar 2023 15:03:07 +0100 Subject: [PATCH] fixed error --- bin/__pycache__/handler.cpython-310.pyc | Bin 5657 -> 6049 bytes bin/__pycache__/probe.cpython-310.pyc | Bin 2071 -> 2238 bytes bin/handler.py | 18 ++++++++---------- bin/probe.py | 6 +++++- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/bin/__pycache__/handler.cpython-310.pyc b/bin/__pycache__/handler.cpython-310.pyc index b82cb66366923c84f4fa1722d1bde6be8d5adf36..b79bf677cc1080283f8acbeec57a04493d799ce6 100644 GIT binary patch literal 6049 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 delta 2701 zcma)8UuauZ7(eIS+~npay-m{mZ`!13);8PP&B5H*96H?w{-F*k8>_e=J6%azlJ4fR zt}&2@AfgXaI4{a9q))zx^AA1^M12^-ChCI-eez8Qis*|>koi03rdhhJ)0UolzVrS0 zedl-1_nmI+dv~u@?dvlMexCRt!f%d$Y)vtGQXFFkJf-Qm6;Wkp=!fD4n{H~3r$H99 z7UljV;pBCeBHUbL_K^nhV4VjJ5k^W{#n+L8uFU%yq@*|43Gzx3GcRIzxdp#7%1-C~ z%1*y@%9W*lYsK+3Sc?J|<9;6M!iE=F?X_NIk1m4HZ#jeyh&$SN^`1`@K40zN6MKX% z{(vsg%_9k{?}3$SQA!%5?HAND&_{S$%G{VC#X)h+^MzQ^4}SWIPU+|rcs7{HLe!)o zYA_GY;A=52Gu29j9TuD3BTa)6($F|X{No^maE4i$YYlppa8JX7QOCNJ^oD+wtQ(+~ zRR)!<7qJdouL#b&ssBzf1Qg#RMK@iwt@HEeo%7}+J zfz=l%k-v!VdV4o$OU4c=pJtE~2UmI_h(hosRT(I?d5%=*3aJ~8)$WHrB-unzKZ1r= z&$~gpHj(zgeKyh6YNEysBF2}SfFGZ$3v;m5^ zBu-v~42pXf=2=z3!(3Md3=JBCObiKN%=V-mQS=VCXgkLTHspq)>pta`zVtPZA=Zez z;ibId8ubMKkwwoMWA;bldLWz76I&ffTcfz{5-QJi@kb!rzfD(*ifnM`pyZ)|Ba0{9 zR=f9ziRcKd;q zcf_H-Nv1c%w3XQg#%!$%_PmvCZr|1~fRNlus0sY#-OT{B;KU&p6wnS^mIwV`HeAxe z>?gNq5n*fezWl1a`E8?})m{>-*72~U{oeLz?Yg*W9dCASKTbWpuDTBD#6+D$*VyW< z-YURl9qi;fI!_k0HO+n*5l6cPUuXfonis+GO2Pl*o zSwk_7N`aI45Hq))p6acWF359T5Y3+KfMk0?w(3$fQJv=AN6aif(SnWqxk4SdvVU+7$Xk?-1T}IUkUWQH=lI(`pwAH#~w@HcH zhq#q)588R0&c8tssc#MJ+<{l7hG>A@uDg+itR9c0)|r zP_V&U1>J)e4=s4;#Y5@ckKhN$$#0^w@gVpf^MCXHKln2+Uz{J;s&S$ojG zRc{`@(;E_xARvvvgT_`F*&^Tm0@Z8i!P^r|f`dT&q!>;+>~_Y7FFmzBpx5BP3HZqgWb&dXUk~MEQth z#({~|kYwgJ_y}+4)S3$ISy(<~YBv>VXI3Uo*n3DzXEL+S%2+vvb7(QrSi1VfKf|55 zF%AdYTYC+rYWfG%vX;4#^!zAl(0^9`!CYIml~YibOp>`6Mx8W>RX_i3zJ*(P*?PKj zThnAkOSNQ!1W9i|jdBpWYkIfA0oBx42iNs@*{IB|b{pgUc3Z7#Lv0kYp3kfo(9C~Y Y&3X~WiQq*9rOqOP{uaz}q>w9r0Jcbh?f?J) delta 431 zcmX9&O-md>5UuL&neLhW$SCUuB`E7f21P;QO}s>qy=)GOl0gwd4e?{vV7nrQUIg7k za)_XP@Zv$mKOlSYq`$(;{sVu37a{48i&3o6r!44h(aS|O!`~@J7{0@+x$`hU_ z3Q1AW!6cyI2PPrmBE*H~+(0A7o~pOfyVnHqi(O&UV!e?b*gtF%gYG?>LmaX%d>;pG zQ+&qX_C}01GJg@xEU(xn9q3s(+av$}WVa6vl3&z_LRNMsP-{L8*vbJn1$9WWN zb3NPgDKyfk6Ml>>d8LfJ3aD_6*SWV+_p5h~m8F>LiZiJPTVuX6aNioyI4jOSmk2ut$c1+cA!tSc6q5M>V RLdK%E1NKkxC<;~h@jsgQRv-WX diff --git a/bin/handler.py b/bin/handler.py index d22262a..8be9838 100644 --- a/bin/handler.py +++ b/bin/handler.py @@ -56,7 +56,7 @@ class Handler: self.filepath += self.letter # Determining filetype - if str(filepath)[len(filepath) - 4:] == ".mp4" or str(filepath)[len(filepath) - 4:] == ".mkv": + if str(filepath)[len(filepath) - 4:] == ".mp4" or str(filepath)[len(filepath) - 4:] == ".mkv" or str(filepath)[len(filepath) - 4:] == ".MP4": print("upscaling video") self.video_scaling(fsrpath, filepath, quality_mode, quality_setting, output_path) elif str(filepath)[len(filepath) - 4:] == ".JPG" or str(filepath)[len(filepath) - 4:] == ".png" or str(filepath)[len(filepath) - 4:] == ".jpg" or str(filepath)[len(filepath) - 5:] == ".jpeg": @@ -70,9 +70,9 @@ class Handler: # DO NOT CALL THIS! Use Handler().handler() instead! if quality_mode == "default": if self.os_type == "linux": - self.command = f"wine {fsrpath} -QualityMode {quality_setting} {self.filepath} {output_path}" + self.command = f"wine {fsrpath} -QualityMode {quality_setting} {quality_setting} {self.filepath} {output_path}" elif self.os_type == "win32": - self.command = f"FidelityFX_CLI -QualityMode {quality_setting} {self.filepath} {output_path}" + self.command = f"FidelityFX_CLI -QualityMode {quality_setting} {quality_setting} {self.filepath} {output_path}" else: print("OS CURRENTLY UNSUPPORTED!") return False @@ -94,7 +94,6 @@ class Handler: # if ( sys.platform == 'win32' ): # self.videometa = ffmpeg.probe(str(filepath))["streams"].pop(0) # else: - print("\n\n\nupscaling video\n\n\n") self.videometa = ffmpeg.probe(str(filepath))["streams"].pop(0) # Retrieving Video metadata self.duration = self.videometa.get("duration") @@ -134,7 +133,7 @@ class Handler: self.files = "" self.filelist = os.listdir(self.tmppath) self.filelist.pop(0) - self.filelist.reverse() + self.filelist.sort() self.number = 0 for self.file in self.filelist: self.number += 1 @@ -206,21 +205,20 @@ class Handler: self.files_handle = self.fileout.pop(0) if quality_mode == "default": if self.os_type == "linux": - self.command_us = f"wine {fsrpath} -QualityMode {quality_setting} {self.files_handle}" + self.command_us = f"wine {fsrpath} -QualityMode {quality_setting} {quality_setting} {self.files_handle}" elif self.os_type == "win32": - self.command_us = f"FidelityFX_CLI -QualityMode {quality_setting} {self.files_handle}" + self.command_us = f"FidelityFX_CLI -QualityMode {quality_setting} {quality_setting} {self.files_handle}" else: print("OS CURRENTLY UNSUPPORTED!") return False else: if self.os_type == "linux": - self.command_us = f"wine {fsrpath} -Scale {quality_setting} {self.files_handle} {self.tmppath}" + self.command_us = f"wine {fsrpath} -Scale {quality_setting} {quality_setting} {self.files_handle} {self.tmppath}" elif self.os_type == "win32": - self.command_us = f"FidelityFX_CLI -Scale {quality_setting} {self.files_handle} {self.tmppath}" + self.command_us = f"FidelityFX_CLI -Scale {quality_setting} {quality_setting} {self.files_handle} {self.tmppath}" else: print("OS CURRENTLY UNSUPPORTED!") return False - print(self.command_us) os.system(self.command_us) time.sleep(3) diff --git a/bin/probe.py b/bin/probe.py index 44c4f8c..7cc1411 100644 --- a/bin/probe.py +++ b/bin/probe.py @@ -4,6 +4,7 @@ import json import subprocess +import sys try: from collections.abc import Iterable @@ -47,7 +48,10 @@ def probe(filename, cmd='ffprobe', timeout=None, **kwargs): args += convert_kwargs_to_cmd_line_args(kwargs) args += [filename] - p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) + if ( sys.platform == 'win32' ): + p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) + else: + p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) communicate_kwargs = {} if timeout is not None: communicate_kwargs['timeout'] = timeout