diff options
| -rw-r--r-- | remuxer/src/bin/mkvinfo.rs | 2 | ||||
| -rw-r--r-- | remuxer/src/demuxers/matroska.rs | 2 | ||||
| -rw-r--r-- | server/src/ui/admin/mod.rs | 6 | ||||
| -rw-r--r-- | ui/src/admin/mod.rs | 16 |
4 files changed, 7 insertions, 19 deletions
diff --git a/remuxer/src/bin/mkvinfo.rs b/remuxer/src/bin/mkvinfo.rs index e2c7cea..b5f3ae4 100644 --- a/remuxer/src/bin/mkvinfo.rs +++ b/remuxer/src/bin/mkvinfo.rs @@ -19,7 +19,7 @@ fn main() -> Result<()> { create_demuxer_autodetect(Box::new(file))?.ok_or(anyhow!("unknown file type"))?; println!("INFO: {:#?}", reader.info()?); - println!("TRACKS: {:#?}", reader.tracks()?); + println!("TRACKS: {:?}", reader.tracks()?); println!("CHAPTERS: {:#?}", reader.chapters()?); println!("TAGS: {:#?}", reader.tags()?); diff --git a/remuxer/src/demuxers/matroska.rs b/remuxer/src/demuxers/matroska.rs index 45bb154..bf4614d 100644 --- a/remuxer/src/demuxers/matroska.rs +++ b/remuxer/src/demuxers/matroska.rs @@ -105,6 +105,7 @@ impl MatroskaDemuxer { if let Some(seek_head) = self.seek_head()? && !search_tag == Segment::TAG_CLUSTERS { + debug!("using seek head"); let Some(segment_position) = seek_head .seeks .iter() @@ -124,6 +125,7 @@ impl MatroskaDemuxer { } Ok(Some((absolute_offset, size))) } else { + debug!("using search"); self.seek_segment_start()?; loop { let pos = self.reader.stream_position()?; diff --git a/server/src/ui/admin/mod.rs b/server/src/ui/admin/mod.rs index 3bd4771..03f01c1 100644 --- a/server/src/ui/admin/mod.rs +++ b/server/src/ui/admin/mod.rs @@ -11,9 +11,7 @@ use super::error::MyResult; use crate::helper::RequestInfo; use jellycommon::routes::u_admin_dashboard; use jellyimport::is_importing; -use jellylogic::admin::{ - create_invite, delete_invite, get_import_errors, list_invites, update_search_index, -}; +use jellylogic::admin::{create_invite, delete_invite, list_invites, update_search_index}; use jellyui::{admin::AdminDashboardPage, locale::tr, render_page}; use rocket::{ FromForm, @@ -30,7 +28,6 @@ pub async fn r_admin_dashboard( ) -> MyResult<RawHtml<String>> { ri.session.assert_admin()?; let invites = list_invites(&ri.session)?; - let last_import_err = get_import_errors(&ri.session).await; let busy = if is_importing() { Some("An import is currently running.") @@ -41,7 +38,6 @@ pub async fn r_admin_dashboard( Ok(RawHtml(render_page( &AdminDashboardPage { busy, - last_import_err: &last_import_err, invites: &invites, flash: &flash.map(FlashMessage::into_inner), lang: &ri.lang, diff --git a/ui/src/admin/mod.rs b/ui/src/admin/mod.rs index 0f22980..8666fbd 100644 --- a/ui/src/admin/mod.rs +++ b/ui/src/admin/mod.rs @@ -28,25 +28,15 @@ impl Page for AdminDashboardPage<'_> { } markup::define!( - AdminDashboardPage<'a>(lang: &'a Language, busy: Option<&'static str>, last_import_err: &'a [String], flash: &'a FlashM, invites: &'a [String]) { + AdminDashboardPage<'a>(lang: &'a Language, busy: Option<&'static str>, flash: &'a FlashM, invites: &'a [String]) { h1 { @trs(lang, "admin.dashboard.title") } @FlashDisplay { flash } - @if !last_import_err.is_empty() { - section.message.error { - details { - summary { p.error { @tr(**lang, "admin.import_errors").replace("{n}", &last_import_err.len().to_string()) } } - ol { @for e in *last_import_err { - li.error { pre.error { @e } } - }} - } - } - } ul { li{a[href=u_admin_log(true)] { @trs(lang, "admin.log.warnonly") }} 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") } + + a[href=u_admin_import()] { h2 { @trs(lang, "admin.import.title") }} @if let Some(text) = busy { section.message { p.warn { @text } } } |