[FIX] date and time now are correct and safe for schtasks.exe

Author: blackwut

src/outfit.py

@@ -10,7 +10,7 @@
 import os
 import argparse
 import pandas as pd
-from datetime import datetime
+from datetime import datetime, timedelta
 from utils import *
 from collect_data import collect_data
 from process import process_data
@@ -32,6 +32,19 @@ def get_timestamp_str_from_date_time(date, time):
     time_str = time.Format("%H:%M:%S")
     return f"{date_str} {time_str}"
 
+def wxDateTime_to_datetime(dt: wx.DateTime) -> datetime:
+    if not dt.IsValid():
+        raise ValueError("Invalid wx.DateTime object")
+
+    year = int(dt.GetYear())
+    month = int(dt.GetMonth()) + 1  # wx.DateTime months are 0-based
+    day = int(dt.GetDay())
+    hour = int(dt.GetHour())
+    minute = int(dt.GetMinute())
+    second = int(dt.GetSecond())
+
+    return datetime(year, month, day, hour, minute, second)
+
 
 class SchedulerFrame(wx.Frame):
     def __init__(self):
@@ -201,7 +214,7 @@ def load_env(self):
             self.end_time.SetValue(ts_from)
 
             self.interval_txt.SetValue(env.get(Env.INTERVAL))
-            self.process_data_checkbox.SetValue(env.get(Env.PROCESS_DATA))
+            # self.process_data_checkbox.SetValue(env.get(Env.PROCESS_DATA))
 
             logging.info("Environment variables loaded successfully.")
         except Exception as e:
@@ -225,7 +238,7 @@ def store_env(self, filename: str = ".env"):
             env.set(Env.TIMESTAMP_FROM, ts_from_str)
             env.set(Env.TIMESTAMP_TO, ts_to_str)
             env.set(Env.INTERVAL, self.interval_txt.GetValue())
-            env.set(Env.PROCESS_DATA, self.process_data_checkbox.GetValue())
+            # env.set(Env.PROCESS_DATA, self.process_data_checkbox.GetValue())
 
             logging.info(f"Environment variables stored to {filename}")
         except Exception as e:
@@ -297,10 +310,10 @@ def on_start_schedule(self, event):
         try:
             prefix = self.prefix_txt.GetValue()
             data_filepath = self.data_txt.GetValue()
-            start_time = self.start_time.GetValue()
-            start_date = self.start_date.GetValue()
-            end_time = self.end_time.GetValue()
-            end_date = self.end_date.GetValue()
+            start_time = wxDateTime_to_datetime(self.start_time.GetValue())
+            start_date = wxDateTime_to_datetime(self.start_date.GetValue())
+            end_time = wxDateTime_to_datetime(self.end_time.GetValue())
+            end_date = wxDateTime_to_datetime(self.end_date.GetValue())
             interval = self.interval_slider.GetValue()
 
             start_dt = datetime(start_date.year, start_date.month, start_date.day,
@@ -315,9 +328,14 @@ def on_start_schedule(self, event):
 
             env_abs_filepath = os.path.abspath(env_filepath)
 
+            if start_dt < datetime.now():
+                logging.warning("Start datetime is in the past.")
+                wx.MessageBox("Start date and time should be after the current date and time!", "Error", wx.ICON_ERROR)
+                return
+
             if end_dt <= start_dt:
                 logging.warning("Start datetime is not earlier than end datetime.")
-                wx.MessageBox("Start datetime should be earlier than end datetime", "Error", wx.ICON_ERROR)
+                wx.MessageBox("Start datetime should be earlier than end datetime!", "Error", wx.ICON_ERROR)
                 return
 
             if not os.path.isfile(data_filepath):

src/utils.py

@@ -17,7 +17,7 @@
 from pathlib import Path
 from enum import Enum
 from dotenv import load_dotenv, set_key, unset_key
-from datetime import datetime
+from datetime import datetime, timedelta
 import pandas as pd
 import shutil
 import locale
@@ -180,7 +180,7 @@ def read_parquet_file(filename):
 
 def read_file(filename, base_dir=None):
     filepath = os.path.join(base_dir, filename) if base_dir else filename
-    
+
     if filename.endswith('.json'):
         return read_json_file(filepath)
     elif filename.endswith('.csv'):
@@ -247,6 +247,16 @@ def is_unix() -> bool:
 def is_windows() -> bool:
     return platform.system() == "Windows"
 
+def date_windows_locale_str(dt: datetime) -> str:
+    if locale.getlocale(locale.LC_TIME) == (None, None):
+        locale.setlocale(locale.LC_TIME, "")
+    return dt.strftime("%x")
+
+def time_windows_locale_str(dt: datetime) -> str:
+    if locale.getlocale(locale.LC_TIME) == (None, None):
+        locale.setlocale(locale.LC_TIME, "")
+    return dt.strftime("%X")
+
 def schedule_on_unix(script_path, args, interval_minutes, prefix=SCHEDULE_PREFIX):
     job_name = f"{prefix}_{datetime.now().strftime('%Y%m%d-%H%M')}"
     cron_expr = f"*/{interval_minutes} * * * *"
@@ -260,19 +270,29 @@ def schedule_on_unix(script_path, args, interval_minutes, prefix=SCHEDULE_PREFIX
     print(f"Cron job scheduled every {interval_minutes} minutes on Unix.")
 
 def schedule_on_windows(script_path, args, start_dt, end_dt, interval_minutes, prefix=SCHEDULE_PREFIX):
-    locale.setlocale(locale.LC_TIME, '')
-
     if shutil.which("schtasks") is None:
         raise RuntimeError("Windows Task Scheduler (schtasks) not found.")
 
     if interval_minutes < 1 or interval_minutes > 1439:
         raise ValueError("Interval must be between 1 and 1439 minutes on Windows.")
 
+    # Workaround on schtasks.exe to satisfy:
+    # (end_time - start_time) > interval
+    # only when end_time > start_time
+    start_time = datetime(start_dt.year, start_dt.month, start_dt.day, start_dt.hour, start_dt.minute)
+    end_time = datetime(start_dt.year, start_dt.month, start_dt.day, end_dt.hour, end_dt.minute)
+
+    if end_time >= start_time:
+        diff = end_time - start_time
+        if diff <= timedelta(minutes=interval_minutes):
+            compensation = (timedelta(minutes=interval_minutes + 1) - diff)
+            end_time = end_time + compensation
+
     task_name = f"{prefix}_{datetime.now().strftime('%Y%m%d-%H%M')}"
-    start_time = start_dt.strftime("%X")
-    start_date = start_dt.strftime("%x")
-    end_time = end_dt.strftime("%X")
-    end_date = end_dt.strftime("%x")
+    start_date_str = date_windows_locale_str(start_dt)
+    start_time_str = time_windows_locale_str(start_time)
+    end_date_str = date_windows_locale_str(end_dt)
+    end_time_str = time_windows_locale_str(end_time)
 
     quoted_args = ' '.join(args)
     full_cmd = f'{script_path} {quoted_args}'
@@ -285,10 +305,10 @@ def schedule_on_windows(script_path, args, start_dt, end_dt, interval_minutes, p
         "/TR", full_cmd,
         "/SC", "MINUTE",
         "/MO", str(interval_minutes),
-        "/ST", start_time,
-        "/SD", start_date,
-        "/ED", end_date,
-        "/ET", end_time,
+        "/ST", start_time_str,
+        "/SD", start_date_str,
+        "/ED", end_date_str,
+        "/ET", end_time_str,
         "/F",
         "/RL", "LIMITED"
     ]
@@ -299,7 +319,7 @@ def schedule_on_windows(script_path, args, start_dt, end_dt, interval_minutes, p
     except subprocess.CalledProcessError as e:
         print("Failed to schedule task:", e)
         raise Exception("Failed to schedule task")
-    
+
 def remove_cron_jobs_with_prefix(prefix=SCHEDULE_PREFIX):
     result = subprocess.run("crontab -l", shell=True, capture_output=True, text=True)
     if result.returncode != 0: