From d19435277f93d58d556d461ab2cb88365612396c Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Wed, 7 Jun 2023 19:57:31 +0200 Subject: [PATCH] add various fixes for bugs --- bin/__pycache__/handler.cpython-311.pyc | Bin 10822 -> 10812 bytes bin/handler.py | 10 ++++++++-- smuL-cli.py | 12 +++++------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/bin/__pycache__/handler.cpython-311.pyc b/bin/__pycache__/handler.cpython-311.pyc index fe5be8ced70240ee1247dc2c1fa29ce2ff407e81..db72be33043710d3cdcbae856b460de4284caf79 100644 GIT binary patch delta 1699 zcma)6OKclO7@o1$-t}W+Z)$sEyNO?ju^Qz3#-kG>$0GdB)MJs=+t5)ub4+(kHs>G*25}!^gr183XjDT4 zSHm=P72V5LHL4NmLl;C?l!gxG`L-6hL&L{QFrs1N*;5g!hWB&B(n?hmZG7gbF)Jco zs_lshkpV~cah8J!kn<}zR8*;US!C_62@ctePB;#Q@pLjl)fkN(=sXjR@`rd8FZ6%J zbFSF6^8I#;md(0lbjuyqHfh7|mih1QjHkR|SY<9rXKu1;9u|k>qVUL$2bqpdf}_4oHfrpY z5p_)Kc=mI{#?D+Uz@eGRecgv_ZPE}S(>Jll%Z~A1yfTjP$BEODNY(kxh>l@DVhTo9 zI*058FUpIVx#>@Fcla@O(60L~+QIfB-}WVOfUhY@9D%W+-=N~AtbYj!kiA{A7n_n2k*jd{-v*Px}rx)Ghe?)Zt zSdsZ1e_l^ahv9e@lKgA`J+EiSuwFUG&jkL=X#-D(8J5k0V($lvOq9kzr<<&U2w;{CX%{;^Q@Zl=bj}?za}fsk`?~88hv5f-&Q}B*3ODdRs?t%01843d1^j^>-|gfn}K9Pc=lvtYq@ffl$Z`PS33I~XW2skr^O?T<9s)D zGj$pYK{v|-qygYDWa4@uw#@%Zz2UtCW{MZmSMhmnrI#8n2}i-l!r*@m;6J59kwdv9 z2!PU|<}RGeiQM!^Z$Y^BqU&{wG$|{6Y!KS6bsP1jVQta=Kj}}r%jckc6##O7Knxzx zQ8C;I2C%{(u553_2Xd`O+KpO`Ekgtz{ee$BaV7EUZP0;RnCu2b)*%vXw5?5Jt5auP z%GjI3WTVw-GrMVQuq@=g1F#5i9^g8EKcB^K@z3)43j^<{d>}DeCqosi3Q3N<=gQ?) fn|#!ySJ-_KfHT)^@j<@n`wfL241eEVFW`Rx`?oSV delta 1770 zcma)6OKclO7@qNC{aSndh!Yzp_z@C2q)p?bLMaMG&{7ISDk4!!EC=IyrpX$6*NnGy zuv`TW&`Xd=hbxj15*6Zt#er^!9=Rvp#nQJBfbZGce;~jTa<=^d6r{shW9f1s$Rc{GVM~Jq9Bi`*a&hdB zhof{OJUG1sB}v4=b*4JZvly=G1U(NYg+dfZyOW0GOSlN9dJka07JI$$VsTHc<6^a} z$jxGds8w9innn7DJ?$)Bmz5&*I_6=P<{ftu4yzbehCM!*AV(a~2jL0&r$d@^nr`FT zf2oDO`alV3gAQOotMtn^Qw>rs-|>8Ty_# zM=Pu+IhP+D!@iUmApNlPFnbFO^sMkO1OLv!!6Zsz)yh8t(iv)g4 z^qF5)UOi4+=w0>Sc5Ey$IXTVY42M+?c@8TKn*5lh%!hDQ^L=|whw?8S&}c|pD7)JMYHS-yf>CS3a+AQ3(`8sXw24)c^` zKNMrSt5ia2rBq_I|DBDmy~V%3$v_wTd(q*e0Ss Failed to execute ffprobe. Please ensure that you have a valid ffmpeg & ffprobe installation.\n --> Refer to our wiki for a guide on a proper installation\n\n') + return False; self.duration = self.videometa.get( 'duration' ) self.frames = len( self.filelist ) @@ -175,4 +179,6 @@ class Handler: else: print( 'OS CURRENTLY UNSUPPORTED!' ); return False - os.system( self.command ) \ No newline at end of file + os.system( self.command ) + + return True; \ No newline at end of file diff --git a/smuL-cli.py b/smuL-cli.py index cae66ef..49c5a11 100644 --- a/smuL-cli.py +++ b/smuL-cli.py @@ -68,8 +68,8 @@ def performChecks ( args, ap ): return False # Check sharpening argument and also verify that engine supports it - if ( args.sharpening != None and args.sharpening != 0 ): - if ( float( args.sharpening ) >= 1 and float( args.sharpening ) <= 0 ): + if ( args.sharpening != None and args.sharpening != 0 ): + if ( float( args.sharpening ) >= 1.0 or float( args.sharpening ) <= 0.0 ): print( '\n==> ERROR: Invalid value for sharpening. Value has to be between 0 and 1' ) return False else: @@ -128,7 +128,7 @@ if __name__ == '__main__': ap.add_argument( '-d', '--details', help='Get details on usage of a particular engine and exit. Reads the config.json file of that engine and displays it in a HR manner' ) ap.add_argument( '-p', '--printengines', help='Print all engines and exit', action='store_true' ) ap.add_argument( '-v', '--version', help='Print version and exit', action='store_true' ) - ap.set_defaults( scaling = 0, sharpening = 0, threads = 4, engine = 'fsr', filetype = 'png' ) + ap.set_defaults( scalefactor = 0, sharpening = 0, threads = 4, engine = 'fsr', filetype = 'png' ) args = ap.parse_args() handler = bin.handler.Handler() @@ -148,7 +148,5 @@ if __name__ == '__main__': if ( engineInfo[ args.engine ][ 'cliModeOptions' ][ option ][ 'default' ] ): mode = option break - handler.handler( args.inputfile, args.scalefactor, output, args.sharpening, args.filetype, args.engine, mode, args.threads ) - print( '\n\n---------------------------------------------------------------------------------\n\nDONE \n\n\n\nSimpleMediaScalerLiteFrontend V1.1.0\n\nCopyright 2023 FSRSimpleMediaScalerLiteFrontend contributors\nThis application comes with absolutely no warranty to the extent permitted by applicable law\n\n\n\nOutput was written to ' + output + '\n\n\n' ) - - + if ( handler.handler( args.inputfile, args.scalefactor, output, args.sharpening, args.filetype, args.engine, mode, args.threads ) ): + print( '\n\n---------------------------------------------------------------------------------\n\nDONE \n\n\n\nSimpleMediaScalerLite V1.1.0\n\nCopyright 2023 SimpleMediaScalerLite contributors\nThis application comes with absolutely no warranty to the extent permitted by applicable law\n\n\n\nOutput was written to ' + output + '\n\n\n' )