diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index fa472fdd..a7640011 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,11 +1,5 @@ blank_issues_enabled: false contact_links: - - name: Vorschläge für neue Funktionen / allgemeine Ideen - url: https://github.com/rix1337/FeedCrawler/discussions/new?category=ideas - about: Bitte ein neues Diskussionsthema erstellen, das unter "Ideas" zusammengefasst wird. - - name: Öffentliche Rückfragen - url: https://github.com/rix1337/FeedCrawler/discussions/categories/q-a - about: Bitte ein neues Diskussionsthema erstellen, das unter "Q&A" zusammengefasst wird. - - name: Chat mit der Community + - name: Chat mit der Community / Platz für Umsetzungsideen url: https://discord.gg/enn4AG3VnM about: Gedacht für den allgemeinen Erfahrungsaustausch. Der falsche Ort für Fehlermeldungen. diff --git a/README.md b/README.md index 009e5a60..3d83817b 100755 --- a/README.md +++ b/README.md @@ -108,11 +108,11 @@ Welche das sind, entscheiden Anwender selbständig bei der Einrichtung. Es gilt ## Startparameter -| Parameter | Erläuterung | -|------------------------------|-----------------------------------------------------------------------------------------------| -| ```--log-level=``` | Legt fest, wie genau geloggt wird (`CRITICAL`, `ERROR`, `WARNING`, `INFO`, `DEBUG`, `NOTSET`) | -| ```--port=``` | Legt den Port des Webservers fest | -| ```--delay=``` | Verzögere Suchlauf nach Start um ganze Zahl in Sekunden (optional) | +| Parameter | Erläuterung | +|------------------------------|--------------------------------------------------------------------| +| ```--log-level=``` | Legt fest, wie genau geloggt wird (`INFO` oder `DEBUG`) | +| ```--port=``` | Legt den Port des Webservers fest | +| ```--delay=``` | Verzögere Suchlauf nach Start um ganze Zahl in Sekunden (optional) | ## Sicherheitshinweis diff --git a/feedcrawler/providers/gui.py b/feedcrawler/providers/gui.py index 8d182abd..723e2dd7 100644 --- a/feedcrawler/providers/gui.py +++ b/feedcrawler/providers/gui.py @@ -5,6 +5,7 @@ import os import platform +import re import signal import sys import tkinter as tk @@ -32,6 +33,17 @@ def get_icon_path(): return icon_path +def message_box_open_browser(url): + trimmed_url = re.sub(r"\?cache_bust=[^ ]*", "", url) + message = (f'''FeedCrawler muss im Browser eingerichtet werden! +Klicke auf 'OK', um den Standard-Browser zu öffnen. + +Sollte der Browser nicht automatisch öffnen, gehe manuell auf: +"{trimmed_url}"''') + messagebox.showinfo("FeedCrawler", message) + webbrowser.open(url) + + def get_tray_icon(show_function, quit_function): import pystray # imported here to avoid crash on headless systems from PIL import Image # transitive dependency of pystray not in requirements.txt diff --git a/feedcrawler/providers/shared_state.py b/feedcrawler/providers/shared_state.py index 3fc3c607..8b636784 100644 --- a/feedcrawler/providers/shared_state.py +++ b/feedcrawler/providers/shared_state.py @@ -8,12 +8,12 @@ import platform import sys import time -import webbrowser from logging import handlers from feedcrawler.external_tools.myjd_api import Jddevice, Myjdapi from feedcrawler.external_tools.myjd_api import TokenExpiredException, RequestTimeoutException, MYJDException from feedcrawler.providers.config import CrawlerConfig +from feedcrawler.providers.gui import message_box_open_browser values = {} lock = None @@ -82,6 +82,7 @@ def set_logger(): logger.addHandler(console) if log_level == 10: + print("DEBUG Modus aktiviert. DEBUG-Log wird in 'FeedCrawler_DEBUG.log' gespeichert.") logfile_debug = logging.handlers.RotatingFileHandler(values["log_file_debug"]) logfile_debug.setFormatter(formatter) logfile_debug.setLevel(10) @@ -94,7 +95,7 @@ def set_sites(): def gui_active_in_tray_and_browser_opened_for_config_once(): if values["gui"] and not values["gui_active_in_tray_and_browser_opened_for_config_once"]: - webbrowser.open(f"http://localhost:9090?cache_bust={int(time.time())}") + message_box_open_browser(f"http://localhost:9090?cache_bust={int(time.time())}") update("gui_active_in_tray_and_browser_opened_for_config_once", True) return True diff --git a/feedcrawler/providers/version.py b/feedcrawler/providers/version.py index 5d61bf2c..55ca98a9 100644 --- a/feedcrawler/providers/version.py +++ b/feedcrawler/providers/version.py @@ -8,7 +8,7 @@ def get_version(): - return "20.0.3" + return "20.0.4" def create_version_file(): diff --git a/feedcrawler/run.py b/feedcrawler/run.py index 7a293bd2..b8f76987 100644 --- a/feedcrawler/run.py +++ b/feedcrawler/run.py @@ -83,8 +83,7 @@ def main(): print(f'Nutze das Verzeichnis "{config_path}" für Einstellungen/Logs') - log_level = logging.__dict__[ - arguments.log_level] if arguments.log_level in logging.__dict__ else logging.INFO + log_level = logging.DEBUG if arguments.log_level == "DEBUG" else logging.INFO shared_state.update("log_level", log_level) shared_state.set_logger() diff --git a/feedcrawler/web_interface/vuejs_frontend/package-lock.json b/feedcrawler/web_interface/vuejs_frontend/package-lock.json index 8326a068..f7459e9c 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.3", + "version": "20.0.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "feedcrawler-web", - "version": "20.0.3", + "version": "20.0.4", "dependencies": { "@formkit/i18n": "^1.6.5", "@formkit/vue": "^1.6.5", @@ -22,7 +22,7 @@ }, "devDependencies": { "@vitejs/plugin-vue": "^5.0.5", - "vite": "^5.3.2" + "vite": "^5.3.3" } }, "node_modules/@babel/parser": { diff --git a/feedcrawler/web_interface/vuejs_frontend/package.json b/feedcrawler/web_interface/vuejs_frontend/package.json index 21e19f20..0555fd42 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.3", + "version": "20.0.4", "type": "module", "scripts": { "dev": "vite", @@ -22,6 +22,6 @@ }, "devDependencies": { "@vitejs/plugin-vue": "^5.0.5", - "vite": "^5.3.2" + "vite": "^5.3.3" } }