H1K0-dev/tanabata
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style(web): simplify tdb_query() func

Browse Source
This commit is contained in:
Masahiko AMANO 2023-02-12 15:51:16 +03:00
parent e8e32c70f0
commit 6f0359e99f
5 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/public/js/tdbms.js
View File

@ -33,6 +33,15 @@ if (sort_tags == null) {
} }
function tdb_query(trdb, trc, trb) { function tdb_query(trdb, trc, trb) {
if (trb == null) {
trb = "";
}
if (trc == null) {
trc = 0;
}
if (trdb == null) {
trdb = "";
}
let output = null; let output = null;
$.ajax({ $.ajax({
url: "/TDBMS", url: "/TDBMS",
@ -58,13 +67,13 @@ function tdb_query(trdb, trc, trb) {
} }
function sasahyou_load() { 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) { if (db_info == null || !db_info.status) {
alert("Failed to fetch database"); alert("Failed to fetch database");
throw new Error("Failed to fetch database"); throw new Error("Failed to fetch database");
} }
if (sasahyou == null || sasahyou_mts !== db_info.data[0].sasahyou.mts) { 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) { if (resp == null || !resp.status) {
alert("Failed to get sasahyou"); alert("Failed to get sasahyou");
throw new Error("Failed to get sasahyou"); throw new Error("Failed to get sasahyou");
@ -80,13 +89,13 @@ function sasahyou_load() {
} }
function sappyou_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) { if (db_info == null || !db_info.status) {
alert("Failed to fetch database"); alert("Failed to fetch database");
throw new Error("Failed to fetch database"); throw new Error("Failed to fetch database");
} }
if (sappyou == null || sappyou_mts !== db_info.data[0].sappyou.mts) { 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) { if (resp == null || !resp.status) {
alert("Failed to get sappyou"); alert("Failed to get sappyou");
throw new Error("Failed to get sappyou"); throw new Error("Failed to get sappyou");
@ -102,13 +111,13 @@ function sappyou_load() {
} }
function shoppyou_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) { if (db_info == null || !db_info.status) {
alert("Failed to fetch database"); alert("Failed to fetch database");
throw new Error("Failed to fetch database"); throw new Error("Failed to fetch database");
} }
if (shoppyou == null || shoppyou_mts !== db_info.data[0].shoppyou.mts) { 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) { if (resp == null || !resp.status) {
alert("Failed to get shoppyou"); alert("Failed to get shoppyou");
throw new Error("Failed to get shoppyou"); throw new Error("Failed to get shoppyou");

4
web/public/js/tfm-database.js
View File

@ -5,7 +5,7 @@ if (db_name == null) {
$(document).on("click", "#btn-save", function (e) { $(document).on("click", "#btn-save", function (e) {
e.preventDefault(); e.preventDefault();
let resp = tdb_query(db_name, 4, ""); let resp = tdb_query(db_name, 4);
if (resp.status) { if (resp.status) {
alert("Successfully saved!"); alert("Successfully saved!");
} else { } else {
@ -18,7 +18,7 @@ $(document).on("click", "#btn-discard", function (e) {
if (!confirm("All unsaved changes will be lost permanently. Are you sure?")) { if (!confirm("All unsaved changes will be lost permanently. Are you sure?")) {
return; return;
} }
let resp = tdb_query(db_name, 2, ""); let resp = tdb_query(db_name, 2);
if (resp.status) { if (resp.status) {
alert("Successfully reloaded database!"); alert("Successfully reloaded database!");
} else { } else {

4
web/public/js/tfm-files.js
View File

@ -7,12 +7,12 @@ $(window).on("load", function () {
appendScroll: $(".contents-wrapper")[0], appendScroll: $(".contents-wrapper")[0],
}); });
}); });
sasahyou_load(db_name); sasahyou_load();
sasahyou.forEach((sasa) => { 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>`); $(".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>`); $("#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) => { sappyou.forEach((tanzaku) => {
$("#menu-file-view .list").append(`<div class="list-item tanzaku" tid="${tanzaku.id}">${tanzaku.name}</div>`); $("#menu-file-view .list").append(`<div class="list-item tanzaku" tid="${tanzaku.id}">${tanzaku.name}</div>`);
}); });

7
web/public/js/tfm-settings.js
View File

@ -3,6 +3,8 @@ var db_name = localStorage["tfm_db_name"];
function settings_load() { function settings_load() {
if (db_name != null) { if (db_name != null) {
$("#db_name").val(db_name); $("#db_name").val(db_name);
} else {
$("#db_name").val("");
} }
if (sort_files != null) { if (sort_files != null) {
if (sort_files[0] === '-') { if (sort_files[0] === '-') {
@ -34,7 +36,7 @@ $(document).on("submit", "#settings", function (e) {
let db_name_input = $("#db_name"); let db_name_input = $("#db_name");
let db_name_val = db_name_input.val(); let db_name_val = db_name_input.val();
if (db_name_val !== db_name) { if (db_name_val !== db_name) {
let resp = tdb_query("", 0, ""); let resp = tdb_query();
if (!resp.status) { if (!resp.status) {
alert("Failed to fetch databases"); alert("Failed to fetch databases");
return; return;
@ -42,8 +44,7 @@ $(document).on("submit", "#settings", function (e) {
let found = false; let found = false;
resp.data.every(db => { resp.data.every(db => {
if (db.name === db_name_val) { if (db.name === db_name_val) {
db_name = db_name_val; localStorage["tfm_db_name"] = db_name = db_name_val;
localStorage["tfm_db_name"] = db_name;
found = true; found = true;
db_name_input.removeClass("is-invalid"); db_name_input.removeClass("is-invalid");
return false; return false;

4
web/public/js/tfm-tags.js
View File

@ -1,10 +1,10 @@
$(window).on("load", function () { $(window).on("load", function () {
sappyou_load(db_name); sappyou_load();
sappyou.forEach((tanzaku) => { sappyou.forEach((tanzaku) => {
$(".contents-wrapper").append(`<div class="item tanzaku" tid="${tanzaku.id}">${tanzaku.name}</div>`); $(".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>`); $("#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) => { 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>`); $("#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>`);
}); });