diff --git a/frontend/.browserslistrc b/.browserslistrc similarity index 100% rename from frontend/.browserslistrc rename to .browserslistrc diff --git a/frontend/.eslintrc.js b/.eslintrc.js similarity index 100% rename from frontend/.eslintrc.js rename to .eslintrc.js diff --git a/.gitignore b/.gitignore index fd99892..c148942 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,26 @@ -# -# SimpleMediaUpscalerLite - .gitignore -# -# Created by Janis Hutz 05/24/2023, Licensed under the GPL V3 License -# https://janishutz.com, development@janishutz.com -# -# -# - -# remove pycache -__pycache__ - -# remove node_modules from repo +.DS_Store node_modules +/dist -# ignore build & dist folders -build -dist -target \ No newline at end of file +# local env files +.env.local +.env.*.local + +# Log files +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? + +#Electron-builder output +/dist_electron \ No newline at end of file diff --git a/README.md b/README.md index 2c9d9c8..a1766e5 100755 --- a/README.md +++ b/README.md @@ -1,104 +1,24 @@ -
- -

SimpleMediaUpscalerLite

-
+# SimpleMediaUpscalerLite -
- - - Lines of code - - -
- GitHub Repo stars - GitHub watchers - - GitHub forks - GitHub commit activity -
- GitHub all releases - GitHub release (latest by date) - - - -
-smuL (pronounced like "small") is an Electron App that can be used to upscale images and videos using multiple different upscaling engines. +## Project setup +``` +npm install +``` -# Ongoing change: -We are abandoning the CLI in favour of tighter integration with the frontend and to provide you with more information on the upscaling process. +### Compiles and hot-reloads for development +``` +npm run serve +``` -WE ARE LOOKING TO ALSO SUPPORT MacOS IN THE FUTURE. IF YOU USE OR KNOW SOMEBODY THAT USES MacOS and who'd be willing to run smuL to test, please let us know through an issue or the [contact form on my website](https://janishutz.com/support/contact) +### Compiles and minifies for production +``` +npm run build +``` -# Functionality -This app allows you to upscale a single file or (in the future) a full on folder with one of many different engines that can be added as plugins. -- Choose an input & output file from a GUI filemanager. -- Set your own scaling multiplier -- You may upscale Images (currently .png, .jpg and .jpeg) or Videos (currently .mp4 and .mkv) -- Choose from one of many different upscaling algorithms. -- Add plugins to add even more upscaling engines to it (will now have to be written in JS, see wiki for more info) +### Lints and fixes files +``` +npm run lint +``` -## Engines -- AMD Fidelity FX Super Resolution -- Cubic scaling -- High Quality Cubic -- Real-ESGRAN -- more to come! - -# Supported OS -- Windows 10, 11 (officially) -- Windows XP, Vista, 7, 8 might or might not work -- Any modern Linux distro with wine installed - -# Contributing -If you have any suggestions or features you'd like to have implemented, you may either implement the feature yourself and open a pull request, or open an issue on this GitHub page. Both things are appreciated! - ---> Follow the rules layed out in CONTRIBUTING.md ---> We will add a linter that will then run on circleci to ensure code quality is high - -### Current Contributers -- simplePCBuilding (Maintainer) [Docs, Website, Frontend, Linux packages] -- ThatPlasma (Testing) [Testing] - - -# Roadmap -V2.0.0: -- Migrate to Electron app -- ✅ -- Package Windows & Linux Version -- ✅ -- Add packaging script for Linux & Windows version -- ✅ -- Make python app CLI only -- ✅ -- Refactor backend to add plugin support -- ✅ - -V2.1.0: -- Remove CLI and make tighter integration with GUI -- Add more scaling engines (as plugins, currently planning on adding the mpv-player cli) -- Expand Wiki to feature documentation on how to create a plugin and maybe add a project website -- Show progress of scaling - -# Issues -If you encounter any problems with this app, please don't hesitate to open an issue on GitHub. - -## Known issues -- Electron App shows that it is out of date if running in the development version - -# FAQ -**Q: Can you add upscaling engine [upscaling engine here]?** - -A: We can add it most likely, please open an issue that contains a link to the library and please try and upscale an image using it yourself and copy-paste the command into a comment. -Just remember that it might take time to implement it and this is all developed in our free time and we have no obligation to implement it. - -**Q: App no worky on OS XXXX** - -A: Please check [Supported OS](#supported-os) that your OS is actually supported officially. If so, please open an issue and provide command used (if CLI) and error message that the app spat out when running. -If the OS is not officially supported, we may not be able to help you, since we intentionally don't support it officially - -**Q: Why no worky on MacOS? / Can you port to MacOS?** - -A: Wine support on MacOS is still mediocre and most likely cannot run some of the upscalers included by default so we cannot support it. I will be testing it at some point in a VM, but that won't necesarily speak for full functionality. If you find a way to run all upscalers on Mac, feel free to open a PR to add that functionality or just let us know what you did in an issue. - -**Q: Upscaled XXX looks not as great as I want** - -A: Try out different engines (that's why we support so many) and try to use sharpening to improve quality. If it doesn't help, you might want to suggest another engine. - -**Q: How can I support you?** - -A: You may contribute to this project by writing documentation, improving the website, adding plugins, fixing bugs, testing or by donating. +### Customize configuration +See [Configuration Reference](https://cli.vuejs.org/config/). diff --git a/frontend/babel.config.js b/babel.config.js similarity index 100% rename from frontend/babel.config.js rename to babel.config.js diff --git a/frontend/.gitignore b/frontend/.gitignore deleted file mode 100644 index c148942..0000000 --- a/frontend/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -.DS_Store -node_modules -/dist - - -# local env files -.env.local -.env.*.local - -# Log files -npm-debug.log* -yarn-debug.log* -yarn-error.log* -pnpm-debug.log* - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw? - -#Electron-builder output -/dist_electron \ No newline at end of file diff --git a/frontend/README.md b/frontend/README.md deleted file mode 100644 index a1766e5..0000000 --- a/frontend/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# SimpleMediaUpscalerLite - -## Project setup -``` -npm install -``` - -### Compiles and hot-reloads for development -``` -npm run serve -``` - -### Compiles and minifies for production -``` -npm run build -``` - -### Lints and fixes files -``` -npm run lint -``` - -### Customize configuration -See [Configuration Reference](https://cli.vuejs.org/config/). diff --git a/frontend/package.json b/frontend/package.json deleted file mode 100644 index 1d7a326..0000000 --- a/frontend/package.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "name": "SimpleMediaUpscalerLite", - "version": "2.0.0", - "maintainers": [ - "Janis Hutz " - ], - "description": "An Electron frontend to the SimpleMediaUpscalerLite-CLI", - "homepage": "https://janishutz.com/scaler.html", - "author": { - "name": "Janis Hutz", - "email": "development@janishutz.com", - "url": "https://janishutz.com" - }, - "license": "GPL-3.0-or-later", - "bugs": { - "url": "https://github.com/simplePCBuilding/SimpleMediaUpscalerLite/issues" - }, - "private": true, - "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "lint": "vue-cli-service lint", - "electron:build": "vue-cli-service electron:build", - "electron:serve": "vue-cli-service electron:serve", - "postinstall": "electron-builder install-app-deps", - "postuninstall": "electron-builder install-app-deps" - }, - "main": "background.js", - "dependencies": { - "child_process": "^1.0.2", - "core-js": "^3.8.3", - "electron-squirrel-startup": "^1.0.0", - "vue": "^3.2.13", - "vue-router": "^4.0.3" - }, - "devDependencies": { - "@babel/core": "^7.12.16", - "@babel/eslint-parser": "^7.12.16", - "@vue/cli-plugin-babel": "~5.0.0", - "@vue/cli-plugin-eslint": "~5.0.0", - "@vue/cli-plugin-router": "~5.0.0", - "@vue/cli-service": "~5.0.0", - "electron": "^24.4.1", - "electron-devtools-installer": "^3.1.0", - "eslint": "^7.32.0", - "eslint-plugin-vue": "^8.0.3", - "vue-cli-plugin-electron-builder": "~2.1.1" - } -} diff --git a/frontend/src/assets/logo.png b/frontend/src/assets/logo.png deleted file mode 100755 index 3cfa8b3..0000000 Binary files a/frontend/src/assets/logo.png and /dev/null differ diff --git a/frontend/jsconfig.json b/jsconfig.json similarity index 100% rename from frontend/jsconfig.json rename to jsconfig.json diff --git a/frontend/package-lock.json b/package-lock.json similarity index 100% rename from frontend/package-lock.json rename to package-lock.json diff --git a/package.json b/package.json index b211c7a..1d7a326 100644 --- a/package.json +++ b/package.json @@ -1,28 +1,49 @@ { "name": "SimpleMediaUpscalerLite", "version": "2.0.0", - "description": "A frontend to upscale your videos and images using different upscale engines", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/simplePCBuilding/SimpleMediaUpscalerLite.git" - }, - "keywords": [ - "upscaler", - "electron", - "python", - "frontend", - "videos", - "images" + "maintainers": [ + "Janis Hutz " ], - "author": "Janis Hutz", + "description": "An Electron frontend to the SimpleMediaUpscalerLite-CLI", + "homepage": "https://janishutz.com/scaler.html", + "author": { + "name": "Janis Hutz", + "email": "development@janishutz.com", + "url": "https://janishutz.com" + }, "license": "GPL-3.0-or-later", "bugs": { - "url": "https://github.com/simplePCBuilding/SimpleMediaUpscalerLite/issues", - "email": "development@janishutz.com" + "url": "https://github.com/simplePCBuilding/SimpleMediaUpscalerLite/issues" }, - "homepage": "https://github.com/simplePCBuilding/SimpleMediaUpscalerLite#readme" + "private": true, + "scripts": { + "serve": "vue-cli-service serve", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint", + "electron:build": "vue-cli-service electron:build", + "electron:serve": "vue-cli-service electron:serve", + "postinstall": "electron-builder install-app-deps", + "postuninstall": "electron-builder install-app-deps" + }, + "main": "background.js", + "dependencies": { + "child_process": "^1.0.2", + "core-js": "^3.8.3", + "electron-squirrel-startup": "^1.0.0", + "vue": "^3.2.13", + "vue-router": "^4.0.3" + }, + "devDependencies": { + "@babel/core": "^7.12.16", + "@babel/eslint-parser": "^7.12.16", + "@vue/cli-plugin-babel": "~5.0.0", + "@vue/cli-plugin-eslint": "~5.0.0", + "@vue/cli-plugin-router": "~5.0.0", + "@vue/cli-service": "~5.0.0", + "electron": "^24.4.1", + "electron-devtools-installer": "^3.1.0", + "eslint": "^7.32.0", + "eslint-plugin-vue": "^8.0.3", + "vue-cli-plugin-electron-builder": "~2.1.1" + } } diff --git a/frontend/public/favicon.ico b/public/favicon.ico similarity index 100% rename from frontend/public/favicon.ico rename to public/favicon.ico diff --git a/frontend/public/index.html b/public/index.html similarity index 100% rename from frontend/public/index.html rename to public/index.html diff --git a/frontend/public/lang/about/en.json b/public/lang/about/en.json similarity index 100% rename from frontend/public/lang/about/en.json rename to public/lang/about/en.json diff --git a/frontend/public/lang/home/en.json b/public/lang/home/en.json similarity index 100% rename from frontend/public/lang/home/en.json rename to public/lang/home/en.json diff --git a/frontend/public/lang/settings/en.json b/public/lang/settings/en.json similarity index 100% rename from frontend/public/lang/settings/en.json rename to public/lang/settings/en.json diff --git a/frontend/src/App.vue b/src/App.vue similarity index 100% rename from frontend/src/App.vue rename to src/App.vue diff --git a/frontend/src/app.js b/src/app.js similarity index 100% rename from frontend/src/app.js rename to src/app.js diff --git a/frontend/logo.png b/src/assets/logo.png old mode 100755 new mode 100644 similarity index 100% rename from frontend/logo.png rename to src/assets/logo.png diff --git a/frontend/src/background.js b/src/background.js similarity index 100% rename from frontend/src/background.js rename to src/background.js diff --git a/frontend/src/components/HelloWorld.vue b/src/components/HelloWorld.vue similarity index 100% rename from frontend/src/components/HelloWorld.vue rename to src/components/HelloWorld.vue diff --git a/frontend/src/main.js b/src/main.js similarity index 100% rename from frontend/src/main.js rename to src/main.js diff --git a/frontend/src/router/index.js b/src/router/index.js similarity index 100% rename from frontend/src/router/index.js rename to src/router/index.js diff --git a/frontend/src/upscalingHandler.js b/src/upscalingHandler.js similarity index 100% rename from frontend/src/upscalingHandler.js rename to src/upscalingHandler.js diff --git a/frontend/src/views/AboutView.vue b/src/views/AboutView.vue similarity index 100% rename from frontend/src/views/AboutView.vue rename to src/views/AboutView.vue diff --git a/frontend/src/views/HomeView.vue b/src/views/HomeView.vue similarity index 100% rename from frontend/src/views/HomeView.vue rename to src/views/HomeView.vue diff --git a/frontend/src/views/SettingsView.vue b/src/views/SettingsView.vue similarity index 100% rename from frontend/src/views/SettingsView.vue rename to src/views/SettingsView.vue diff --git a/frontend/vue.config.js b/vue.config.js similarity index 100% rename from frontend/vue.config.js rename to vue.config.js