Merge pull request #817 from rix1337/dev

Fix #816

Author: rix1337

feedcrawler/providers/shared_state.py

@@ -44,13 +44,13 @@ def set_initial_values():
         gui_enabled = False
     else:
         gui_enabled = True
+    update("connected", False)
     update("gui", gui_enabled)
     update("gui_active_in_tray_and_browser_opened_for_config_once", False)
     update("ww_blocked", False)
     update("sf_blocked", False)
     update("user_agent",
-           "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 "
-           "Safari/537.36")
+           "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36")
 
 
 def set_files(config_path):

feedcrawler/providers/version.py

@@ -8,7 +8,7 @@
 
 
 def get_version():
-    return "21.0.2"
+    return "21.0.3"
 
 
 def create_version_file():

feedcrawler/run.py

@@ -104,7 +104,6 @@ def main():
             else:
                 myjd_config(port, local_address, shared_state)
 
-        shared_state.update("connected", False)
         process_jdownloader = multiprocessing.Process(target=jdownloader_connection,
                                                       args=(shared_state_dict, shared_state_lock))
         process_jdownloader.start()
@@ -131,13 +130,14 @@ def main():
         if arguments.delay:
             delay = int(arguments.delay)
         else:
-            delay = 60
+            delay = 10
 
         if not os.environ.get('GITHUB_ACTION_PR'):
             try:
+                time.sleep(delay)
                 while not shared_state.values["connected"]:
                     print(f"Verbindung zu JDownloader noch nicht hergestellt - verzögere Suchlauf um {delay} Sekunden")
-                    time.sleep(60)
+                    time.sleep(delay)
             except KeyboardInterrupt:
                 sys.exit(1)
 
@@ -197,13 +197,13 @@ def jdownloader_connection(shared_state_dict, shared_state_lock):
                 set_device_from_config()
                 connection_established = shared_state.get_device() and shared_state.get_device().name
                 if connection_established:
-                    shared_state.update("connected", True)
                     break
     except KeyboardInterrupt:
         sys.exit(1)
 
     if connection_established:
         print(f'Erfolgreich mit My JDownloader verbunden. Gerätename: "{shared_state.get_device().name}"')
+        shared_state.update("connected", True)
     else:
         print('My JDownloader Zugangsversuche nicht erfolgreich! Beende FeedCrawler!')
         sys.exit(1)