diff --git a/web/public/js/tdbms.js b/web/public/js/tdbms.js
index 2676f2d..3ec334d 100644
--- a/web/public/js/tdbms.js
+++ b/web/public/js/tdbms.js
@@ -1,3 +1,32 @@
+var sasahyou = null, sappyou = null, shoppyou = null;
+var sort_files = localStorage["sort_files"],
+ sort_tags = localStorage["sort_tags"];
+if (localStorage["sasahyou"] != null) {
+ sasahyou = JSON.parse(localStorage["sasahyou"]);
+}
+if (localStorage["sappyou"] != null) {
+ sappyou = JSON.parse(localStorage["sappyou"]);
+}
+if (localStorage["shoppyou"] != null) {
+ shoppyou = JSON.parse(localStorage["shoppyou"]);
+}
+var sasahyou_mts = 0, sappyou_mts = 0, shoppyou_mts = 0;
+if (localStorage["sasahyou_mts"] != null) {
+ sasahyou_mts = parseInt(localStorage["sasahyou_mts"]);
+}
+if (localStorage["sappyou_mts"] != null) {
+ sappyou_mts = parseInt(localStorage["sappyou_mts"]);
+}
+if (localStorage["shoppyou_mts"] != null) {
+ shoppyou_mts = parseInt(localStorage["shoppyou_mts"]);
+}
+if (sort_files == null) {
+ sort_files = "id";
+}
+if (sort_tags == null) {
+ sort_tags = "id";
+}
+
function tdb_query(trdb, trc, trb) {
let output = null;
$.ajax({
@@ -22,3 +51,60 @@ function tdb_query(trdb, trc, trb) {
});
return output;
}
+
+function sasahyou_load(tdb) {
+ let db_info = tdb_query(tdb, 0, "");
+ 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(tdb, 16, "");
+ if (resp == null || !resp.status) {
+ alert("Failed to get sasahyou");
+ throw new Error("Failed to get sasahyou");
+ }
+ sasahyou = resp.data;
+ sasahyou_mts = db_info.data[0].sasahyou.mts;
+ localStorage["sasahyou"] = JSON.stringify(sasahyou);
+ localStorage["sasahyou_mts"] = sasahyou_mts;
+ }
+}
+
+function sappyou_load(tdb) {
+ let db_info = tdb_query(tdb, 0, "");
+ 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(tdb, 32, "");
+ if (resp == null || !resp.status) {
+ alert("Failed to get sappyou");
+ throw new Error("Failed to get sappyou");
+ }
+ sappyou = resp.data;
+ sappyou_mts = db_info.data[0].sappyou.mts;
+ localStorage["sappyou"] = JSON.stringify(sappyou);
+ localStorage["sappyou_mts"] = sappyou_mts;
+ }
+}
+
+function shoppyou_load(tdb) {
+ let db_info = tdb_query(tdb, 0, "");
+ 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(tdb, 8, "");
+ if (resp == null || !resp.status) {
+ alert("Failed to get shoppyou");
+ throw new Error("Failed to get shoppyou");
+ }
+ shoppyou = resp.data;
+ shoppyou_mts = db_info.data[0].shoppyou.mts;
+ localStorage["shoppyou"] = JSON.stringify(shoppyou);
+ localStorage["shoppyou_mts"] = shoppyou_mts;
+ }
+}
diff --git a/web/public/js/tfm-files.js b/web/public/js/tfm-files.js
index 8f0672a..8867db3 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();
+ sasahyou_load(db_name);
sasahyou.forEach((sasa) => {
$(".contents-wrapper").append(`
![]()
`);
$("#menu-tag-view .list").append(`![]()
`);
});
- sappyou_load();
+ sappyou_load(db_name);
sappyou.forEach((tanzaku) => {
$("#menu-file-view .list").append(`${tanzaku.name}
`);
});
diff --git a/web/public/js/tfm-management.js b/web/public/js/tfm-management.js
index 270bbce..2719c6a 100644
--- a/web/public/js/tfm-management.js
+++ b/web/public/js/tfm-management.js
@@ -2,87 +2,10 @@ var db_name = localStorage["tfm_db_name"];
if (db_name == null) {
location.href = "/tfm/settings";
}
-var sasahyou = null, sappyou = null, shoppyou = null;
-if (localStorage["sasahyou"] != null) {
- sasahyou = JSON.parse(localStorage["sasahyou"]);
-}
-if (localStorage["sappyou"] != null) {
- sappyou = JSON.parse(localStorage["sappyou"]);
-}
-if (localStorage["shoppyou"] != null) {
- shoppyou = JSON.parse(localStorage["shoppyou"]);
-}
-var sasahyou_mts = 0, sappyou_mts = 0, shoppyou_mts = 0;
-if (localStorage["sasahyou_mts"] != null) {
- sasahyou_mts = parseInt(localStorage["sasahyou_mts"]);
-}
-if (localStorage["sappyou_mts"] != null) {
- sappyou_mts = parseInt(localStorage["sappyou_mts"]);
-}
-if (localStorage["shoppyou_mts"] != null) {
- shoppyou_mts = parseInt(localStorage["shoppyou_mts"]);
-}
var current_sasa = null, current_tanzaku = null;
var current_sasa_index = -1;
var menu_count = 0;
-function sasahyou_load() {
- let db_info = tdb_query(db_name, 0, "");
- if (db_info == null || !db_info.status) {
- alert("Failed to fetch TFM database");
- throw new Error("Failed to fetch TFM database");
- }
- if (sasahyou == null || sasahyou_mts !== db_info.data[0].sasahyou.mts) {
- let resp = tdb_query(db_name, 16, "");
- if (resp == null || !resp.status) {
- alert("Failed to get sasahyou");
- throw new Error("Failed to get sasahyou");
- }
- sasahyou = resp.data;
- sasahyou_mts = db_info.data[0].sasahyou.mts;
- localStorage["sasahyou"] = JSON.stringify(sasahyou);
- localStorage["sasahyou_mts"] = sasahyou_mts;
- }
-}
-
-function sappyou_load() {
- let db_info = tdb_query(db_name, 0, "");
- if (db_info == null || !db_info.status) {
- alert("Failed to fetch TFM database");
- throw new Error("Failed to fetch TFM database");
- }
- if (sappyou == null || sappyou_mts !== db_info.data[0].sappyou.mts) {
- let resp = tdb_query(db_name, 32, "");
- if (resp == null || !resp.status) {
- alert("Failed to get sappyou");
- throw new Error("Failed to get sappyou");
- }
- sappyou = resp.data;
- sappyou_mts = db_info.data[0].sappyou.mts;
- localStorage["sappyou"] = JSON.stringify(sappyou);
- localStorage["sappyou_mts"] = sappyou_mts;
- }
-}
-
-function shoppyou_load() {
- let db_info = tdb_query(db_name, 0, "");
- if (db_info == null || !db_info.status) {
- alert("Failed to fetch TFM database");
- throw new Error("Failed to fetch TFM database");
- }
- if (shoppyou == null || shoppyou_mts !== db_info.data[0].shoppyou.mts) {
- let resp = tdb_query(db_name, 8, "");
- if (resp == null || !resp.status) {
- alert("Failed to get shoppyou");
- throw new Error("Failed to get shoppyou");
- }
- shoppyou = resp.data;
- shoppyou_mts = db_info.data[0].shoppyou.mts;
- localStorage["shoppyou"] = JSON.stringify(shoppyou);
- localStorage["shoppyou_mts"] = shoppyou_mts;
- }
-}
-
function menu_view_file_open() {
if (menu_count > 1) {
return;
diff --git a/web/public/js/tfm-settings.js b/web/public/js/tfm-settings.js
index d5d3338..18b5751 100644
--- a/web/public/js/tfm-settings.js
+++ b/web/public/js/tfm-settings.js
@@ -1,12 +1,4 @@
-var db_name = localStorage["tfm_db_name"],
- sort_files = localStorage["sort_files"],
- sort_tags = localStorage["sort_tags"];
-if (sort_files == null) {
- sort_files = "id";
-}
-if (sort_tags == null) {
- sort_tags = "id";
-}
+var db_name = localStorage["tfm_db_name"];
function settings_load() {
if (db_name != null) {
diff --git a/web/public/js/tfm-tags.js b/web/public/js/tfm-tags.js
index 1e7008c..852af4e 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();
+ sappyou_load(db_name);
sappyou.forEach((tanzaku) => {
$(".contents-wrapper").append(`${tanzaku.name}
`);
$("#menu-file-view .list").append(`${tanzaku.name}
`);
});
- sasahyou_load();
+ sasahyou_load(db_name);
sasahyou.forEach((sasa) => {
$("#menu-tag-view .list").append(``);
});