From 70080953d0faddd7e1dff9168b3076d9ffa5f63f Mon Sep 17 00:00:00 2001 From: janis Date: Wed, 15 Mar 2023 12:32:50 +0100 Subject: [PATCH] fixes to cli & handler --- bin/__pycache__/handler.cpython-310.pyc | Bin 5692 -> 5749 bytes bin/handler.py | 9 +++++++-- fsrimagevideoupscaler-cli.py | 5 ++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bin/__pycache__/handler.cpython-310.pyc b/bin/__pycache__/handler.cpython-310.pyc index bfc755a3eecd90982f0cd0aec4c4894bb08d4bba..df39d9e6f38aaa6d96ec6bf859207735b7717685 100644 GIT binary patch delta 600 zcmZuuK}#D!6rMM`vopJ!jY&+vswpbcq75EwFD*eRCS#Zz z@9koth$IRW?Sq7zsiZOOIm-D+bv5s}k|l2b=1G<_mpo@7Mb5tTW7Z3Lp$ubwP&gzq zilc*~at{H>8={!@x!VNS%(LAh$1?NUgQU~l)V?`pD-as+7Dfsv=o}(D!auAhsvqm=bj|w;Fk~`5 z0n}XbC!w{_BNl{dh|%iZO+AjvVk*UNfm;`)N!%JM*TGF+mRA7+^Ru!FzWHByQOb>K zx7?l$|HU-f@YH?JF&uiIma4B|uW09|EZ7fet6ayv7sElJj(5lYD?tPZPfQdZY1^ME zWxUl=gLbQ>pJJ_<1rI^iHoD1Nzq>Kl>1=Jsn>Um>*p@|v@Rn#!Yt1F=_fUXLG`9xo cQ$Jn+oY)yfaES;61T+9aF^_$yZ~~|}SD(~(Pyhe` delta 664 zcmZuuO>fgM7`B}_ag!$7+A?i}Nl~SN3R{JM14z@fN(c^s#D|!KFQu#9k||9hrvugt z;^Pl&zN77ev82dMG&c#aMB zz2*3^S};HXgA7HG!jch1B^%T%8B<)cMXi!;YIAdk>{Mul<3r~NP?x)hRc0JP2yOyq zGW-TG{2Eb@p$DL4O+Gm1D{9D>X0ZS1Kyvs6y7D2q3zzbDsE_OdKMUi_m!yx^p&@VK zv2Q73h1E~uK{ymde#W<9OZGM)rks{9BezdyGHVMQL-wjepE zUzsfpX&XOX$?Ns^>cHRX&Bi}APAk!)yw&Ky7oOHPHE3@_XZ|q#`;G)siAD8g`t1oI zkXR(BE|&3@U)bF)OZwfeIHwDk3aGyw#_cHFZcoox7-~(c)7MCQBI81A0*U7@bad_i eH7&^cC}F!1-+)Sy%_}egaa8YL6A{CKHRA_@lZsFP diff --git a/bin/handler.py b/bin/handler.py index 41391a7..f71df90 100644 --- a/bin/handler.py +++ b/bin/handler.py @@ -10,12 +10,17 @@ import os import sys -import bin.lib.ffmpeg + +if ( sys.platform == 'win32' ): + import bin.lib.ffmpeg.ffmpeg + ffmpeg = bin.lib.ffmpeg.ffmpeg +else: + import bin.lib.ffmpeg + ffmpeg = bin.lib.ffmpeg import configparser import time import shutil -ffmpeg = bin.lib.ffmpeg # Loading the config file to get user preferred temp path config = configparser.ConfigParser() diff --git a/fsrimagevideoupscaler-cli.py b/fsrimagevideoupscaler-cli.py index 3e511b0..0714f44 100644 --- a/fsrimagevideoupscaler-cli.py +++ b/fsrimagevideoupscaler-cli.py @@ -18,4 +18,7 @@ args = ap.parse_args() handler = bin.handler.Handler() -handler.handler( 'bin/lib/FidelityFX_CLI.exe', args.inputfile, 'custom', '2x', args.outputfile ) \ No newline at end of file +if ( args.scalefactor[ len(args.scalefactor) -1:] == 'x' ): + handler.handler( 'bin/lib/FidelityFX_CLI.exe', args.inputfile, 'custom', args.scalefactor, args.outputfile ) +else: + raise NameError( 'Argument Scale does require to be of form 2x!' ) \ No newline at end of file