Merge remote-tracking branch 'upstream/dev'

Author: tomballgithub

instagram_monitor.py

@@ -785,10 +785,13 @@ def generate_config_with_current_values() -> str:
 # Global tracking for last/next check times
 LAST_CHECK_TIME = None
 NEXT_CHECK_TIME = None
+
 # Human-friendly global next-check display (used when NEXT_CHECK_TIME is not available)
 NEXT_CHECK_DISPLAY = None
 CHECK_COUNT = 0
 
+START_TIME_SCRIPT = 0.0
+
 # Global state for debug mode manual check trigger (thread-safe Event)
 # Will be initialized after threading is imported
 DEBUG_INPUT_THREAD = None
@@ -872,8 +875,6 @@ def _startup_sigint_handler(signum, frame):
 import threading
 import hashlib
 
-start_time_script = time.time()
-
 # Initialize the web dashboard data lock now that threading is imported
 # Important: this lock is acquired from multiple call-sites that can nest (e.g. helpers called inside other locked
 # regions). Use an RLock to avoid self-deadlocks that would freeze the web dashboard API
@@ -2490,10 +2491,9 @@ def update_ui_data(targets=None, config=None, check_count=None, last_check=None,
             parts.append(f"last_check={last_check}")
         if next_check is not None:
             parts.append(f"next_check={next_check}")
-        if config:
-            if 'status_msg' in config:
-                parts.append(f"status_msg='{config['status_msg']}'")
-        if targets:
+        if isinstance(config, dict) and 'status_msg' in config:
+            parts.append(f"status_msg='{config['status_msg']}'")
+        if isinstance(targets, dict):
             for tgt_user, tgt_data in targets.items():
                 tgt_parts = [tgt_user]
                 if isinstance(tgt_data, dict):
@@ -2515,7 +2515,10 @@ def update_ui_data(targets=None, config=None, check_count=None, last_check=None,
                         tgt_parts.append(f"following={tgt_data['following']}")
                     if 'session' in tgt_data:
                         s = tgt_data['session']
-                        tgt_parts.append(f"session={s.get('username', '?')}(active={s.get('active')})")
+                        if isinstance(s, dict):
+                            tgt_parts.append(f"session={s.get('username', '?')}(active={s.get('active')})")
+                        else:
+                            tgt_parts.append(f"session={s}")
                 parts.append(f"[{', '.join(tgt_parts)}]")
         if parts:
             debug_print(f"UI Data Update: {', '.join(parts)}")
@@ -3874,7 +3877,7 @@ def convert_utc_str_to_tz_datetime(dt_str):
 # Returns the current date/time in human readable format; eg. Sun 21 Apr 2024, 15:08:45
 def get_cur_ts(ts_str=""):
     fmt = "%d %b %Y, %I:%M:%S %p" if TIME_FORMAT_12H else "%d %b %Y, %H:%M:%S"
-    elapsed_time_script = int(time.time() - start_time_script)
+    elapsed_time_script = int(time.monotonic() - START_TIME_SCRIPT) if START_TIME_SCRIPT else 0
     return (f'{ts_str}{calendar.day_abbr[(now_local_naive()).weekday()]} {now_local_naive().strftime(fmt)} (elapsed: {display_time(elapsed_time_script)})')
 
 
@@ -9231,7 +9234,7 @@ def get_target_paths(user):
 
 
 def run_main():
-    global CLI_CONFIG_PATH, DOTENV_FILE, LOCAL_TIMEZONE, LIVENESS_CHECK_COUNTER, SESSION_USERNAME, SESSION_PASSWORD, CSV_FILE, DISABLE_LOGGING, INSTA_LOGFILE, OUTPUT_DIR, STATUS_NOTIFICATION, FOLLOWERS_NOTIFICATION, ERROR_NOTIFICATION, INSTA_CHECK_INTERVAL, DETECT_CHANGED_PROFILE_PIC, RANDOM_SLEEP_DIFF_LOW, RANDOM_SLEEP_DIFF_HIGH, imgcat_exe, SKIP_SESSION, SKIP_FOLLOWERS, SKIP_FOLLOWINGS, SKIP_FOLLOW_CHANGES, SKIP_GETTING_STORY_DETAILS, SKIP_GETTING_POSTS_DETAILS, GET_MORE_POST_DETAILS, SMTP_PASSWORD, stdout_bck, PROFILE_PIC_FILE_EMPTY, USER_AGENT, USER_AGENT_MOBILE, BE_HUMAN, ENABLE_JITTER
+    global CLI_CONFIG_PATH, DOTENV_FILE, LOCAL_TIMEZONE, LIVENESS_CHECK_COUNTER, SESSION_USERNAME, SESSION_PASSWORD, CSV_FILE, DISABLE_LOGGING, INSTA_LOGFILE, OUTPUT_DIR, STATUS_NOTIFICATION, FOLLOWERS_NOTIFICATION, ERROR_NOTIFICATION, INSTA_CHECK_INTERVAL, DETECT_CHANGED_PROFILE_PIC, RANDOM_SLEEP_DIFF_LOW, RANDOM_SLEEP_DIFF_HIGH, imgcat_exe, SKIP_SESSION, SKIP_FOLLOWERS, SKIP_FOLLOWINGS, SKIP_FOLLOW_CHANGES, SKIP_GETTING_STORY_DETAILS, SKIP_GETTING_POSTS_DETAILS, GET_MORE_POST_DETAILS, SMTP_PASSWORD, stdout_bck, PROFILE_PIC_FILE_EMPTY, USER_AGENT, USER_AGENT_MOBILE, BE_HUMAN, ENABLE_JITTER, START_TIME_SCRIPT
     global DEBUG_MODE, VERBOSE_MODE, HOURS_VERBOSE, DASHBOARD_MODE, DASHBOARD_ENABLED, WEB_DASHBOARD_ENABLED, FOLLOWERS_CHURN_DETECTION, WEBHOOK_ENABLED, WEBHOOK_URL, WEBHOOK_STATUS_NOTIFICATION, WEBHOOK_FOLLOWERS_NOTIFICATION, WEBHOOK_ERROR_NOTIFICATION, DASHBOARD_CONSOLE, DASHBOARD_DATA, FOLLOWERS_CHURN_AUTODISABLED, FOLLOWERS_CHURN_AUTODISABLED_REASON
     global WEB_DASHBOARD_HOST, WEB_DASHBOARD_PORT, WEB_DASHBOARD_TEMPLATE_DIR, mode_of_the_tool, DOWNLOAD_THUMBNAILS, THUMBNAILS_FORCED_BY_WEB, COLORED_OUTPUT, COLOR_THEME, TIME_FORMAT_12H
     global PROXY_ENABLED, PROXY_URL, PROXY_CERT_PATH, PROXY_WEBHOOKS
@@ -9259,6 +9262,7 @@ def run_main():
         print(f"{os.path.basename(sys.argv[0])} v{VERSION}")
         sys.exit(0)
 
+    START_TIME_SCRIPT = time.monotonic()
     stdout_bck = sys.stdout
 
     # Initialise colour handling based on CLI args (early check) and terminal capabilities