diff options
| -rw-r--r-- | common/src/lib.rs | 2 | ||||
| -rw-r--r-- | import/src/lib.rs | 5 | ||||
| -rw-r--r-- | locale/en.ini | 1 | ||||
| -rw-r--r-- | ui/src/admin/mod.rs | 4 | ||||
| -rw-r--r-- | ui/src/scaffold.rs | 2 | ||||
| -rw-r--r-- | web/script/import_live.ts | 6 |
6 files changed, 13 insertions, 7 deletions
diff --git a/common/src/lib.rs b/common/src/lib.rs index 5e2134f..418c7eb 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -17,7 +17,7 @@ pub use chrono; use serde::{Deserialize, Serialize}; use std::{ - collections::{BTreeMap, BTreeSet, HashSet}, + collections::{BTreeMap, BTreeSet}, path::PathBuf, }; diff --git a/import/src/lib.rs b/import/src/lib.rs index 3156b5a..763af42 100644 --- a/import/src/lib.rs +++ b/import/src/lib.rs @@ -291,7 +291,10 @@ fn get_node_slug(path: &Path) -> Option<String> { Some(format!("{filestem}")) } else { let parent_filename = path.parent()?.file_name()?.to_string_lossy(); - let parent_filestem = parent_filename.split_once(".").unwrap_or((&filename, "")).0; + let parent_filestem = parent_filename + .split_once(".") + .unwrap_or((&parent_filename, "")) + .0; Some(format!("{parent_filestem}-{filestem}")) } } diff --git a/locale/en.ini b/locale/en.ini index 20614a4..765e094 100644 --- a/locale/en.ini +++ b/locale/en.ini @@ -9,6 +9,7 @@ nav.settings=Settings nav.logout=Log out nav.login=Log in nav.register=Register +nav.importing=Library database is being updated... stats.title=Library Statistics stats.count=There is a total of {count} nodes in the library. diff --git a/ui/src/admin/mod.rs b/ui/src/admin/mod.rs index 0e5d11e..0f22980 100644 --- a/ui/src/admin/mod.rs +++ b/ui/src/admin/mod.rs @@ -14,7 +14,8 @@ use crate::{ scaffold::FlashDisplay, }; use jellycommon::routes::{ - u_admin_invite_create, u_admin_invite_remove, u_admin_log, u_admin_update_search, u_admin_users, + u_admin_import, u_admin_invite_create, u_admin_invite_remove, u_admin_log, + u_admin_update_search, u_admin_users, }; impl Page for AdminDashboardPage<'_> { @@ -45,6 +46,7 @@ markup::define!( li{a[href=u_admin_log(false)] { @trs(lang, "admin.log.full") }} } h2 { @trs(lang, "admin.dashboard.library") } + a[href=u_admin_import()] { @trs(lang, "admin.import.title") } @if let Some(text) = busy { section.message { p.warn { @text } } } diff --git a/ui/src/scaffold.rs b/ui/src/scaffold.rs index 95074cf..2bf6f69 100644 --- a/ui/src/scaffold.rs +++ b/ui/src/scaffold.rs @@ -48,7 +48,7 @@ markup::define! { a.library[href=u_items()] { @trs(lang, "nav.all") } " " a.library[href=u_search()] { @trs(lang, "nav.search") } " " a.library[href=u_stats()] { @trs(lang, "nav.stats") } " " - @if renderinfo.importing { span.warn { "Library database is updating..." } } + @if renderinfo.importing { span.warn { @trs(lang, "nav.importing") } } } div.account { @if let Some(session) = &renderinfo.session { diff --git a/web/script/import_live.ts b/web/script/import_live.ts index cc8c846..3507cf7 100644 --- a/web/script/import_live.ts +++ b/web/script/import_live.ts @@ -44,9 +44,9 @@ globalThis.addEventListener("DOMContentLoaded", () => { const el = document.getElementById("admin_import")! const ws = new WebSocket(`/admin/import`) - ws.onopen = () => console.log("live log connected"); - ws.onclose = () => console.log("live log disconnected"); - ws.onerror = e => console.log("live log ws error", e); + ws.onopen = () => console.log("live progress connected"); + ws.onclose = () => console.log("live progress disconnected"); + ws.onerror = e => console.log("live progress ws error", e); const progress = new OVar(0) |