From 2491f62b89ba9a284b6610e7fa1d6179632968ba Mon Sep 17 00:00:00 2001 From: zefie Date: Sun, 9 Oct 2022 10:03:11 -0400 Subject: [PATCH] restructure ServiceDeps --- .../FIJI/dc_production_normal.tok | Bin .../tellyscripts}/LC2/LC2_OpenISP_56k.tok | Bin .../LC2/LC2_WTV_18006138199.detok.txt | 0 .../tellyscripts}/LC2/LC2_WTV_18006138199.tok | Bin .../tellyscripts}/UTV/utv_hsd.tok | Bin .../tellyscripts}/UTV/utv_normal.tok | Bin .../tellyscripts}/bf0app/bf0app_OISP.tok | Bin .../bf0app/bf0app_WTV_18006138199.detok.txt | 0 .../bf0app/bf0app_WTV_18006138199.tok | Bin .../ServiceVault/wtv-1800/noflash.js | 2 +- .../ServiceVault/wtv-1800/preregister.js | 24 +++++++++--------- 11 files changed, 13 insertions(+), 13 deletions(-) rename zefie_wtvp_minisrv/ServiceDeps/{premade_tellyscripts => wtv-1800/tellyscripts}/FIJI/dc_production_normal.tok (100%) rename zefie_wtvp_minisrv/ServiceDeps/{premade_tellyscripts => wtv-1800/tellyscripts}/LC2/LC2_OpenISP_56k.tok (100%) rename zefie_wtvp_minisrv/ServiceDeps/{premade_tellyscripts => wtv-1800/tellyscripts}/LC2/LC2_WTV_18006138199.detok.txt (100%) rename zefie_wtvp_minisrv/ServiceDeps/{premade_tellyscripts => wtv-1800/tellyscripts}/LC2/LC2_WTV_18006138199.tok (100%) rename zefie_wtvp_minisrv/ServiceDeps/{premade_tellyscripts => wtv-1800/tellyscripts}/UTV/utv_hsd.tok (100%) rename zefie_wtvp_minisrv/ServiceDeps/{premade_tellyscripts => wtv-1800/tellyscripts}/UTV/utv_normal.tok (100%) rename zefie_wtvp_minisrv/ServiceDeps/{premade_tellyscripts => wtv-1800/tellyscripts}/bf0app/bf0app_OISP.tok (100%) rename zefie_wtvp_minisrv/ServiceDeps/{premade_tellyscripts => wtv-1800/tellyscripts}/bf0app/bf0app_WTV_18006138199.detok.txt (100%) rename zefie_wtvp_minisrv/ServiceDeps/{premade_tellyscripts => wtv-1800/tellyscripts}/bf0app/bf0app_WTV_18006138199.tok (100%) diff --git a/zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/FIJI/dc_production_normal.tok b/zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/FIJI/dc_production_normal.tok similarity index 100% rename from zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/FIJI/dc_production_normal.tok rename to zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/FIJI/dc_production_normal.tok diff --git a/zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/LC2/LC2_OpenISP_56k.tok b/zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok similarity index 100% rename from zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/LC2/LC2_OpenISP_56k.tok rename to zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok diff --git a/zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/LC2/LC2_WTV_18006138199.detok.txt b/zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.detok.txt similarity index 100% rename from zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/LC2/LC2_WTV_18006138199.detok.txt rename to zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.detok.txt diff --git a/zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/LC2/LC2_WTV_18006138199.tok b/zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok similarity index 100% rename from zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/LC2/LC2_WTV_18006138199.tok rename to zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok diff --git a/zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/UTV/utv_hsd.tok b/zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/UTV/utv_hsd.tok similarity index 100% rename from zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/UTV/utv_hsd.tok rename to zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/UTV/utv_hsd.tok diff --git a/zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/UTV/utv_normal.tok b/zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/UTV/utv_normal.tok similarity index 100% rename from zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/UTV/utv_normal.tok rename to zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/UTV/utv_normal.tok diff --git a/zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/bf0app/bf0app_OISP.tok b/zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_OISP.tok similarity index 100% rename from zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/bf0app/bf0app_OISP.tok rename to zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_OISP.tok diff --git a/zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/bf0app/bf0app_WTV_18006138199.detok.txt b/zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.detok.txt similarity index 100% rename from zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/bf0app/bf0app_WTV_18006138199.detok.txt rename to zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.detok.txt diff --git a/zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/bf0app/bf0app_WTV_18006138199.tok b/zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.tok similarity index 100% rename from zefie_wtvp_minisrv/ServiceDeps/premade_tellyscripts/bf0app/bf0app_WTV_18006138199.tok rename to zefie_wtvp_minisrv/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.tok diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/noflash.js b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/noflash.js index 91fbcea0..a8f85da5 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/noflash.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/noflash.js @@ -29,7 +29,7 @@ wtv-client-time-zone: GMT -0000 wtv-client-time-dst-rule: GMT wtv-client-date: `+ strftime("%a, %d %b %Y %H:%M:%S", new Date(new Date().toUTCString())) + ` GMT`; - var file_path = __dirname + "/ServiceDeps/premade_tellyscripts/bf0app/bf0app_WTV_18006138199.tok"; + var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.tok"; if (file_path) { request_is_async = true; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js index 45ed55c0..eedffaa9 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js @@ -77,22 +77,22 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { case "US-WEBSTAR-disk-0MB-16MB-softmodem-CPU5230": prereg_contype = "text/tellyscript"; // if wtv-open-access: true then client expects OpenISP - if (ssid_sessions[socket.ssid].get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/premade_tellyscripts/LC2/LC2_OpenISP_56k.tok"; - else var file_path = __dirname + "/ServiceDeps/premade_tellyscripts/LC2/LC2_WTV_18006138199.tok"; + if (ssid_sessions[socket.ssid].get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok"; + else var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok"; break; case "US-DTV-disk-0MB-32MB-softmodem-CPU5230": if (wtvshared.isMiniBrowser(ssid_sessions[socket.ssid])) { prereg_contype = "text/tellyscript"; - if (ssid_sessions[socket.ssid].get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/premade_tellyscripts/LC2/LC2_OpenISP_56k.tok"; - else file_path = __dirname + "/ServiceDeps/premade_tellyscripts/LC2/LC2_WTV_18006138199.tok"; + if (ssid_sessions[socket.ssid].get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok"; + else file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok"; } else { prereg_contype = "text/dialscript"; if (ssid_sessions[socket.ssid].get("wtv-lan") == "true") { - file_path = __dirname + "/ServiceDeps/premade_tellyscripts/UTV/utv_hsd.tok"; + file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/UTV/utv_hsd.tok"; } else { // todo OpenISP telly - file_path = __dirname + "/ServiceDeps/premade_tellyscripts/UTV/utv_normal.tok"; + file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/UTV/utv_normal.tok"; } } break; @@ -100,8 +100,8 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { case "bf0app": prereg_contype = "text/tellyscript"; // if wtv-open-access: true then client expects OpenISP - if (ssid_sessions[socket.ssid].get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/premade_tellyscripts/bf0app/bf0app_OISP.tok"; - else file_path = __dirname + "/ServiceDeps/premade_tellyscripts/bf0app/bf0app_WTV_18006138199.tok"; + if (ssid_sessions[socket.ssid].get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_OISP.tok"; + else file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.tok"; break; // the following are not yet zefie generated and may have an unknown username/password attached @@ -109,8 +109,8 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { case "JP-Fiji": prereg_contype = "text/tellyscript"; // if wtv-open-access: true then client expects OpenISP - if (ssid_sessions[socket.ssid].get("wtv-open-access")) var file_path = __dirname + "/ServiceDeps/premade_tellyscripts/FIJI/dc_production_normal.tok"; - else var file_path = __dirname + "/ServiceDeps/premade_tellyscripts/FIJI/dc_production_normal.tok"; + if (ssid_sessions[socket.ssid].get("wtv-open-access")) var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/FIJI/dc_production_normal.tok"; + else var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/FIJI/dc_production_normal.tok"; break; default: @@ -120,7 +120,7 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { if (socket.ssid.substr(0, 8) == "MSTVSIMU") { prereg_contype = "text/dialscript"; - var file_path = __dirname + "/ServiceDeps/premade_tellyscripts/UTV/utv_hsd.tok"; + var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/UTV/utv_hsd.tok"; } } @@ -129,7 +129,7 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { // assume old classic in flash mode, override user setting and send tellyscript // because it is required to proceed in flash mode prereg_contype = "text/tellyscript"; - var file_path = __dirname + "/ServiceDeps/premade_tellyscripts/bf0app/bf0app_WTV_18006138199.tok"; + var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.tok"; var bf0app_update = true; ssid_sessions[socket.ssid].set("bf0app_update", bf0app_update); }