frontengine 1.0.71__tar.gz → 1.0.72__tar.gz

{frontengine-1.0.71 → frontengine-1.0.72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.71
+Version: 1.0.72
 Summary: FrontEngine is use-define frontview or only use like screen saver
 Author-email: JE-Chen <jechenmailman@gmail.com>
 Project-URL: Homepage, https://github.com/Intergration-Automation-Testing/FrontEngine

frontengine-1.0.72/frontengine/ui/dialog/preset_schedule_dialog.py

@@ -0,0 +1,150 @@
+"""
+預設集排程設定：星期幾、幾點幾分，套用哪一個預設集。
+
+這個排程本來就在跑，卻沒有任何介面——只能手動改 `user_setting.json`，連時間都
+不能在畫面上設。所以這裡不只是加上星期，是讓這個功能第一次真的到得了。
+
+Preset schedule settings: which days, what time, which preset.
+
+The schedule was already running with no interface at all - it could only be
+configured by hand-editing `user_setting.json`, down to the time of day. So this
+is not only about adding days: it is what makes the feature reachable at all.
+"""
+from __future__ import annotations
+
+from typing import Any, Dict, List, Optional
+
+from PySide6.QtWidgets import (
+    QCheckBox, QComboBox, QDialog, QDialogButtonBox, QGridLayout, QLabel, QSpinBox, QWidget,
+)
+
+from frontengine.user_setting.preset_repository import PresetRepository
+from frontengine.user_setting.user_setting_file import user_setting_dict, write_user_setting
+from frontengine.utils.logging.loggin_instance import front_engine_logger
+from frontengine.utils.multi_language.language_wrapper import language_wrapper
+from frontengine.utils.multi_language.retranslate import tr
+from frontengine.utils.preset_schedule.preset_schedule_service import (
+    DEFAULT_PRESET_SCHEDULE, normalize_days,
+)
+
+SETTING_KEY = "preset_schedule"
+
+# 0 = 週一，和 datetime.weekday() 一致
+# 0 = Monday, matching datetime.weekday()
+DAY_KEYS = (
+    ("weekday_monday", "Mon"),
+    ("weekday_tuesday", "Tue"),
+    ("weekday_wednesday", "Wed"),
+    ("weekday_thursday", "Thu"),
+    ("weekday_friday", "Fri"),
+    ("weekday_saturday", "Sat"),
+    ("weekday_sunday", "Sun"),
+)
+
+
+def _t(key: str, fallback: str) -> str:
+    return language_wrapper.language_word_dict.get(key, fallback)
+
+
+def current_settings() -> Dict[str, Any]:
+    """目前的排程設定（缺項目補預設值）。"""
+    stored = user_setting_dict.get(SETTING_KEY)
+    settings = dict(DEFAULT_PRESET_SCHEDULE)
+    if isinstance(stored, dict):
+        settings.update({key: stored[key] for key in DEFAULT_PRESET_SCHEDULE if key in stored})
+    settings["days"] = normalize_days(settings.get("days"))
+    settings["enabled"] = bool(settings.get("enabled"))
+    return settings
+
+
+class PresetScheduleDialog(QDialog):
+    """設定哪幾天、幾點，自動套用哪一個預設集。"""
+
+    def __init__(self, parent: Optional[QWidget] = None, repository=None) -> None:
+        front_engine_logger.info("[PresetScheduleDialog] Init")
+        super().__init__(parent)
+        self.setWindowTitle(_t("preset_schedule_title", "Scheduled preset"))
+        settings = current_settings()
+        self._repository = repository or PresetRepository()
+
+        self.enable_checkbox = tr(QCheckBox(), "preset_schedule_enable", "Apply a preset on a schedule")
+        self.enable_checkbox.setChecked(settings["enabled"])
+
+        self.preset_label = tr(QLabel(), "preset_schedule_preset", "Preset")
+        self.preset_combobox = QComboBox()
+        # 只列真的存在的預設集：讓人自己打名字的話，打錯了要等到排程觸發的那一刻
+        # 才會發現什麼都沒發生。
+        # Only presets that exist are listed: with a free-text name, a typo is
+        # discovered when the schedule fires and nothing happens.
+        for name in self._preset_names():
+            self.preset_combobox.addItem(name, name)
+        index = self.preset_combobox.findData(settings.get("preset"))
+        if index >= 0:
+            self.preset_combobox.setCurrentIndex(index)
+
+        self.time_label = tr(QLabel(), "preset_schedule_time", "At")
+        self.hour_spinbox = QSpinBox()
+        self.hour_spinbox.setRange(0, 23)
+        self.hour_spinbox.setValue(int(settings.get("hour", 9)) % 24)
+        self.minute_spinbox = QSpinBox()
+        self.minute_spinbox.setRange(0, 59)
+        self.minute_spinbox.setValue(int(settings.get("minute", 0)) % 60)
+
+        self.days_label = tr(QLabel(), "preset_schedule_days", "On")
+        self.day_checkboxes: List[QCheckBox] = []
+        days_holder = QWidget()
+        days_layout = QGridLayout(days_holder)
+        days_layout.setContentsMargins(0, 0, 0, 0)
+        for index, (key, fallback) in enumerate(DAY_KEYS):
+            checkbox = tr(QCheckBox(), key, fallback)
+            checkbox.setChecked(index in settings["days"])
+            days_layout.addWidget(checkbox, index // 4, index % 4)
+            self.day_checkboxes.append(checkbox)
+
+        self.hint_label = tr(
+            QLabel(), "preset_schedule_hint",
+            "With no day ticked it runs every day. It fires once as the time passes, "
+            "so starting FrontEngine after that time will not apply it late.")
+        self.hint_label.setWordWrap(True)
+
+        buttons = QDialogButtonBox(
+            QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel)
+        buttons.accepted.connect(self.accept)
+        buttons.rejected.connect(self.reject)
+
+        layout = QGridLayout(self)
+        layout.addWidget(self.enable_checkbox, 0, 0, 1, 3)
+        layout.addWidget(self.preset_label, 1, 0)
+        layout.addWidget(self.preset_combobox, 1, 1, 1, 2)
+        layout.addWidget(self.time_label, 2, 0)
+        layout.addWidget(self.hour_spinbox, 2, 1)
+        layout.addWidget(self.minute_spinbox, 2, 2)
+        layout.addWidget(self.days_label, 3, 0)
+        layout.addWidget(days_holder, 3, 1, 1, 2)
+        layout.addWidget(self.hint_label, 4, 0, 1, 3)
+        layout.addWidget(buttons, 5, 0, 1, 3)
+
+    def _preset_names(self) -> List[str]:
+        try:
+            return [name for name in self._repository.list_presets()
+                    if not name.startswith("__")]
+        except OSError as error:  # pragma: no cover - filesystem boundary
+            front_engine_logger.warning(f"[PresetScheduleDialog] list failed: {error!r}")
+            return []
+
+    def collect(self) -> Dict[str, Any]:
+        """把畫面上的選擇讀成設定。"""
+        return {
+            "enabled": self.enable_checkbox.isChecked(),
+            "preset": self.preset_combobox.currentData() or "",
+            "hour": self.hour_spinbox.value(),
+            "minute": self.minute_spinbox.value(),
+            "days": [index for index, box in enumerate(self.day_checkboxes) if box.isChecked()],
+        }
+
+    def accept(self) -> None:
+        user_setting_dict[SETTING_KEY] = self.collect()
+        write_user_setting()
+        front_engine_logger.info(
+            f"[PresetScheduleDialog] saved | {user_setting_dict[SETTING_KEY]}")
+        super().accept()

{frontengine-1.0.71 → frontengine-1.0.72}/frontengine/ui/menu/settings_menu.py

@@ -12,6 +12,7 @@ from frontengine.ui.dialog.hotkey_settings_dialog import HotkeySettingsDialog
 from frontengine.ui.dialog.reminder_dialog import ReminderDialog
 from frontengine.ui.dialog.remote_control_dialog import RemoteControlDialog
 from frontengine.ui.dialog.screen_privacy_dialog import ScreenPrivacyDialog
+from frontengine.ui.dialog.preset_schedule_dialog import PresetScheduleDialog
 from frontengine.ui.dialog.screensaver_dialog import ScreensaverDialog
 from frontengine.utils.keep_awake.keep_awake import available as keep_awake_available
 from frontengine.ui.dialog.signage_dialog import SignageDialog
@@ -124,6 +125,14 @@ def build_settings_menu(ui: "FrontEngineMainUI") -> None:
     menu.addAction(screensaver_action)
     ui.screensaver_action = screensaver_action
 
+    preset_schedule_action = QAction(
+        _t("settings_menu_preset_schedule", "Scheduled preset..."), menu)
+    retranslator.bind(preset_schedule_action, "settings_menu_preset_schedule",
+                      "Scheduled preset...")
+    preset_schedule_action.triggered.connect(lambda: PresetScheduleDialog(ui).exec())
+    menu.addAction(preset_schedule_action)
+    ui.preset_schedule_action = preset_schedule_action
+
     signage_action = QAction(_t("settings_menu_signage", "Signage mode..."), menu)
     retranslator.bind(signage_action, "settings_menu_signage", "Signage mode...")
     signage_action.triggered.connect(lambda: _open_signage_dialog(ui))

{frontengine-1.0.71 → frontengine-1.0.72}/frontengine/utils/multi_language/english.py

@@ -266,6 +266,20 @@ english_word_dict = {
     # Target monitor / control center
     "target_monitor_label": "Target monitor",
     "target_monitor_ask": "Ask",
+    "settings_menu_preset_schedule": "Scheduled preset...",
+    "preset_schedule_title": "Scheduled preset",
+    "preset_schedule_enable": "Apply a preset on a schedule",
+    "preset_schedule_preset": "Preset",
+    "preset_schedule_time": "At",
+    "preset_schedule_days": "On",
+    "preset_schedule_hint": "With no day ticked it runs every day. It fires once as the time passes, so starting FrontEngine after that time will not apply it late.",
+    "weekday_monday": "Mon",
+    "weekday_tuesday": "Tue",
+    "weekday_wednesday": "Wed",
+    "weekday_thursday": "Thu",
+    "weekday_friday": "Fri",
+    "weekday_saturday": "Sat",
+    "weekday_sunday": "Sun",
     "control_center_hide_all": "Hide all",
     "control_center_show_all": "Show all",
     "control_center_lock_all": "Lock overlays",

{frontengine-1.0.71 → frontengine-1.0.72}/frontengine/utils/multi_language/france.py

@@ -265,6 +265,20 @@ french_word_dict = {
     "preset_no_presets": "Aucun préréglage enregistré pour l'instant.",
     "target_monitor_label": "Écran cible",
     "target_monitor_ask": "Demander",
+    "settings_menu_preset_schedule": "Préréglage programmé...",
+    "preset_schedule_title": "Préréglage programmé",
+    "preset_schedule_enable": "Appliquer un préréglage selon un horaire",
+    "preset_schedule_preset": "Préréglage",
+    "preset_schedule_time": "À",
+    "preset_schedule_days": "Le",
+    "preset_schedule_hint": "Sans jour coché, cela s'applique tous les jours. Le déclenchement a lieu au passage de l'heure : démarrer FrontEngine après ne le rattrape pas.",
+    "weekday_monday": "Lun",
+    "weekday_tuesday": "Mar",
+    "weekday_wednesday": "Mer",
+    "weekday_thursday": "Jeu",
+    "weekday_friday": "Ven",
+    "weekday_saturday": "Sam",
+    "weekday_sunday": "Dim",
     "control_center_hide_all": "Tout masquer",
     "control_center_show_all": "Tout afficher",
     "control_center_lock_all": "Verrouiller les calques",

{frontengine-1.0.71 → frontengine-1.0.72}/frontengine/utils/multi_language/germany.py

@@ -265,6 +265,20 @@ germany_word_dict = {
     "preset_no_presets": "Noch keine Voreinstellungen gespeichert.",
     "target_monitor_label": "Zielbildschirm",
     "target_monitor_ask": "Nachfragen",
+    "settings_menu_preset_schedule": "Geplante Voreinstellung...",
+    "preset_schedule_title": "Geplante Voreinstellung",
+    "preset_schedule_enable": "Voreinstellung nach Zeitplan anwenden",
+    "preset_schedule_preset": "Voreinstellung",
+    "preset_schedule_time": "Um",
+    "preset_schedule_days": "An",
+    "preset_schedule_hint": "Ohne angehakten Tag läuft es täglich. Es löst beim Überschreiten der Uhrzeit einmal aus; ein späterer Start holt es nicht nach.",
+    "weekday_monday": "Mo",
+    "weekday_tuesday": "Di",
+    "weekday_wednesday": "Mi",
+    "weekday_thursday": "Do",
+    "weekday_friday": "Fr",
+    "weekday_saturday": "Sa",
+    "weekday_sunday": "So",
     "control_center_hide_all": "Alle ausblenden",
     "control_center_show_all": "Alle anzeigen",
     "control_center_lock_all": "Overlays sperren",

{frontengine-1.0.71 → frontengine-1.0.72}/frontengine/utils/multi_language/italy.py

@@ -265,6 +265,20 @@ italian_word_dict = {
     "preset_no_presets": "Nessuna preimpostazione salvata finora.",
     "target_monitor_label": "Schermo di destinazione",
     "target_monitor_ask": "Chiedi",
+    "settings_menu_preset_schedule": "Preimpostazione pianificata...",
+    "preset_schedule_title": "Preimpostazione pianificata",
+    "preset_schedule_enable": "Applica una preimpostazione a orario",
+    "preset_schedule_preset": "Preimpostazione",
+    "preset_schedule_time": "Alle",
+    "preset_schedule_days": "Nei giorni",
+    "preset_schedule_hint": "Senza giorni selezionati vale tutti i giorni. Scatta nel momento in cui l'ora viene superata: avviare FrontEngine dopo non la recupera.",
+    "weekday_monday": "Lun",
+    "weekday_tuesday": "Mar",
+    "weekday_wednesday": "Mer",
+    "weekday_thursday": "Gio",
+    "weekday_friday": "Ven",
+    "weekday_saturday": "Sab",
+    "weekday_sunday": "Dom",
     "control_center_hide_all": "Nascondi tutto",
     "control_center_show_all": "Mostra tutto",
     "control_center_lock_all": "Blocca gli overlay",

{frontengine-1.0.71 → frontengine-1.0.72}/frontengine/utils/multi_language/russian.py

@@ -265,6 +265,20 @@ russian_word_dict = {
     "preset_no_presets": "Пресеты пока не сохранены.",
     "target_monitor_label": "Целевой экран",
     "target_monitor_ask": "Спрашивать",
+    "settings_menu_preset_schedule": "Пресет по расписанию...",
+    "preset_schedule_title": "Пресет по расписанию",
+    "preset_schedule_enable": "Применять пресет по расписанию",
+    "preset_schedule_preset": "Пресет",
+    "preset_schedule_time": "В",
+    "preset_schedule_days": "По дням",
+    "preset_schedule_hint": "Если ни один день не отмечен, срабатывает каждый день. Срабатывает в момент наступления времени: запуск FrontEngine позже не применит его задним числом.",
+    "weekday_monday": "Пн",
+    "weekday_tuesday": "Вт",
+    "weekday_wednesday": "Ср",
+    "weekday_thursday": "Чт",
+    "weekday_friday": "Пт",
+    "weekday_saturday": "Сб",
+    "weekday_sunday": "Вс",
     "control_center_hide_all": "Скрыть всё",
     "control_center_show_all": "Показать всё",
     "control_center_lock_all": "Заблокировать слои",

{frontengine-1.0.71 → frontengine-1.0.72}/frontengine/utils/multi_language/simplified_chinese.py

@@ -265,6 +265,20 @@ simplified_chinese_word_dict = {
     "preset_no_presets": "还没有储存任何预设。",
     "target_monitor_label": "目标萤幕",
     "target_monitor_ask": "每次询问",
+    "settings_menu_preset_schedule": "排程预设⋯",
+    "preset_schedule_title": "排程预设",
+    "preset_schedule_enable": "按计划自动套用预设",
+    "preset_schedule_preset": "预设",
+    "preset_schedule_time": "时间",
+    "preset_schedule_days": "星期",
+    "preset_schedule_hint": "没有勾任何一天就是每天都跑。它是在时间点跨过去的那一刻触发一次，所以在那之后才打开 FrontEngine 不会补套用。",
+    "weekday_monday": "一",
+    "weekday_tuesday": "二",
+    "weekday_wednesday": "三",
+    "weekday_thursday": "四",
+    "weekday_friday": "五",
+    "weekday_saturday": "六",
+    "weekday_sunday": "日",
     "control_center_hide_all": "全部隐藏",
     "control_center_show_all": "全部显示",
     "control_center_lock_all": "锁定覆盖层",

{frontengine-1.0.71 → frontengine-1.0.72}/frontengine/utils/multi_language/traditional_chinese.py

@@ -266,6 +266,20 @@ traditional_chinese_word_dict = {
     # Target monitor / control center
     "target_monitor_label": "目標螢幕",
     "target_monitor_ask": "詢問",
+    "settings_menu_preset_schedule": "排程預設集⋯",
+    "preset_schedule_title": "排程預設集",
+    "preset_schedule_enable": "依排程自動套用預設集",
+    "preset_schedule_preset": "預設集",
+    "preset_schedule_time": "時間",
+    "preset_schedule_days": "星期",
+    "preset_schedule_hint": "沒有勾任何一天就是每天都跑。它是在時間點跨過去的那一刻觸發一次，所以在那之後才開啟 FrontEngine 不會補套用。",
+    "weekday_monday": "一",
+    "weekday_tuesday": "二",
+    "weekday_wednesday": "三",
+    "weekday_thursday": "四",
+    "weekday_friday": "五",
+    "weekday_saturday": "六",
+    "weekday_sunday": "日",
     "control_center_hide_all": "全部隱藏",
     "control_center_show_all": "全部顯示",
     "control_center_lock_all": "鎖定覆蓋層",

{frontengine-1.0.71 → frontengine-1.0.72}/frontengine/utils/preset_schedule/preset_schedule_service.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Any, Callable, Dict, Optional
+from typing import Any, Callable, Dict, List, Optional
 
 from PySide6.QtCore import QObject, QTimer, Signal
 
@@ -9,14 +9,53 @@ from frontengine.utils.logging.loggin_instance import front_engine_logger
 
 # 預設的排程設定（預設停用）
 # Default preset-schedule config (disabled by default).
+# 星期用 0=週一 … 6=週日（和 datetime.weekday() 一致，省得多一層換算）。
+# 空清單代表「每天」——沒有勾任何一天卻期待它每天觸發，比什麼都不做合理；
+# 真的不想要就把整個排程關掉。
+# Days are 0=Monday … 6=Sunday, matching datetime.weekday() so nothing has to be
+# converted. An empty list means every day: someone who ticked no days but left
+# the schedule on meant "every day" far more likely than "never" - and "never"
+# is what switching the schedule off is for.
+ALL_DAYS = (0, 1, 2, 3, 4, 5, 6)
+
 DEFAULT_PRESET_SCHEDULE: Dict[str, Any] = {
     "enabled": False,
     "preset": "",
     "hour": 9,
     "minute": 0,
+    "days": [],
 }
 
 
+def normalize_days(value: Any) -> List[int]:
+    """
+    把設定裡的星期整理成排序過、不重複、0..6 的清單。手動編過的設定檔可能塞進
+    字串、負數或 99，這裡一律丟掉而不是讓排程在半夜炸掉。
+    Tidy the configured days into a sorted, unique 0..6 list. A hand-edited
+    settings file may hold strings, negatives or 99; those are dropped rather
+    than left to break the schedule in the middle of the night.
+    """
+    if value is None:
+        return []
+    if isinstance(value, (str, bytes)) or not isinstance(value, (list, tuple, set)):
+        return []
+    days = set()
+    for item in value:
+        try:
+            day = int(item)
+        except (TypeError, ValueError):
+            continue
+        if 0 <= day <= 6:
+            days.add(day)
+    return sorted(days)
+
+
+def runs_today(config: Any, weekday: int) -> bool:
+    """今天是不是該跑。沒有指定星期就是每天都跑。"""
+    days = normalize_days((config or {}).get("days") if isinstance(config, dict) else None)
+    return not days or weekday in days
+
+
 def _coerce_int(value: Any, default: int, modulo: int) -> int:
     try:
         return int(value) % modulo
@@ -86,6 +125,14 @@ class PresetScheduleService(QObject):
             now = self._now_provider()
             target = _coerce_int(config.get("hour"), 9, 24) * 60 + _coerce_int(config.get("minute"), 0, 60)
             current = now.hour * 60 + now.minute
+            # 不該跑的日子仍要記下目前時間，否則隔天第一次輪詢會把「上次」當成
+            # 未知而錯過當天的觸發點。
+            # Days that do not run still record the current minute: otherwise the
+            # first poll of the next day has no previous value and misses the
+            # crossing entirely.
+            if not runs_today(config, now.weekday()):
+                self._prev_minutes = current
+                return
         except Exception as error:  # pragma: no cover - defensive boundary
             front_engine_logger.warning(f"[PresetSchedule] poll error: {error!r}")
             return

{frontengine-1.0.71 → frontengine-1.0.72}/frontengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.71
+Version: 1.0.72
 Summary: FrontEngine is use-define frontview or only use like screen saver
 Author-email: JE-Chen <jechenmailman@gmail.com>
 Project-URL: Homepage, https://github.com/Intergration-Automation-Testing/FrontEngine

{frontengine-1.0.71 → frontengine-1.0.72}/frontengine.egg-info/SOURCES.txt

@@ -80,6 +80,7 @@ frontengine/ui/dialog/choose_file_dialog.py
 frontengine/ui/dialog/clipboard_dialog.py
 frontengine/ui/dialog/hotkey_settings_dialog.py
 frontengine/ui/dialog/how_to_use_dialog.py
+frontengine/ui/dialog/preset_schedule_dialog.py
 frontengine/ui/dialog/reminder_dialog.py
 frontengine/ui/dialog/remote_control_dialog.py
 frontengine/ui/dialog/screen_privacy_dialog.py

{frontengine-1.0.71 → frontengine-1.0.72}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "frontengine"
-version = "1.0.71"
+version = "1.0.72"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]