janishutz-legacy/SimpleMediaUpscalerLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix crashes and add version option

Browse Source
This commit is contained in:
Janis Hutz
2023-05-25 15:09:37 +02:00
parent 54838c7d94
commit a0e7b459e1
2 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/__pycache__/handler.cpython-311.pyc
View File

Binary file not shown.

116
imagevideoupscaler-cli.py
View File

@@ -26,73 +26,78 @@ allowedFiletypes = [ 'png', 'jpg' ];
def performChecks ( args, ap ): def performChecks ( args, ap ):
if ( args.details == None or args.details == '' ): if ( args.details == None or args.details == '' ):
if ( not args.printengines ): if ( not args.printengines ):
# Check if input and output file arguments are available if ( not args.version ):
if ( args.inputfile == None or args.inputfile == '' or args.outputfile == None or args.outputfile == '' ): # Check if input and output file arguments are available
print( '\n\n ==> ERROR: Input and output file required! <==\n\n' ) if ( args.inputfile == None or args.inputfile == '' or args.outputfile == None or args.outputfile == '' ):
ap.print_usage(); print( '\n\n ==> ERROR: Input and output file required! <==\n\n' )
return False ap.print_usage();
return False
# check if output file exists and if, prompt user if it should be overwritten and remove if, if yes # check if output file exists and if, prompt user if it should be overwritten and remove if, if yes
if ( os.path.exists( args.outputfile ) ): if ( os.path.exists( args.outputfile ) ):
doReplace = input( '--> File already exists. Do you want to replace it? (Y/n) ' ).lower() doReplace = input( '--> File already exists. Do you want to replace it? (Y/n) ' ).lower()
if ( doReplace == 'y' or doReplace == '' ): if ( doReplace == 'y' or doReplace == '' ):
os.remove( args.outputfile ); os.remove( args.outputfile );
else: else:
print( '\n==> Refusing to Upscale video. Please delete the file or specify another filepath! <==' ) print( '\n==> Refusing to Upscale video. Please delete the file or specify another filepath! <==' )
return False
# check if engine argument is valid
try:
engineInfo[ args.engine.lower() ]
except KeyError:
print( '\n==> ERROR: Engine not available. Ensure you have specified a valid engine' )
return False return False
# check if engine argument is valid # Check scalefactor argument and also verify that engine supports upscaling
try: if ( args.scalefactor != None ):
engineInfo[ args.engine ] if ( int( args.scalefactor ) > 4 and int( args.scalefactor ) < -4 ):
except KeyError: print( '\n==> ERROR: Invalid scale factor. Value has to be an integer between -4 and 4' )
print( '\n==> ERROR: Engine not available. Ensure you have specified a valid engine' ) return False
return False else:
if ( not 'upscaling' in engineInfo[ args.engine ][ 'supports' ] ):
# Check scalefactor argument and also verify that engine supports upscaling print( '\n==> ERROR: This engine does NOT support upscaling' )
if ( int( args.scalefactor ) > 4 and int( args.scalefactor ) < -4 ): return False
print( '\n==> ERROR: Invalid scale factor. Value has to be an integer between -4 and 4' )
return False # Check sharpening argument and also verify that engine supports it
else: if ( args.sharpening != None ):
if ( not 'upscaling' in engineInfo[ args.engine ][ 'supports' ] ): if ( float( args.sharpening ) >= 1 and float( args.sharpening ) <= 0 ):
print( '\n==> ERROR: This engine does NOT support upscaling' ) print( '\n==> ERROR: Invalid value for sharpening. Value has to be between 0 and 1' )
return False
else:
if ( not 'sharpening' in engineInfo[ args.engine ][ 'supports' ] ):
print( '\n==> ERROR: This engine does NOT support sharpening' )
return False
# check if scalefactor and / or sharpening is available
if ( ( args.scalefactor == 0 or args.scalefactor == None ) and ( args.sharpening == 0 or args.sharpening == None ) ):
print( '\n==> ERROR: Either scalefactor or sharpening argument required!' )
return False return False
# Check sharpening argument and also verify that engine supports it # Check if filetype argument is valid
if ( float( args.sharpening ) >= 1 and float( args.sharpening ) <= 0 ): if ( not args.filetype in allowedFiletypes ):
print( '\n==> ERROR: Invalid value for sharpening. Value has to be between 0 and 1' ) print( '\n==> ERROR: Unknown filetype for temp files. Can be png or jpg' )
return False
else:
if ( not 'sharpening' in engineInfo[ args.engine ][ 'supports' ] ):
print( '\n==> ERROR: This engine does NOT support sharpening' )
return False return False
# check if scalefactor and / or sharpening is available # Check if mode of engine is valid
if ( args.scalefactor == 0 and args.sharpening == 0 ): try:
print( '\n==> ERROR: Either scalefactor or sharpening argument required!' ) engineInfo[ args.engine.lower() ][ 'cliModeOptions' ][ args.mode.lower() ]
return False except KeyError:
print( '\n==> ERROR: The specified mode is not supported by this engine. Options:' )
# Check if filetype argument is valid for option in engineInfo[ args.engine ][ 'cliModeOptions' ]:
if ( not args.filetype in allowedFiletypes ): print( ' --> ' + engineInfo[ args.engine ][ 'cliModeOptions' ][ option ][ 'displayName' ] + ' (' + option + ')' )
print( '\n==> ERROR: Unknown filetype for temp files. Can be png or jpg' ) return False
return False
return True
# Check if mode of engine is valid else:
try: print( '\n\n==> You are running Version 1.1.0 of ImageVideoScaler-CLI <==\n' )
engineInfo[ args.engine ][ 'cliModeOptions' ][ args.mode ]
except KeyError:
print( '\n==> ERROR: The specified mode is not supported by this engine. Options:' )
for option in engineInfo[ args.engine ][ 'cliModeOptions' ]:
print( ' --> ' + engineInfo[ args.engine ][ 'cliModeOptions' ][ option ][ 'displayName' ] + ' (' + option + ')' )
return False
return True
else: else:
print( '\n\n==> Available engines <==\n' ) print( '\n\n==> Available engines <==\n' )
for entry in engineList: for entry in engineList:
print( '--> ' + entry ) print( '--> ' + entry )
print( '\n\n' ) print( '\n\n' )
else: else:
print( '\n\n ==> INFOS about ' + engineInfo[ args.details ][ 'displayName' ] + '\n' ) print( '\n\n ==> INFOS about ' + engineInfo[ args.details.lower() ][ 'displayName' ] + '\n' )
print( ' --> Engine cli option is: ' + engineInfo[ args.details ][ 'abbr' ].lower() ) print( ' --> Engine cli option is: ' + engineInfo[ args.details ][ 'abbr' ].lower() )
print( ' --> CLI mode options are: ' ) print( ' --> CLI mode options are: ' )
for mode in engineInfo[ args.details ][ 'cliModeOptions' ]: for mode in engineInfo[ args.details ][ 'cliModeOptions' ]:
@@ -113,6 +118,7 @@ if __name__ == '__main__':
ap.add_argument( '-F', '--filetype', help='Change the file type of the temporary image files. Supports png, jpg. Video quality: png > jpg. PNG is default, if not specified.' ) ap.add_argument( '-F', '--filetype', help='Change the file type of the temporary image files. Supports png, jpg. Video quality: png > jpg. PNG is default, if not specified.' )
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( '-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( '-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', mode = 'fsr', filetype = 'png' ) ap.set_defaults( scaling = 0, sharpening = 0, threads = 4, engine = 'fsr', mode = 'fsr', filetype = 'png' )
args = ap.parse_args() args = ap.parse_args()