more optimizations, remove WTVIRC for now, upgrade test.js
This commit is contained in:
@@ -24,7 +24,7 @@ if (request_headers.post_data) {
|
||||
function getTitle(url) {
|
||||
return new Promise(function (resolve, reject) {
|
||||
let page_title = "Web Page";
|
||||
const request_type = (url.slice(0, 5) == "https") ? "https" : "http";
|
||||
const request_type = (url.slice(0, 5) === "https") ? "https" : "http";
|
||||
let proxy_agent = null;
|
||||
switch (request_type) {
|
||||
case "https":
|
||||
@@ -40,7 +40,7 @@ function getTitle(url) {
|
||||
}
|
||||
const request = proxy_agent.get(url, options, (response) => {
|
||||
let req_data = '';
|
||||
if (response.statusCode == 301 || response.statusCode == 302) {
|
||||
if (response.statusCode === 301 || response.statusCode === 302) {
|
||||
redirects++;
|
||||
if (redirects < max_redirects) resolve(getTitle(response.headers.location));
|
||||
else reject(`Too many redirects. Max: ${max_redirects}, Current: ${redirects}`);
|
||||
@@ -107,7 +107,7 @@ async function saveFavorite(favstore, title, folder, imagetype, favurl) {
|
||||
image = "canned/favorite_default.gif"
|
||||
}
|
||||
|
||||
if (favoritenum == minisrv_config.services[service_name].max_favorites_per_folder) {
|
||||
if (favoritenum === minisrv_config.services[service_name].max_favorites_per_folder) {
|
||||
headers = `400 You can only have ${minisrv_config.services[service_name].max_favorites_per_folder} favorites in a folder. Discard some favorites or choose a different folder, then try again.`
|
||||
} else {
|
||||
|
||||
|
||||
@@ -6,11 +6,11 @@ const query = request_headers.query
|
||||
const discardAll = request_headers.query.DiscardAll
|
||||
let strName;
|
||||
|
||||
if (discardAll != "Discard All")
|
||||
if (discardAll !== "Discard All")
|
||||
{
|
||||
for(strName in query)
|
||||
{
|
||||
if (strName != "favorite_folder_name")
|
||||
if (strName !== "favorite_folder_name")
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ if (request_headers.query.ForwardToBrowser)
|
||||
Connection: Keep-Alive
|
||||
Content-Type: text/html
|
||||
Location: wtv-favorite:/serve-browser?favorite_folder_name=${folder}`
|
||||
} else if (strName != "getCaseInsensitiveKey") {
|
||||
} else if (strName !== "getCaseInsensitiveKey") {
|
||||
const favorite = session_data.favstore.getFavorite(folder, strName);
|
||||
|
||||
if (errpage) {
|
||||
@@ -33,7 +33,7 @@ Location: wtv-favorite:/serve-browser?favorite_folder_name=${folder}`
|
||||
} else {
|
||||
if (!request_headers.query.confirm_remove) {
|
||||
let message, removeurl;
|
||||
if (discardAll == "Discard All")
|
||||
if (discardAll === "Discard All")
|
||||
{
|
||||
message = `Are you sure you want to discard all favorites in this folder?`;
|
||||
removeurl = request_headers.request_url + "&confirm_remove=true&DiscardAll=Discard All";
|
||||
@@ -58,7 +58,7 @@ Location: ${confirmAlert}`
|
||||
} else {
|
||||
|
||||
const gourl = `wtv-favorite:/serve-discard-favorites?favorite_folder_name=${folder}`;
|
||||
if (discardAll == "Discard All")
|
||||
if (discardAll === "Discard All")
|
||||
{
|
||||
session_data.favstore.clearFolder(folder);
|
||||
} else {
|
||||
|
||||
@@ -33,7 +33,7 @@ Location: wtv-favorite:/favorite`
|
||||
} else {
|
||||
if (!request_headers.query.confirm_remove) {
|
||||
let message = '';
|
||||
if (numoffavorites == 0) {
|
||||
if (numoffavorites === 0) {
|
||||
message = `Are you sure you want to remove <b>${folder}</b>?`;
|
||||
} else {
|
||||
message = `Removing <b>${folder}</b> will also remove the ${numoffavorites} favorites it contains.`;
|
||||
|
||||
@@ -12,14 +12,14 @@ else {
|
||||
// one favorite
|
||||
const favid = request_headers.query.favoriteid;
|
||||
const favfolder = request_headers.query.favoritefolder;
|
||||
if (folder != favfolder) session_data.favstore.moveFavorite(folder, favfolder, favid);
|
||||
if (folder !== favfolder) session_data.favstore.moveFavorite(folder, favfolder, favid);
|
||||
} else {
|
||||
if (request_headers.query.favoriteid.length == request_headers.query.favoritefolder.length) {
|
||||
// both queries should have the same number of entries
|
||||
if (request_headers.query.favoriteid.length === request_headers.query.favoritefolder.length) {
|
||||
// both queries should have the same number of entries
|
||||
Object.keys(request_headers.query.favoriteid).forEach(function (k) {
|
||||
const favid = request_headers.query.favoriteid[k];
|
||||
const favfolder = request_headers.query.favoritefolder[k];
|
||||
if (folder != favfolder) session_data.favstore.moveFavorite(folder, favfolder, favid);
|
||||
if (folder !== favfolder) session_data.favstore.moveFavorite(folder, favfolder, favid);
|
||||
})
|
||||
} else {
|
||||
error_occured = true;
|
||||
|
||||
@@ -13,23 +13,22 @@ totalfavorites = folder_array.length;
|
||||
|
||||
if (totalfavorites < 14)
|
||||
{
|
||||
if (createFun == "true")
|
||||
if (createFun === "true")
|
||||
session_data.favstore.createTemplateFolder("Fun");
|
||||
|
||||
if (createMoney == "true")
|
||||
if (createMoney === "true")
|
||||
session_data.favstore.createTemplateFolder("Money");
|
||||
|
||||
if (createMovies == "true")
|
||||
if (createMovies === "true")
|
||||
session_data.favstore.createTemplateFolder("Movies");
|
||||
|
||||
if (createNews == "true")
|
||||
if (createNews === "true")
|
||||
session_data.favstore.createTemplateFolder("News");
|
||||
|
||||
if (createRecommended == "true")
|
||||
if (createRecommended === "true")
|
||||
session_data.favstore.createTemplateFolder("Recommended");
|
||||
console.log("FUGHFVJSGHJFDGIJUFDSHGFJDSKHJKLGFHJKHDJKHJKLGF " + createRecommended)
|
||||
|
||||
if (createReference == "true")
|
||||
if (createReference === "true")
|
||||
session_data.favstore.createTemplateFolder("Reference");
|
||||
|
||||
headers = `300 OK
|
||||
|
||||
@@ -2,7 +2,7 @@ const minisrv_service_file = true;
|
||||
|
||||
const favstore_exists = session_data.favstore.favstoreExists();
|
||||
|
||||
if (favstore_exists != true)
|
||||
if (favstore_exists !== true)
|
||||
{
|
||||
session_data.favstore.createFavstore();
|
||||
headers = `300 OK
|
||||
@@ -13,7 +13,7 @@ const folder_array = session_data.favstore.getFolders();
|
||||
const url = request_headers.request;
|
||||
const key = url.split('?')[1]
|
||||
const scfav = session_data.favstore.getShortcutKey(key);
|
||||
if (!scfav.id || scfav.id == "none") {
|
||||
if (!scfav.id || scfav.id === "none") {
|
||||
headers = `400 You have not assigned a favorite to ${key}`
|
||||
} else {
|
||||
const fav = session_data.favstore.getFavorite(scfav.folder, scfav.id);
|
||||
|
||||
@@ -2,16 +2,15 @@ const minisrv_service_file = true;
|
||||
|
||||
const favstore_exists = session_data.favstore.favstoreExists();
|
||||
|
||||
if (favstore_exists != true)
|
||||
if (favstore_exists !== true)
|
||||
{
|
||||
session_data.favstore.createFavstore();
|
||||
headers = `300 OK
|
||||
wtv-expire-all: wtv-favorite:/favorite
|
||||
Location: wtv-favorite:/favorite`
|
||||
} else {
|
||||
|
||||
const folder_array = session_data.favstore.getFolders();
|
||||
const totalfavorites = folder_array.length;
|
||||
const stopdrawing = false;
|
||||
|
||||
headers = `200 OK
|
||||
Connection: Keep-Alive
|
||||
@@ -151,8 +150,8 @@ for ${session_data.getSessionData("subscriber_username") || "You"}
|
||||
let kval = 0;
|
||||
// process evens
|
||||
Object.keys(folder_array).forEach(function (k) {
|
||||
if (k == 0) return; // skip 0 since it was processed above
|
||||
if (parseInt(k) % 2 == 0) {
|
||||
if (parseInt(k)=== 0) return; // skip 0 since it was processed above
|
||||
if (parseInt(k) % 2 === 0) {
|
||||
// even
|
||||
// Left Middle
|
||||
data += `</td></tr><tr><td width="225" valign="middle" height="42" background="ROMCache/LeftMiddle.gif" align="center">
|
||||
@@ -171,7 +170,7 @@ for ${session_data.getSessionData("subscriber_username") || "You"}
|
||||
|
||||
// process end if total is even
|
||||
if (folder_array.length > 1) {
|
||||
if (folder_array.length % 2 == 0) {
|
||||
if (folder_array.length % 2 === 0) {
|
||||
data += `</td></tr><tr><td width="225" valign="middle" height="42" background="ROMCache/LeftBottom.gif" align="center">
|
||||
<table width="50%" cellspacing="0" cellpadding="0">
|
||||
<tr><td width="40" height="20">
|
||||
@@ -182,7 +181,7 @@ for ${session_data.getSessionData("subscriber_username") || "You"}
|
||||
}
|
||||
|
||||
// process middle (folder 2 (id 1))
|
||||
if (folder_array.length == 1) {
|
||||
if (folder_array.length === 1) {
|
||||
// no folder 2
|
||||
data += `<tr><td><table cellspacing="0" cellpadding="0">
|
||||
<tr><td width="6" height="12"><img src="wtv-home:/ROMCache/Spacer.gif" width="1" height="1">
|
||||
@@ -223,8 +222,8 @@ for ${session_data.getSessionData("subscriber_username") || "You"}
|
||||
|
||||
// process odds
|
||||
Object.keys(folder_array).forEach(function (k) {
|
||||
if (k == 1) return; // skip 1 since it was processed above
|
||||
if (parseInt(k) % 2 != 0) {
|
||||
if (parseInt(k) === 1) return; // skip 1 since it was processed above
|
||||
if (parseInt(k) % 2 !== 0) {
|
||||
// odd
|
||||
// Right Middle
|
||||
data += `</td></tr><tr><td width="225" valign="middle" height="42" background="ROMCache/RightMiddle.gif" align="center">
|
||||
@@ -242,7 +241,7 @@ for ${session_data.getSessionData("subscriber_username") || "You"}
|
||||
|
||||
// process end if total is odd
|
||||
if (folder_array.length > 1) {
|
||||
if (folder_array.length % 2 != 0) {
|
||||
if (folder_array.length % 2 !== 0) {
|
||||
data += `</td></tr><tr><td width="225" valign="middle" height="42" background="ROMCache/RightBottom.gif" align="center">
|
||||
<table width="50%" cellspacing="0" cellpadding="0">
|
||||
<tr><td width="5" height="20">
|
||||
|
||||
@@ -188,7 +188,7 @@ by name only.
|
||||
<td valign=top>
|
||||
<input type=hidden name=autosubmit autosubmit=onleave>
|
||||
<INPUT TYPE="checkbox" NAME="with_pictures" `
|
||||
if (session_data.getSessionData("subscriber_fav_images") == "true")
|
||||
if (session_data.getSessionData("subscriber_fav_images") === "true")
|
||||
console.log("SELECTED")
|
||||
data += "checked"
|
||||
data += ` selected>
|
||||
|
||||
@@ -207,7 +207,7 @@ Object.keys(favarray).forEach(function (k) {
|
||||
data += `</td><td abswidth="139" valign="top">
|
||||
<table href="${url}" bgcolor="191919">
|
||||
<tbody><tr><td abswidth="139" align="center">`;
|
||||
if (favarray[k].imagetype == "url")
|
||||
if (favarray[k].imagetype === "url")
|
||||
data += `<img src="${favarray[k].image}" width="70" vspace="5" height="52"><br>`;
|
||||
else
|
||||
data += `<img src="get-thumbnail?folder=${favarray[k].folder}&id=${favarray[k].id}" width="70" vspace="5" height="52"><br>`;
|
||||
@@ -218,7 +218,7 @@ ${favarray[k].title}
|
||||
</font>
|
||||
</td></tr></tbody></table>
|
||||
</td></tr></tbody></table>`;
|
||||
if ((parseInt(k) + 1) % 3 == 0) {
|
||||
if ((parseInt(k) + 1) % 3 === 0) {
|
||||
// every 3 objects
|
||||
data += `</td></tr></tbody></table>
|
||||
<table cellspacing="0" cellpadding="0">
|
||||
|
||||
@@ -112,7 +112,7 @@ let fav;
|
||||
for (let i = 1; i <= 8; i++) {
|
||||
const key = "F" + i;
|
||||
const scfav = session_data.favstore.getShortcutKey(key);
|
||||
if (scfav && scfav.id != "none") {
|
||||
if (scfav && scfav.id !== "none") {
|
||||
fav = session_data.favstore.getFavorite(scfav.folder, scfav.id);
|
||||
} else {
|
||||
fav = { image: "wtv-home:/ROMCache/Spacer.gif", title: "Not assigned" };
|
||||
@@ -135,7 +135,7 @@ ${fav.title}<br>
|
||||
</td><td>
|
||||
<font size="-2" color="#F1F1F1">`;
|
||||
|
||||
if (fav.title != favoritedata.title) {
|
||||
if (fav.title !== favoritedata.title) {
|
||||
data += `<input type="radio" NAME="Choose" VALUE=${key} > ${key}`
|
||||
}
|
||||
|
||||
|
||||
@@ -125,7 +125,7 @@ Discard favorites
|
||||
<input type=hidden name=favorite_folder_name value="${foldername}">
|
||||
<tbody><tr><spacer type=block WIDTH=199 HEIGHT=0><td width="5" height="13"><img src="wtv-home:/ROMCache/Spacer.gif" width="199" height="1">
|
||||
</td></tr></tbody></table></table>`
|
||||
if (favoritenum == 0)
|
||||
if (favoritenum === 0)
|
||||
{
|
||||
data += "<font size=2> <i>There are no favorites to discard in this folder.</i></font>";
|
||||
} else {
|
||||
@@ -133,7 +133,7 @@ for (let i = 0; i < favoritenum; i++) {
|
||||
data += `<tr><table cellspacing=0 cellpadding=0>
|
||||
<td abswidth=15><img src="wtv-home:/ROMCache/Spacer.gif" width=1 height=1>
|
||||
<td abswidth=75 height=52 align=center valign=center>`
|
||||
if (favarray[i].imagetype == "url")
|
||||
if (favarray[i].imagetype === "url")
|
||||
data += `<img src="${favarray[i].image}" width="70" vspace="5" height="52"><br>`
|
||||
else
|
||||
data += `<img src="get-thumbnail?folder=${favarray[i].folder}&id=${favarray[i].id}" width="70" vspace="5" height="52"><br>`
|
||||
@@ -190,7 +190,7 @@ data += `
|
||||
<td align=right valign=center>
|
||||
<td valign=center>
|
||||
<font color="#E7CE4A" size=-1><shadow>`
|
||||
if (favoritenum != 0)
|
||||
if (favoritenum !== 0)
|
||||
{
|
||||
data += `
|
||||
<input
|
||||
|
||||
@@ -120,7 +120,7 @@ data += `<tr><td width=225>
|
||||
</table>
|
||||
</table>`
|
||||
}
|
||||
if (totalfavorites == 1)
|
||||
if (totalfavorites === 1)
|
||||
data += `<tr><td align=left valign=top> </table>
|
||||
<td valign=top align=left>
|
||||
<table cellspacing=0 cellpadding=0 width=115><tr><td width=227 height=20 bgcolor=#2b2b2b>
|
||||
@@ -175,7 +175,7 @@ data += `
|
||||
</table>
|
||||
</table>
|
||||
</form>`
|
||||
if (totalfavorites == 1)
|
||||
if (totalfavorites === 1)
|
||||
data += "<i> You cannot delete your last folder.</i>"
|
||||
data += `
|
||||
<hr width=420>
|
||||
|
||||
@@ -12,7 +12,7 @@ let folderlist = `<select name="newfolder" width=140>
|
||||
<option value="${foldername}" selected="">${foldername}</option>
|
||||
`
|
||||
for (let i = 0; i < foldernum; i++) {
|
||||
if (folder_array[i] == foldername)
|
||||
if (folder_array[i] === foldername)
|
||||
{
|
||||
} else {
|
||||
folderlist += `<option value="${folder_array[i]}">${folder_array[i]}</option>
|
||||
@@ -140,7 +140,7 @@ Move favorites
|
||||
<input type=hidden name=favorite_folder_name value="${foldername}">
|
||||
<tbody><tr><spacer type=block WIDTH=199 HEIGHT=0><td width="5" height="13"><img src="wtv-home:/ROMCache/Spacer.gif" width="199" height="1">
|
||||
</td></tr></tbody></table></table>`
|
||||
if (favoritenum == 0)
|
||||
if (favoritenum === 0)
|
||||
{
|
||||
data += "<font size=2> <i>There are no favorites to move in this folder.</i></font>";
|
||||
} else {
|
||||
@@ -148,7 +148,7 @@ for (let i = 0; i < favoritenum; i++) {
|
||||
data += `<tr><table cellspacing=0 cellpadding=0>
|
||||
<td abswidth=15><img src="wtv-home:/ROMCache/Spacer.gif" width=1 height=1>
|
||||
<td abswidth=75 height=52 align=center valign=center>`
|
||||
if (favarray[i].imagetype == "url")
|
||||
if (favarray[i].imagetype === "url")
|
||||
data += `<img src="${favarray[i].image}" width="70" vspace="5" height="52"><br>`
|
||||
else
|
||||
data += `<img src="get-thumbnail?folder=${favarray[i].folder}&id=${favarray[i].id}" width="70" vspace="5" height="52"><br>`
|
||||
@@ -165,7 +165,7 @@ data += `<select name="favoritefolder" width=140>
|
||||
<option value="${foldername}" selected="">${foldername}</option>
|
||||
`
|
||||
for (let i = 0; i < foldernum; i++) {
|
||||
if (folder_array[i] == foldername)
|
||||
if (folder_array[i] === foldername)
|
||||
{
|
||||
} else {
|
||||
data += `<option value="${folder_array[i]}">${folder_array[i]}</option>
|
||||
|
||||
@@ -126,7 +126,7 @@ Rename favorites
|
||||
<input type=hidden name=favorite_folder_name value="${foldername}">
|
||||
<tbody><tr><spacer type=block WIDTH=199 HEIGHT=0><td width="5" height="13"><img src="wtv-home:/ROMCache/Spacer.gif" width="199" height="1">
|
||||
</td></tr></tbody></table></table>`
|
||||
if (favoritenum == 0)
|
||||
if (favoritenum === 0)
|
||||
{
|
||||
data += "<font size=2> <i>There are no favorites to rename in this folder.</i></font>";
|
||||
} else {
|
||||
@@ -134,7 +134,7 @@ for (let i = 0; i < favoritenum; i++) {
|
||||
data += `<tr><table cellspacing=0 cellpadding=0>
|
||||
<td abswidth=15><img src="wtv-home:/ROMCache/Spacer.gif" width=1 height=1>
|
||||
<td abswidth=75 height=52 align=center valign=center>`
|
||||
if (favarray[i].imagetype == "url")
|
||||
if (favarray[i].imagetype === "url")
|
||||
data += `<img src="${favarray[i].image}" width="70" vspace="5" height="52"><br>`
|
||||
else
|
||||
data += `<img src="get-thumbnail?folder=${favarray[i].folder}&id=${favarray[i].id}" width="70" vspace="5" height="52"><br>`
|
||||
|
||||
@@ -104,7 +104,7 @@ by going to the folder and choosing <b>Organize</b>.<br>
|
||||
<td width=25>
|
||||
<tr>
|
||||
<td width=25>`
|
||||
if (session_data.favstore.folderExists("Fun") == true)
|
||||
if (session_data.favstore.folderExists("Fun") === true)
|
||||
{
|
||||
data += `
|
||||
<td width=50% absheight=30 align=left valign=middle>
|
||||
@@ -124,7 +124,7 @@ if (session_data.favstore.folderExists("Fun") == true)
|
||||
<input type="checkbox" name="Fun" value="true"> Fun
|
||||
</font>`
|
||||
}
|
||||
if (session_data.favstore.folderExists("Money") == true)
|
||||
if (session_data.favstore.folderExists("Money") === true)
|
||||
{
|
||||
data += `
|
||||
<td width=50% absheight=30 align=left valign=middle>
|
||||
@@ -147,7 +147,7 @@ if (session_data.favstore.folderExists("Money") == true)
|
||||
<td width=25>
|
||||
<tr>
|
||||
<td width=25>`
|
||||
if (session_data.favstore.folderExists("Movies") == true)
|
||||
if (session_data.favstore.folderExists("Movies") === true)
|
||||
{
|
||||
data += `
|
||||
<td width=50% absheight=30 align=left valign=middle>
|
||||
@@ -167,7 +167,7 @@ if (session_data.favstore.folderExists("Movies") == true)
|
||||
<input type="checkbox" name="Movies" value="true"> Movies
|
||||
</font>`
|
||||
}
|
||||
if (session_data.favstore.folderExists("News") == true)
|
||||
if (session_data.favstore.folderExists("News") === true)
|
||||
{
|
||||
data += `
|
||||
<td width=50% absheight=30 align=left valign=middle>
|
||||
@@ -191,7 +191,7 @@ data += `
|
||||
<td width=25>
|
||||
<tr>
|
||||
<td width=25>`
|
||||
if (session_data.favstore.folderExists("Recommended") == true)
|
||||
if (session_data.favstore.folderExists("Recommended") === true)
|
||||
{
|
||||
data += `
|
||||
<td width=50% absheight=30 align=left valign=middle>
|
||||
@@ -211,7 +211,7 @@ if (session_data.favstore.folderExists("Recommended") == true)
|
||||
<input type="checkbox" name="Recommended" value="true"> Recommended
|
||||
</font>`
|
||||
}
|
||||
if (session_data.favstore.folderExists("Reference") == true)
|
||||
if (session_data.favstore.folderExists("Reference") === true)
|
||||
{
|
||||
data += `
|
||||
<td width=50% absheight=30 align=left valign=middle>
|
||||
|
||||
@@ -77,7 +77,7 @@ let fav;
|
||||
for (let i = 1; i <= 8; i++) {
|
||||
const key = "F" + i;
|
||||
const scfav = session_data.favstore.getShortcutKey(key);
|
||||
if (scfav && scfav.id != "none") {
|
||||
if (scfav && scfav.id !== "none") {
|
||||
fav = session_data.favstore.getFavorite(scfav.folder, scfav.id);
|
||||
} else {
|
||||
fav = { image: "wtv-home:/ROMCache/Spacer.gif", title: "Not assigned" };
|
||||
|
||||
@@ -113,7 +113,7 @@ Assign shortcut to favorite
|
||||
</td></tr><tr><td width="15">
|
||||
</td><td valign="middle" align="left">
|
||||
<font size="-1" color="#42BC52">`
|
||||
if (favoritenum == 0)
|
||||
if (favoritenum === 0)
|
||||
{
|
||||
data += "<font size=2> <i>There are no favorites to move in this folder.</i></font>";
|
||||
} else {
|
||||
@@ -141,7 +141,7 @@ for (let i = 0; i < favoritenum; i++) {
|
||||
<table bgcolor="191919">
|
||||
<tbody><tr><td abswidth="70" valign="center" align="center">
|
||||
`
|
||||
if (favarray[i].imagetype == "url")
|
||||
if (favarray[i].imagetype === "url")
|
||||
data += `<img src="${favarray[i].image}" width="70" vspace="5" height="52"><br>`
|
||||
else
|
||||
data += `<img src="get-thumbnail?folder=${favarray[i].folder}&id=${favarray[i].id}" width="70" vspace="5" height="52"><br>`
|
||||
|
||||
Reference in New Issue
Block a user