Merge pull request #791 from rix1337/dev

v.20.0.2

Author: rix1337

.github/workflows/RunTests.yml .github/workflows/CheckBranch.yml.github/workflows/RunTests.yml renamed to .github/workflows/CheckBranch.yml

@@ -8,7 +8,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.12
           architecture: x64
@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
@@ -45,7 +45,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
       - name: Install dependencies
         run: npm ci
         working-directory: feedcrawler/web_interface/vuejs_frontend

.github/workflows/CreateRelease.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
       - name: Install Node dependencies
         run: npm ci
         working-directory: feedcrawler/web_interface/vuejs_frontend

README.md

@@ -103,8 +103,8 @@ Beispiel:
 
 ## Hostnamen
 
-FeedCrawler kann zum Durchsuchen beliebiger Webseiten verwendet werden. Welche das sind, entscheiden Anwender durch das
-Befüllen der _FeedCrawler.ini_ in der Kategorie _[Hostnames]_. Eingetragen werden dort Hostnamen, bspw. _ab = xyz.com_.
+FeedCrawler kann zum Durchsuchen beliebiger Webseiten verwendet werden.
+Welche das sind, entscheiden Anwender selbständig bei der Einrichtung. Es gilt dabei:
 
 * Welche Hostname aufgerufen werden entscheidet allein der Anwender.
 * Ist nicht mindestens ein Hostname gesetzt, wird der FeedCrawler nicht starten.

feedcrawler/providers/common_functions.py

@@ -10,6 +10,8 @@
 import socket
 import sys
 from urllib.parse import urlparse
+import signal
+import platform
 
 from feedcrawler.providers import gui
 from feedcrawler.providers import shared_state
@@ -557,7 +559,7 @@ def rreplace(s, old, new, occurrence):
 
 def configpath(configpath):
     pathfile = "FeedCrawler.conf"
-    current_path = os.path.dirname(sys.argv[0])
+    current_path = os.path.dirname(os.path.abspath(sys.argv[0]))
     if configpath:
         f = open(pathfile, "w")
         f.write(configpath)
@@ -569,8 +571,24 @@ def configpath(configpath):
         if shared_state.values["gui"]:
             configpath = gui.configpath_gui(current_path)
         else:
-            print("Wo sollen Einstellungen und Logs abgelegt werden? Leer lassen, um den aktuellen Pfad zu nutzen.")
-            configpath = input("Pfad angeben:")
+            def handler(signum, frame):
+                raise Exception("Timeout!")
+
+            signal.signal(signal.SIGALRM, handler)
+            if platform.system() != "Windows":
+                print("Wo sollen Einstellungen und Logs abgelegt werden?")
+                print("30 Sekunden warten oder leer lassen, um den aktuellen Pfad zu nutzen.")
+                signal.alarm(30)
+
+                try:
+                    configpath = input("Pfad angeben:")
+                    signal.alarm(0)
+                except Exception:
+                    print(" ... 30 Sekunden verstrichen! Nutze aktuellen Pfad.")
+                    configpath = ""
+            else:
+                print("Wo sollen Einstellungen und Logs abgelegt werden? Leer lassen, um den aktuellen Pfad zu nutzen.")
+                configpath = input("Pfad angeben:")
         if len(configpath) > 0:
             f = open(pathfile, "w")
             f.write(configpath)

feedcrawler/providers/version.py

@@ -8,7 +8,7 @@
 
 
 def get_version():
-    return "20.0.1"
+    return "20.0.2"
 
 
 def create_version_file():

feedcrawler/run.py

@@ -21,7 +21,7 @@
 from feedcrawler.providers.config import CrawlerConfig
 from feedcrawler.providers.myjd_connection import set_device_from_config, get_if_one_device, myjd_input
 from feedcrawler.providers.sqlite_database import FeedDb, remove_redundant_db_tables
-from feedcrawler.web_interface.web_server import web_server
+from feedcrawler.web_interface.web_server import hostnames_config, myjd_config, web_server
 
 version = "v." + version.get_version()
 
@@ -82,6 +82,14 @@ def main():
         shared_state.update("log_level", log_level)
         shared_state.set_logger()
 
+        local_address = 'http://' + check_ip()
+        port = int('9090')
+        docker = False
+        if shared_state.values["docker"]:
+            docker = True
+        elif arguments.port:
+            port = int(arguments.port)
+
         hostnames = CrawlerConfig('Hostnames')
 
         def clean_up_hostname(host, string):
@@ -106,18 +114,21 @@ def clean_up_hostname(host, string):
         if not shared_state.values["test_run"] and not set_hostnames:
             if shared_state.values["gui"]:
                 gui.no_hostnames_gui(shared_state.values["configfile"])
+                sys.exit(1)
             else:
-                print('Keine Hostnamen in der FeedCrawler.ini gefunden! Beende FeedCrawler!')
-                time.sleep(10)
-            sys.exit(1)
+                if not hostnames_config(port, local_address):
+                    print('Keine Hostnamen in der FeedCrawler.ini gefunden! Beende FeedCrawler!')
+                    time.sleep(10)
+                    sys.exit(1)
 
         if not shared_state.values["test_run"]:
+            myjd_input_required = False
             if not os.path.exists(shared_state.values["configfile"]):
                 if shared_state.values["docker"]:
                     if arguments.jd_user and arguments.jd_pass:
-                        myjd_input(arguments.port, arguments.jd_user, arguments.jd_pass, arguments.jd_device)
+                        myjd_input_required = True
                 else:
-                    myjd_input(arguments.port, arguments.jd_user, arguments.jd_pass, arguments.jd_device)
+                    myjd_input_required = True
             else:
                 feedcrawler = CrawlerConfig('FeedCrawler')
                 user = feedcrawler.get('myjd_user')
@@ -132,8 +143,11 @@ def clean_up_hostname(host, string):
                                 feedcrawler.save('myjd_device', one_device)
                                 set_device_from_config()
                 else:
-                    myjd_input(arguments.port, arguments.jd_user, arguments.jd_pass,
-                               arguments.jd_device)
+                    myjd_input_required = True
+
+            if myjd_input_required:
+                if not myjd_config(port, local_address):
+                    myjd_input(arguments.port, arguments.jd_user, arguments.jd_pass, arguments.jd_device)
 
         if not shared_state.values["test_run"]:
             if shared_state.get_device() and shared_state.get_device().name:
@@ -171,21 +185,16 @@ def clean_up_hostname(host, string):
                 sys.exit(1)
 
         feedcrawler = CrawlerConfig('FeedCrawler')
-        port = int(feedcrawler.get("port"))
-        docker = False
-        if shared_state.values["docker"]:
-            port = int('9090')
-            docker = True
-        elif arguments.port:
-            port = int(arguments.port)
+        if not arguments.docker and not arguments.port:
+            port = int(feedcrawler.get("port"))
 
         if feedcrawler.get("prefix"):
             prefix = '/' + feedcrawler.get("prefix")
         else:
             prefix = ''
-        local_address = 'http://' + check_ip() + ':' + str(port) + prefix
+
         if not shared_state.values["docker"]:
-            print('Der Webserver ist erreichbar unter "' + local_address + '"')
+            print(f'Der Webserver ist erreichbar unter "{local_address}:{port}{prefix}"')
 
         shared_state.set_connection_info(local_address, port, prefix, docker)
 
@@ -202,7 +211,7 @@ def clean_up_hostname(host, string):
 
         if arguments.delay:
             delay = int(arguments.delay)
-            print("Verzögere den ersten Suchlauf um " + str(delay) + " Sekunden")
+            print(f"Verzögere den ersten Suchlauf um {delay} Sekunden")
             time.sleep(delay)
 
         if not shared_state.values["test_run"]:

feedcrawler/web_interface/vuejs_frontend/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "feedcrawler-web",
-  "version": "20.0.1",
+  "version": "20.0.2",
   "type": "module",
   "scripts": {
     "dev": "vite",