From d9fdad4b040f4bae2826509ed4a255662cb340fb Mon Sep 17 00:00:00 2001 From: zefie Date: Thu, 12 Aug 2021 17:43:46 -0400 Subject: [PATCH] change execute to execute_end - add execute_start support - can use both --- .../wtv-disk/content/diskmaps/ModemFirmware.json | 3 +-- zefie_wtvp_minisrv/ServiceVault/wtv-disk/sync.js | 12 ++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-disk/content/diskmaps/ModemFirmware.json b/zefie_wtvp_minisrv/ServiceVault/wtv-disk/content/diskmaps/ModemFirmware.json index 93aebcff..ae0ed8cc 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-disk/content/diskmaps/ModemFirmware.json +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-disk/content/diskmaps/ModemFirmware.json @@ -2,8 +2,7 @@ "ModemFirmware": { "base": "file://Disk/Browser/Modem_Firmware/", "location": "content/Modem_Firmware/", - "execute": "client:ModemReload", - "execute_when": "atEnd", + "execute_end": "client:ModemReload", "service_owned": true, "files": [ { diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-disk/sync.js b/zefie_wtvp_minisrv/ServiceVault/wtv-disk/sync.js index 3fb1c8f5..da8f0d4e 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-disk/sync.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-disk/sync.js @@ -17,10 +17,8 @@ if (request_headers['wtv-request-type'] == 'download') { }); // create WebTV Download List - if (diskmap_group_data.execute && diskmap_group_data.execute_when) { - if (diskmap_group_data.execute_when.toLowerCase().match(/start/)) { - wtvdl.execute(diskmap_group_data.execute); - } + if (diskmap_group_data.execute_start) { + wtvdl.execute(diskmap_group_data.execute_start); } console.log(diskmap_group_data.client_group_data); @@ -101,10 +99,8 @@ if (request_headers['wtv-request-type'] == 'download') { } - if (diskmap_group_data.execute && diskmap_group_data.execute_when) { - if (diskmap_group_data.execute_when.toLowerCase().match(/end/)) { - wtvdl.execute(diskmap_group_data.execute); - } + if (diskmap_group_data.execute_end) { + wtvdl.execute(diskmap_group_data.execute_end); } if (files_to_send > 0) {