netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2024-09-20 14:56:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate variable names in task creation

Browse source
This commit is contained in:
deajan 2024-09-01 19:31:37 +02:00
parent adcf54a366
commit b4cadddd7f
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
npbackup/gui/config.py
View file

@ -1924,15 +1924,15 @@ Google Cloud storage: GOOGLE_PROJECT_ID GOOGLE_APPLICATION_CREDENTIALS\n\
sg.Text( sg.Text(
_t("config_gui.create_backup_scheduled_task_every"), size=(40, 1) _t("config_gui.create_backup_scheduled_task_every"), size=(40, 1)
), ),
sg.Input(key="scheduled_task_interval", size=(4, 1)), sg.Input(key="scheduled_backup_task_interval", size=(4, 1)),
sg.Text(_t("generic.minutes"), size=(10, 1)), sg.Text(_t("generic.minutes"), size=(10, 1)),
sg.Button(_t("generic.create"), key="create_backup_interval_task"), sg.Button(_t("generic.create"), key="create_backup_interval_task"),
], ],
[ [
sg.Text(_t("config_gui.create_backup_scheduled_task_at"), size=(40, 1)), sg.Text(_t("config_gui.create_backup_scheduled_task_at"), size=(40, 1)),
sg.Input(key="scheduled_task_hour", size=(4, 1)), sg.Input(key="scheduled_backup_task_hour", size=(4, 1)),
sg.Text(_t("generic.hours"), size=(10, 1)), sg.Text(_t("generic.hours"), size=(10, 1)),
sg.Input(key="scheduled_task_minute", size=(4, 1)), sg.Input(key="scheduled_backup_task_minute", size=(4, 1)),
sg.Text(_t("generic.minutes"), size=(10, 1)), sg.Text(_t("generic.minutes"), size=(10, 1)),
sg.Button(_t("generic.create"), key="create_backup_daily_task"), sg.Button(_t("generic.create"), key="create_backup_daily_task"),
], ],
@ -1943,9 +1943,9 @@ Google Cloud storage: GOOGLE_PROJECT_ID GOOGLE_APPLICATION_CREDENTIALS\n\
sg.Text( sg.Text(
_t("config_gui.create_housekeeping_scheduled_task_at"), size=(40, 1) _t("config_gui.create_housekeeping_scheduled_task_at"), size=(40, 1)
), ),
sg.Input(key="scheduled_task_hour", size=(4, 1)), sg.Input(key="scheduled_housekeeping_task_hour", size=(4, 1)),
sg.Text(_t("generic.hours"), size=(10, 1)), sg.Text(_t("generic.hours"), size=(10, 1)),
sg.Input(key="scheduled_task_minute", size=(4, 1)), sg.Input(key="scheduled_housekeeping_task_minute", size=(4, 1)),
sg.Text(_t("generic.minutes"), size=(10, 1)), sg.Text(_t("generic.minutes"), size=(10, 1)),
sg.Button(_t("generic.create"), key="create_housekeeping_daily_task"), sg.Button(_t("generic.create"), key="create_housekeeping_daily_task"),
], ],
@ -2278,18 +2278,21 @@ Google Cloud storage: GOOGLE_PROJECT_ID GOOGLE_APPLICATION_CREDENTIALS\n\
try: try:
if event == "create_housekeeping_daily_task": if event == "create_housekeeping_daily_task":
type = "housekeeping" type = "housekeeping"
hour = values["scheduled_housekeeping_task_hour"]
minute = values["scheduled_housekeeping_task_minute"]
else: else:
type = "backup" type = "backup"
if event == "create_backup_interval_task": if event == "create_backup_interval_task":
interval = values["scheduled_task_interval"] interval = values["scheduled_backup_task_interval"]
else: else:
interval = None hour = values["scheduled_backup_task_hour"]
minute = values["scheduled_backup_task_minute"]
result = create_scheduled_task( result = create_scheduled_task(
config_file=config_file, config_file=config_file,
type=type, type=type,
interval_minutes=interval, interval_minutes=interval,
hour=values["scheduled_task_hour"], hour=hour,
minute=values["scheduled_task_minute"], minute=minute,
) )
if result: if result:
sg.Popup(_t("config_gui.scheduled_task_creation_success"), keep_on_top=True) sg.Popup(_t("config_gui.scheduled_task_creation_success"), keep_on_top=True)