From 6f0359e99fec8749bc038b5096fa6124bb265e8d Mon Sep 17 00:00:00 2001
From: Masahiko AMANO <hiko-19@ya.ru>
Date: Sun, 12 Feb 2023 15:51:16 +0300
Subject: [PATCH] style(web): simplify tdb_query() func

---
 web/public/js/tdbms.js        | 21 +++++++++++++++------
 web/public/js/tfm-database.js |  4 ++--
 web/public/js/tfm-files.js    |  4 ++--
 web/public/js/tfm-settings.js |  7 ++++---
 web/public/js/tfm-tags.js     |  4 ++--
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/web/public/js/tdbms.js b/web/public/js/tdbms.js
index c930f6c..6d0a1e3 100644
--- a/web/public/js/tdbms.js
+++ b/web/public/js/tdbms.js
@@ -33,6 +33,15 @@ if (sort_tags == null) {
 }
 
 function tdb_query(trdb, trc, trb) {
+	if (trb == null) {
+		trb = "";
+	}
+	if (trc == null) {
+		trc = 0;
+	}
+	if (trdb == null) {
+		trdb = "";
+	}
 	let output = null;
 	$.ajax({
 		url: "/TDBMS",
@@ -58,13 +67,13 @@ function tdb_query(trdb, trc, trb) {
 }
 
 function sasahyou_load() {
-	let db_info = tdb_query(db_name, 0, "");
+	let db_info = tdb_query(db_name);
 	if (db_info == null || !db_info.status) {
 		alert("Failed to fetch database");
 		throw new Error("Failed to fetch database");
 	}
 	if (sasahyou == null || sasahyou_mts !== db_info.data[0].sasahyou.mts) {
-		let resp = tdb_query(db_name, 16, "");
+		let resp = tdb_query(db_name, 16);
 		if (resp == null || !resp.status) {
 			alert("Failed to get sasahyou");
 			throw new Error("Failed to get sasahyou");
@@ -80,13 +89,13 @@ function sasahyou_load() {
 }
 
 function sappyou_load() {
-	let db_info = tdb_query(db_name, 0, "");
+	let db_info = tdb_query(db_name);
 	if (db_info == null || !db_info.status) {
 		alert("Failed to fetch database");
 		throw new Error("Failed to fetch database");
 	}
 	if (sappyou == null || sappyou_mts !== db_info.data[0].sappyou.mts) {
-		let resp = tdb_query(db_name, 32, "");
+		let resp = tdb_query(db_name, 32);
 		if (resp == null || !resp.status) {
 			alert("Failed to get sappyou");
 			throw new Error("Failed to get sappyou");
@@ -102,13 +111,13 @@ function sappyou_load() {
 }
 
 function shoppyou_load() {
-	let db_info = tdb_query(db_name, 0, "");
+	let db_info = tdb_query(db_name);
 	if (db_info == null || !db_info.status) {
 		alert("Failed to fetch database");
 		throw new Error("Failed to fetch database");
 	}
 	if (shoppyou == null || shoppyou_mts !== db_info.data[0].shoppyou.mts) {
-		let resp = tdb_query(db_name, 8, "");
+		let resp = tdb_query(db_name, 8);
 		if (resp == null || !resp.status) {
 			alert("Failed to get shoppyou");
 			throw new Error("Failed to get shoppyou");
diff --git a/web/public/js/tfm-database.js b/web/public/js/tfm-database.js
index 1685ccb..39cbcae 100644
--- a/web/public/js/tfm-database.js
+++ b/web/public/js/tfm-database.js
@@ -5,7 +5,7 @@ if (db_name == null) {
 
 $(document).on("click", "#btn-save", function (e) {
 	e.preventDefault();
-	let resp = tdb_query(db_name, 4, "");
+	let resp = tdb_query(db_name, 4);
 	if (resp.status) {
 		alert("Successfully saved!");
 	} else {
@@ -18,7 +18,7 @@ $(document).on("click", "#btn-discard", function (e) {
 	if (!confirm("All unsaved changes will be lost permanently. Are you sure?")) {
 		return;
 	}
-	let resp = tdb_query(db_name, 2, "");
+	let resp = tdb_query(db_name, 2);
 	if (resp.status) {
 		alert("Successfully reloaded database!");
 	} else {
diff --git a/web/public/js/tfm-files.js b/web/public/js/tfm-files.js
index 8867db3..8f0672a 100644
--- a/web/public/js/tfm-files.js
+++ b/web/public/js/tfm-files.js
@@ -7,12 +7,12 @@ $(window).on("load", function () {
 			appendScroll: $(".contents-wrapper")[0],
 		});
 	});
-	sasahyou_load(db_name);
+	sasahyou_load();
 	sasahyou.forEach((sasa) => {
 		$(".contents-wrapper").append(`<div class="item sasa" sid="${sasa.id}" title="${sasa.path.split('/').slice(-1)}"><img class="thumb" data-src="${"/thumbs/" + sasa.path}"><div class="overlay"></div></div>`);
 		$("#menu-tag-view .list").append(`<div class="list-item sasa" sid="${sasa.id}" title="${sasa.path.split('/').slice(-1)}"><img class="thumb" data-src="${"/thumbs/" + sasa.path}"><div class="overlay"></div></div>`);
 	});
-	sappyou_load(db_name);
+	sappyou_load();
 	sappyou.forEach((tanzaku) => {
 		$("#menu-file-view .list").append(`<div class="list-item tanzaku" tid="${tanzaku.id}">${tanzaku.name}</div>`);
 	});
diff --git a/web/public/js/tfm-settings.js b/web/public/js/tfm-settings.js
index 818e3a2..5491a57 100644
--- a/web/public/js/tfm-settings.js
+++ b/web/public/js/tfm-settings.js
@@ -3,6 +3,8 @@ var db_name = localStorage["tfm_db_name"];
 function settings_load() {
 	if (db_name != null) {
 		$("#db_name").val(db_name);
+	} else {
+		$("#db_name").val("");
 	}
 	if (sort_files != null) {
 		if (sort_files[0] === '-') {
@@ -34,7 +36,7 @@ $(document).on("submit", "#settings", function (e) {
 	let db_name_input = $("#db_name");
 	let db_name_val = db_name_input.val();
 	if (db_name_val !== db_name) {
-		let resp = tdb_query("", 0, "");
+		let resp = tdb_query();
 		if (!resp.status) {
 			alert("Failed to fetch databases");
 			return;
@@ -42,8 +44,7 @@ $(document).on("submit", "#settings", function (e) {
 		let found = false;
 		resp.data.every(db => {
 			if (db.name === db_name_val) {
-				db_name = db_name_val;
-				localStorage["tfm_db_name"] = db_name;
+				localStorage["tfm_db_name"] = db_name = db_name_val;
 				found = true;
 				db_name_input.removeClass("is-invalid");
 				return false;
diff --git a/web/public/js/tfm-tags.js b/web/public/js/tfm-tags.js
index 852af4e..1e7008c 100644
--- a/web/public/js/tfm-tags.js
+++ b/web/public/js/tfm-tags.js
@@ -1,10 +1,10 @@
 $(window).on("load", function () {
-	sappyou_load(db_name);
+	sappyou_load();
 	sappyou.forEach((tanzaku) => {
 		$(".contents-wrapper").append(`<div class="item tanzaku" tid="${tanzaku.id}">${tanzaku.name}</div>`);
 		$("#menu-file-view .list").append(`<div class="list-item tanzaku" tid="${tanzaku.id}">${tanzaku.name}</div>`);
 	});
-	sasahyou_load(db_name);
+	sasahyou_load();
 	sasahyou.forEach((sasa) => {
 		$("#menu-tag-view .list").append(`<div class="list-item sasa" sid="${sasa.id}" title="${sasa.path.split('/').slice(-1)}"><img class="thumb" data-src="${"/thumbs/" + sasa.path}"><div class="overlay"></div></div>`);
 	});