diff --git a/feedcrawler/providers/version.py b/feedcrawler/providers/version.py index 55ca98a9..ee1e8be7 100644 --- a/feedcrawler/providers/version.py +++ b/feedcrawler/providers/version.py @@ -8,7 +8,7 @@ def get_version(): - return "20.0.4" + return "20.1.0" def create_version_file(): diff --git a/feedcrawler/web_interface/feedcrawler_api.py b/feedcrawler/web_interface/feedcrawler_api.py index b3e46923..406e7377 100644 --- a/feedcrawler/web_interface/feedcrawler_api.py +++ b/feedcrawler/web_interface/feedcrawler_api.py @@ -4,18 +4,11 @@ # Dieses Modul stellt den Webserver der API des FeedCrawlers bereit. import sys -from io import StringIO - -from feedcrawler.providers.common_functions import Unbuffered -from feedcrawler.web_interface.serve.api import app_container - -if sys.stdout is None: # required to allow pyinstaller --noconsole to work - sys.stdout = StringIO() -if sys.stderr is None: # required to allow pyinstaller --noconsole to work - sys.stderr = StringIO() from feedcrawler.providers import gui from feedcrawler.providers import version, shared_state +from feedcrawler.providers.common_functions import Unbuffered +from feedcrawler.web_interface.serve.api import app_container def web_server(shared_state_dict, shared_state_lock): diff --git a/feedcrawler/web_interface/serve/api.py b/feedcrawler/web_interface/serve/api.py index f683726c..432e5064 100644 --- a/feedcrawler/web_interface/serve/api.py +++ b/feedcrawler/web_interface/serve/api.py @@ -14,6 +14,12 @@ from urllib import parse from xml.etree import ElementTree +if sys.stdout is None or sys.stderr is None: # required to allow pyinstaller --noconsole to work with bottle + from io import StringIO + + sys.stdout = StringIO() + sys.stderr = StringIO() + from Cryptodome.Protocol.KDF import scrypt from Cryptodome.Random import get_random_bytes from bottle import Bottle, request, HTTPError, static_file, redirect, abort diff --git a/feedcrawler/web_interface/vuejs_frontend/package-lock.json b/feedcrawler/web_interface/vuejs_frontend/package-lock.json index f7459e9c..477c996c 100644 --- a/feedcrawler/web_interface/vuejs_frontend/package-lock.json +++ b/feedcrawler/web_interface/vuejs_frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "feedcrawler-web", - "version": "20.0.4", + "version": "20.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "feedcrawler-web", - "version": "20.0.4", + "version": "20.1.0", "dependencies": { "@formkit/i18n": "^1.6.5", "@formkit/vue": "^1.6.5", diff --git a/feedcrawler/web_interface/vuejs_frontend/package.json b/feedcrawler/web_interface/vuejs_frontend/package.json index 0555fd42..0743bced 100644 --- a/feedcrawler/web_interface/vuejs_frontend/package.json +++ b/feedcrawler/web_interface/vuejs_frontend/package.json @@ -1,6 +1,6 @@ { "name": "feedcrawler-web", - "version": "20.0.4", + "version": "20.1.0", "type": "module", "scripts": { "dev": "vite",