Merge pull request #114 from Drazzilb08/scheduler-fix

Scheduler fix

Pipfile

@@ -15,6 +15,7 @@ prettytable = "*"
 croniter = "*"
 "ruamel.yaml" = "*"
 docker = "*"
+python-dateutil = "*"
 
 [dev-packages]
 

requirements.txt

@@ -1,14 +1,14 @@
 -i https://pypi.org/simple
 certifi==2024.2.2; python_version >= '3.6'
 charset-normalizer==3.3.2; python_full_version >= '3.7.0'
-croniter==2.0.1; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
+croniter==2.0.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
 docker==7.0.0; python_version >= '3.8'
 idna==3.6; python_version >= '3.5'
 packaging==23.2; python_version >= '3.7'
 pillow==10.2.0; python_version >= '3.8'
 plexapi==4.15.10; python_version >= '3.8'
 prettytable==3.10.0; python_version >= '3.8'
-python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+python-dateutil==2.9.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 pytz==2024.1
 pyyaml==6.0.1; python_version >= '3.6'
 qbittorrent-api==2024.2.59; python_version >= '3.8'

util/scheduler.py

@@ -1,7 +1,8 @@
 from datetime import datetime
 from croniter import croniter
+from dateutil import tz
 
-last_run = {}
+next_run_times = {}
 
 def check_schedule(script_name, schedule, logger):
     """
@@ -60,14 +61,33 @@ def check_schedule(script_name, schedule, logger):
                 if start_month <= current_month <= end_month and start_day <= current_day <= end_day:
                     return True
         elif frequency == "cron":
-            cron = croniter(data)
-            next_run = cron.get_next(datetime)
-            if last_run.get(script_name) is None:
-                last_run[script_name] = next_run
-                return False
-            if next_run > last_run[script_name]:
-                last_run[script_name] = next_run
+            local_tz = tz.tzlocal()
+            local_date = datetime.now(local_tz)
+
+            current_time = datetime.now(local_tz).replace(second=0, microsecond=0)
+
+            logger.debug(f"Local time: {current_time}")
+
+            next_run = next_run_times.get(script_name)
+            if next_run is None:
+                next_run = croniter(data, local_date).get_next(datetime)
+                next_run_times[script_name] = next_run
+
+                logger.debug(f"Next run for {script_name}: {next_run}")
+
+            if next_run <= current_time:
+                next_run = croniter(data, local_date).get_next(datetime)
+                next_run_times[script_name] = next_run
+
+                logger.debug(f"Next run for {script_name}: {next_run}\n")
+
                 return True
+            else:
+                logger.debug(f"Next run time for script {script_name}: {next_run} is in the future\n")
+                return False
+
+
+
     except ValueError as e:
         logger.error(f"Invalid schedule: {schedule} for script: {script_name}")
         logger.error (f"Error: {e}")