Merge pull request #796 from rix1337/dev

v.20.1.0 - Fix Windows-Exe (#795)

feedcrawler/providers/version.py

@@ -8,7 +8,7 @@
 
 
 def get_version():
-    return "20.0.4"
+    return "20.1.0"
 
 
 def create_version_file():

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):

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

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",