From bf30e4075900ea0e109e2a053c226279fcccbefc Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Mon, 5 Jun 2023 08:24:25 +0200 Subject: [PATCH] rename project, fix bug & optional output path --- .gitignore | 2 +- LICENSE | 5 ++-- README.md | 36 ++++++++++++------------ bin/handler.py | 4 +-- bin/pluginDownloader.py | 2 +- config/settings.ini | 2 +- frontend/README.md | 2 +- frontend/package-lock.json | 4 +-- frontend/package.json | 6 ++-- frontend/src/upscalingHandler.js | 10 +++---- frontend/src/views/AboutView.vue | 6 ++-- frontend/src/views/HomeView.vue | 2 +- package.json | 8 +++--- packaging/package.sh | 14 ++++----- packaging/packageLinux.sh | 9 +++--- packaging/packageWindows.sh | 8 +++--- packaging/startTesting.sh | 6 ++-- packaging/stopTesting.sh | 2 +- imagevideoupscaler-cli.py => smuL-cli.py | 24 +++++++++------- imagevideoupscaler.spec => smuL-cli.spec | 6 ++-- website/plugins.md | 2 +- 21 files changed, 82 insertions(+), 78 deletions(-) rename imagevideoupscaler-cli.py => smuL-cli.py (86%) rename imagevideoupscaler.spec => smuL-cli.spec (87%) diff --git a/.gitignore b/.gitignore index 9d5d744..615e938 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # -# FSRImageVideoUpscalerFrontend - .gitignore +# FSRSimpleMediaScalerLiteFrontend - .gitignore # # Created by Janis Hutz 05/24/2023, Licensed under the GPL V3 License # https://janishutz.com, development@janishutz.com diff --git a/LICENSE b/LICENSE index 0933115..1865b40 100755 --- a/LICENSE +++ b/LICENSE @@ -631,7 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - A simple PyQT5 frontend to upscale both videos and images + A simple Electron GUI and Python CLI to upscale your videos using different + upscaling engines. Copyright (C) 2023 Janis Hutz This program is free software: you can redistribute it and/or modify @@ -652,7 +653,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - ImageVideoUpscalerFrontend Copyright (C) 2023 Janis Hutz + SimpleMediaScalerLiteFrontend Copyright (C) 2023 Janis Hutz This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/README.md b/README.md index 11e2133..204ec2e 100755 --- a/README.md +++ b/README.md @@ -1,31 +1,31 @@
-

ImageVideoUpscalerFrontend

+

SimpleMediaScalerLiteFrontend

- - - - - + + + + +
- GitHub Repo stars - GitHub watchers - - GitHub forks - GitHub commit activity + GitHub Repo stars + GitHub watchers + + GitHub forks + GitHub commit activity
- GitHub all releases - GitHub release (latest by date) - - + GitHub all releases + GitHub release (latest by date) + +
An Electron App with Python CLI to upscale images and videos using multiple different upscaling engines. # NEW NAME & LOGO NEEDED! -If you have suggestions for a name, please let us know [here](https://github.com/simplePCBuilding/ImageVideoUpscaler/issues/16). If you want to contribute a new logo, please open a PR and add it, or just let us know in the beforementioned issue. +If you have suggestions for a name, please let us know [here](https://github.com/simplePCBuilding/SimpleMediaScalerLite/issues/16). If you want to contribute a new logo, please open a PR and add it, or just let us know in the beforementioned issue. # Functionality This app allows you to fully automatically upscale a single file or a full on folder with one of many different engines. @@ -44,9 +44,9 @@ This app allows you to fully automatically upscale a single file or a full on fo This App also features a CLI interface. ``` -usage: imagevideoupscaler-cli.py [-h] [-i INPUTFILE] [-o OUTPUTFILE] [-s SCALEFACTOR] [-S SHARPENING] [-T THREADS] [-E ENGINE] [-M MODE] [-F FILETYPE] [-d DETAILS] [-p] [-v] +usage: SimpleMediaScalerLite-cli.py [-h] [-i INPUTFILE] [-o OUTPUTFILE] [-s SCALEFACTOR] [-S SHARPENING] [-T THREADS] [-E ENGINE] [-M MODE] [-F FILETYPE] [-d DETAILS] [-p] [-v] -ImageVideoUpscaler - CLI, a CLI application to upscale videos and images using different upscaling engines. +SimpleMediaScalerLite - CLI, a CLI application to upscale videos and images using different upscaling engines. options: -h, --help show this help message and exit diff --git a/bin/handler.py b/bin/handler.py index 2b7c2f9..e5829e1 100755 --- a/bin/handler.py +++ b/bin/handler.py @@ -1,5 +1,5 @@ ''' -* FSRImageVideoUpscalerFrontend - handler.py +* FSRSimpleMediaScalerLiteFrontend - handler.py * * Created by Janis Hutz 03/14/2023, Licensed under the GPL V3 License * https://janishutz.com, development@janishutz.com @@ -43,7 +43,7 @@ class Handler: def handler( self, filepath, scalefactor, output_path, sharpening, filetype, engine, mode, threads=4 ): # Function to be called when using this class as this function automatically determines if file is video or image - print( '\n\n ImageVideoUpscaler - V1.1.0\n\n(c) 2023 ImageVideoUpscaler contributors\n\n\n\n' ); + print( '\n\n SimpleMediaScalerLite - V1.1.0\n\n(c) 2023 SimpleMediaScalerLite contributors\n\n\n\n' ); if self.os_type == 'linux': self.tmppath = config['PathSettings']['tmpPathLinux'] diff --git a/bin/pluginDownloader.py b/bin/pluginDownloader.py index 6380651..6a4bc25 100644 --- a/bin/pluginDownloader.py +++ b/bin/pluginDownloader.py @@ -1,5 +1,5 @@ """ -* ImageVideoUpscaler - pluginDownloader.py +* SimpleMediaScalerLite - pluginDownloader.py * * Created by Janis Hutz 05/31/2023, Licensed under the GPL V3 License * https://janishutz.com, development@janishutz.com diff --git a/config/settings.ini b/config/settings.ini index 352a9e9..8ee5b59 100755 --- a/config/settings.ini +++ b/config/settings.ini @@ -1,5 +1,5 @@ [PathSettings] -defaultOutputPath = $HOME/FSRImageVideoUpscaler/ +defaultOutputPath = $HOME/FSRSimpleMediaScalerLite/ tmpPathLinux = /tmp/ tmpPathWindows = C:\temp diff --git a/frontend/README.md b/frontend/README.md index d14ead0..edf6448 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -1,4 +1,4 @@ -# imagevideoupscaler +# SimpleMediaScalerLite ## Project setup ``` diff --git a/frontend/package-lock.json b/frontend/package-lock.json index fe6a475..c825a51 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,11 +1,11 @@ { - "name": "imagevideoupscaler", + "name": "SimpleMediaScalerLite", "version": "2.0.0-dev1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "imagevideoupscaler", + "name": "SimpleMediaScalerLite", "version": "2.0.0-dev1", "hasInstallScript": true, "license": "GPL-3.0-or-later", diff --git a/frontend/package.json b/frontend/package.json index 8cf6b37..c9d70b5 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,10 +1,10 @@ { - "name": "imagevideoupscaler", + "name": "SimpleMediaScalerLite", "version": "2.0.0-dev1", "maintainers": [ "Janis Hutz " ], - "description": "An Electron frontend to the ImageVideoUpscaler-CLI", + "description": "An Electron frontend to the SimpleMediaScalerLite-CLI", "homepage": "https://janishutz.com/scaler.html", "author": { "name": "Janis Hutz", @@ -13,7 +13,7 @@ }, "license": "GPL-3.0-or-later", "bugs": { - "url": "https://github.com/simplePCBuilding/FSRImageVideoUpscalerFrontend/issues" + "url": "https://github.com/simplePCBuilding/FSRSimpleMediaScalerLiteFrontend/issues" }, "private": true, "scripts": { diff --git a/frontend/src/upscalingHandler.js b/frontend/src/upscalingHandler.js index e23ff55..63fc479 100644 --- a/frontend/src/upscalingHandler.js +++ b/frontend/src/upscalingHandler.js @@ -1,5 +1,5 @@ /* -* ImageVideoUpscaler - upscalingHandler.js +* SimpleMediaScalerLite - upscalingHandler.js * * Created by Janis Hutz 06/03/2023, Licensed under the GPL V3 License * https://janishutz.com, development@janishutz.com @@ -24,9 +24,9 @@ class UpscalingHandler { let baseCommand = ''; // Create cli command to upscale if ( this.os === 'linux' ) { - baseCommand = './imagevideoupscaler'; + baseCommand = './smuL-cli'; } else if ( this.os === 'win32' ) { - baseCommand = 'imagevideoupscaler'; + baseCommand = 'smuL-cli'; } @@ -55,11 +55,11 @@ class UpscalingHandler { child.on( 'error', ( error ) => { console.log( 'An error occurred' + error ); - new Notification( { title: `ImageVideoUpscaler - Error whilst upscaling', body: 'Your upscaling Job encountered an error whilst upscaling. (Error message: ${ error.message }).`} ) + new Notification( { title: `SimpleMediaScalerLite - Error whilst upscaling', body: 'Your upscaling Job encountered an error whilst upscaling. (Error message: ${ error.message }).`} ) } ); child.on( 'close', ( code ) => { - new Notification( { title: `ImageVideoUpscaler - Job complete', body: 'Your Upscaling job has completed successfully (Code ${ code }). You may find its output here: ` + options.OutputFile } ) + new Notification( { title: `SimpleMediaScalerLite - Job complete', body: 'Your Upscaling job has completed successfully (Code ${ code }). You may find its output here: ` + options.OutputFile } ) } ); } diff --git a/frontend/src/views/AboutView.vue b/frontend/src/views/AboutView.vue index 8b492d3..0620875 100644 --- a/frontend/src/views/AboutView.vue +++ b/frontend/src/views/AboutView.vue @@ -1,8 +1,8 @@