From fc8f027a1cbce969141cf503bf05cebf70b97cef Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Wed, 24 May 2023 21:02:58 +0200 Subject: [PATCH] full plugin support in cli --- bin/__pycache__/handler.cpython-311.pyc | Bin 10017 -> 10502 bytes bin/handler.py | 12 ++++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/__pycache__/handler.cpython-311.pyc b/bin/__pycache__/handler.cpython-311.pyc index 5073f74c124b2237558d4b5d7c5d0e7afc7db21c..94d4eab26ecae2294258fdea611e7aebde578650 100644 GIT binary patch delta 3247 zcmds3TWlLe6rI_%6DRRI55MwqoF^$ss;CWp2$JoBU zbMKuqXYSmY-OtBAoVI>xu~Z^xwvfQNe5+PB7FIhZoE+wuc-4GW6wR9%#N(J{b;V<} z^41L-aX72VaeMV)-a3Td>YKNNzar+KAhdA?-kzfWMk*EkCPwHM{FJuglpzMN&CZ*7 z`%$o7+Ycb+v1-zXUB()|W}{XP3E_RXZu1&mU~tRkWA=7A?%w>g>Ngfok+{uowZcdi zet&&jh0q#Vx4D`nqcR7T98Q~LCJdDd2l9u*QmDQ2Y9Cnhm8L^eP z-Szblpe+ocm=>Hyu`=?B!|fHC14ydb#b`xhHAa#Pq16@l2u5>|j~R3cU1sOdB~0yV zkLv^u}E0=uaXJ_l+b;OzIylM#aE7E1x(Rx`Lg>0%-7}mj5?!a`Z zFcBD5wHFL$UN6@HIdp6-#cb)ibjh)+6ad`@$?*&nuGU&SUN=@tGG!+3kyAyJ+Eopq zjT%}OEP{;ODf5zJPMgK%(cDVWbR*8Lp9@x1rv?GOrf<09B3r9=)I*3{4Uzg)4bd%e zQaT-8)dm$Ypy~)ohjw*{^}@32>_tX5IacjE;JgX@c}w0?Is_(cP=^ZdK@HJUu+yN1 zB&CK(Pp!}6Q|&UHBK8%Ct5H@n`T7od7c^Th1iBME!g+W;QF+IYbc2bs-xkc`pMaHuU8t{ zHKk1jg%Y3}-%WQ{J5ADPL99VvK+-7LsP*AP;U+8any_P zg>c4nK>zt-%oNs;A82Wrn3HxQ$rQxiOnwrm2YF#DNGEd|7l8*OY)Vg1Y+H-cO@wv|~H+kD@ zY}_}VGA~AjUS3#=3VgCRW$rzf5F*i~o>(#=Y%Y1-%wpai4=1HlNuGN>8s{g&(s_|y z*m*|;y5r#s{2&j5g{ZKUGPd=-!u6z#%`ZorJO06EQcOp4S9{(-!SaT9BFyCtiDh2M zTa*cBcu9hBn_tu~SIg@v@sqt$At|SjzIx=DQj^R7&HbV7bR*`py?w?S!?DTAIn#)Em=cZGI5ujhi zgUl29H_1S6n&Fk+676Y7pbN~!V$&67XlEwy2bAD3cAN#cF?M#>rNNLl1FlR&;~9}d zBJ5r6ew@x0VY4Ss=T1hl=To_pX~m++ATvyv1(_L2;}mmV>BVGHDiV0!Wv&#Pt}>%L zGl4$<)4<;ZJ41O+unW5`#RHPuXxT@$1LbEIU^~9`1Wo9ksWMp0-mAe>dOX2?bg$nt zXlH-4VURyH9v$(a2fpBuF%SFDjY0m>dUV{6e)R{BOg6FEMoi_v{;4js)m1rlkli|f zrw)>d)-%{ozG*$4nZ?GIZM3%(>1&fn-*~%R`SMVROPmXZM0z2MCJ^}wDBhlBF|o+! zSy06h>N!q5W~Gjo!(x&b#lv!N^ulsNl;Y7v@l_f(Ma2w#-4KVVzfvj66Vaq3j*|D= z7AhlPrZ4r$!{l+>WW7C$cD|30WkvoxLRBmBhrH3g_SzV{#c!j%<)5 delta 2816 zcmd^BUrbwN6hGf>OX)xQ=XPC7%V_ymI=0ac$u?oSP8O8lC?aP3F^zIdZN-9@n}CFj zsfpRc9%SE=JxrGRf=050q`vsJB}6l$u_T(zB|iG*1I9gS;`uJz+j~njMj!oXzkcU@ z=lss!doCZm^zr3}PaF;_;2OPB5R8rM4Sq7a9v!jfVA94xhUD$E=!81AW`W zuYch^=NN!j>6>JByuyN#YeQ0Loa=qAzs^ggRzkxkB2!T6YIFkeg=i z%d2on2U>ps8mkRDiy)R-pn`S7tb=t+PQ?Tk$fhp~k%N;g6^Xo>21K`^|A8}FeS5XO zPS>H}Fwf`(PvB^S!jXbCG8N z%^*1S?x4I^!I8Rdy4#K;$ER?xHM*5EfRw155!=T~<*H(OX^{`+T$@g?M+G3BBysAR+$$9$48=TU%gde%89U<_y2#u>oA$UmQ zoMI0j*e1Hi2Lo(C9IVxP6&#AqtnOXx(NfDHB^5~w->6Tvl)UK+k^~L;y8E;)hxB5E zO^yFqYqY9a)wM=-DH@;0)M&>;M9H?c1~`nGHn{4f>h45(8d|cCZRx`S#W>yGSx4O=0<-HLVB3dmBz6EKu z!I5rduM2#Ma5e6l);4UqfS%JCQ8IJbNL!VWcG*ZrZ6j4Sv`I_+o41PJEWjAVqL)h} zK|j~NVqKi+&Sl%{brOVTTj?9WWa(VR$z&qs9fwuOJ?%MdZJq|+Ss*!P7 zY@E9jmJKhf=W|CMo!{k=d4KC;FPpOTp2ULa|P2j)Ps&G4X=;Qr<5{=shesyo^D!b!u! z69o5f&i2393*Yu8`$l>U-<>A7mu-pEc_^Q^j#>@77BXt39UapoOyBPq>=`4bmOZGw zi*B?pV(KC0du&dph54CuT6~)R(GeJ6Q&_x!+hhC8d|@`1U3g7g%!uL;5vCjUJGS6TVcc<1eB T2RVX%*4}@W`A`1hR*vFN6S2Yx diff --git a/bin/handler.py b/bin/handler.py index 487520c..1fa5871 100644 --- a/bin/handler.py +++ b/bin/handler.py @@ -13,9 +13,10 @@ import sys import bin.probe ffmpeg = bin.probe import configparser -import time -import shutil +import json import importlib +import shutil +import time importedModules = {} @@ -82,6 +83,7 @@ class Handler: pass def video_scaling( self, input_path, output_path, scalefactor, threads, sharpening, filetype, mode, engine ): + self.engineSetting = json.load( open( 'bin/engines/' + engine + '/config.json' ) ) # DO NOT CALL THIS! Use Handler().handler() instead! # Splitting video into frames @@ -155,12 +157,14 @@ class Handler: return False os.system( self.command ) + + # reassemble Video print( '\n\n==> Reassembling Video... with framerate @', self.framerate, '\n\n' ) if self.os_type == 'linux': - self.command = f'ffmpeg -framerate {self.framerate} -i {self.tmppath}sc/ig%08d.{filetype} {output_path} -i {self.tmppath}audio.aac' + self.command = f'ffmpeg -framerate {self.framerate} -i {self.tmppath}{self.engineSetting[ "lastUsedFilePath" ]}/{self.engineSetting[ "fileNameBeginning" ]}%08d.{filetype} {output_path} -i {self.tmppath}audio.aac' elif self.os_type == 'win32': - self.command = f'ffmpeg -framerate {self.framerate} -i \'{self.tmppath}sc\\ig%08d.{filetype}\' {output_path} -i {self.tmppath}audio.aac' + self.command = f'ffmpeg -framerate {self.framerate} -i \'{self.tmppath}{self.engineSetting[ "lastUsedFilePath" ]}\\{self.engineSetting[ "fileNameBeginning" ]}%08d.{filetype}\' {output_path} -i {self.tmppath}audio.aac' else: print( 'OS CURRENTLY UNSUPPORTED!' ); return False