Merge pull request 'chore(deps): lock file maintenance' (#214) from renovate/lock-file-maintenance into master

Reviewed-on: #178

Cargo.toml

@@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
 edition = "2021"
 license = "UNLICENSED"
 publish = ["xinu"]
-version = "0.17.49"
+version = "0.17.55"
 repository = "https://git.z.xinu.tv/wathiede/letterbox"
 
 [profile.dev]

procmail2notmuch/Cargo.toml

@@ -13,8 +13,8 @@ version.workspace = true
 [dependencies]
 anyhow = "1.0.98"
 clap = { version = "4.5.37", features = ["derive", "env"] }
-letterbox-notmuch = { version = "0.17.9", registry = "xinu" }
-letterbox-shared = { version = "0.17.9", registry = "xinu" }
+letterbox-notmuch = { version = "0.17", registry = "xinu" }
+letterbox-shared = { version = "0.17", registry = "xinu" }
 serde = { version = "1.0.219", features = ["derive"] }
 sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio"] }
 tokio = { version = "1.44.2", features = ["rt", "macros", "rt-multi-thread"] }

server/Cargo.toml

@@ -32,8 +32,8 @@ futures = "0.3.31"
 headers = "0.4.0"
 html-escape = "0.2.13"
 ical = "0.11"
-letterbox-notmuch = { path = "../notmuch", version = "0.17.49", registry = "xinu" }
-letterbox-shared = { path = "../shared", version = "0.17.49", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17", registry = "xinu" }
+letterbox-shared = { path = "../shared", version = "0.17", registry = "xinu" }
 linkify = "0.10.0"
 lol_html = "2.3.0"
 mailparse = "0.16.1"
@@ -42,7 +42,7 @@ memmap = "0.7.0"
 quick-xml = { version = "0.38.1", features = ["serialize"] }
 regex = "1.11.1"
 reqwest = { version = "0.12.15", features = ["blocking"] }
-scraper = "0.24.0"
+scraper = "0.25.0"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio", "chrono"] }
@@ -56,7 +56,7 @@ urlencoding = "2.1.3"
 #xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
 #xtracing = { path = "../../xtracing" }
 xtracing = { version = "0.3.2", registry = "xinu" }
-zip = "5.0.0"
+zip = "6.0.0"
 
 
 [build-dependencies]

shared/Cargo.toml

@@ -12,7 +12,7 @@ version.workspace = true
 
 [dependencies]
 build-info = "0.0.42"
-letterbox-notmuch = { path = "../notmuch", version = "0.17.49", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17", registry = "xinu" }
 regex = "1.11.1"
 serde = { version = "1.0.219", features = ["derive"] }
 sqlx = "0.8.5"

web/Cargo.toml

@@ -24,7 +24,7 @@ serde = { version = "1.0.219", features = ["derive"] }
 itertools = "0.14.0"
 serde_json = { version = "1.0.140", features = ["unbounded_depth"] }
 chrono = "0.4.40"
-graphql_client = "0.14.0"
+graphql_client = "0.15.0"
 thiserror = "2.0.12"
 gloo-net = { version = "0.6.0", features = ["json", "serde_json"] }
 human_format = "1.1.0"
@@ -33,7 +33,7 @@ wasm-bindgen = "=0.2.100"
 uuid = { version = "1.16.0", features = [
   "js",
 ] } # direct dep to set js feature, prevents Rng issues
-letterbox-shared = { path = "../shared/", version = "0.17.49", registry = "xinu" }
+letterbox-shared = { path = "../shared/", version = "0.17", registry = "xinu" }
 seed_hooks = { version = "0.4.1", registry = "xinu" }
 strum_macros = "0.27.1"
 gloo-console = "0.3.0"

web/src/state.rs

@@ -291,6 +291,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             first,
             last,
         } => {
+            model.refreshing_state = RefreshingState::Loading;
             let (after, before, first, last) = match (after.as_ref(), before.as_ref(), first, last)
             {
                 // If no pagination set, set reasonable defaults
@@ -316,25 +317,32 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             });
         }
         Msg::FrontPageResult(Err(e)) => {
-            error!("error FrontPageResult: {e:?}");
+            let msg = format!("error FrontPageResult: {e:?}");
+            error!("{msg}");
+            model.refreshing_state = RefreshingState::Error(msg);
         }
         Msg::FrontPageResult(Ok(graphql_client::Response {
             data: None,
             errors: None,
             ..
         })) => {
-            error!("FrontPageResult no data or errors, should not happen");
+            let msg = format!("FrontPageResult no data or errors, should not happen");
+            error!("{msg}");
+            model.refreshing_state = RefreshingState::Error(msg);
         }
         Msg::FrontPageResult(Ok(graphql_client::Response {
             data: None,
             errors: Some(e),
             ..
         })) => {
-            error!("FrontPageResult error: {e:?}");
+            let msg = format!("FrontPageResult error: {e:?}");
+            error!("{msg}");
+            model.refreshing_state = RefreshingState::Error(msg);
         }
         Msg::FrontPageResult(Ok(graphql_client::Response {
             data: Some(data), ..
         })) => {
+            model.refreshing_state = RefreshingState::None;
             model.tags = Some(
                 data.tags
                     .into_iter()
@@ -374,6 +382,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
         }
 
         Msg::ShowThreadRequest { thread_id } => {
+            model.refreshing_state = RefreshingState::Loading;
             orders.skip().perform_cmd(async move {
                 Msg::ShowThreadResult(
                     send_graphql(graphql::ShowThreadQuery::build_query(
@@ -386,6 +395,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
         Msg::ShowThreadResult(Ok(graphql_client::Response {
             data: Some(data), ..
         })) => {
+            model.refreshing_state = RefreshingState::None;
             model.tags = Some(
                 data.tags
                     .into_iter()
@@ -425,9 +435,12 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             orders.send_msg(Msg::WindowScrolled);
         }
         Msg::ShowThreadResult(bad) => {
-            error!("show_thread_query error: {bad:#?}");
+            let msg = format!("show_thread_query error: {bad:#?}");
+            error!("{msg}");
+            model.refreshing_state = RefreshingState::Error(msg);
         }
         Msg::CatchupRequest { query } => {
+            model.refreshing_state = RefreshingState::Loading;
             orders.perform_cmd(async move {
                 Msg::CatchupResult(
                     send_graphql::<_, graphql::catchup_query::ResponseData>(
@@ -442,6 +455,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
         Msg::CatchupResult(Ok(graphql_client::Response {
             data: Some(data), ..
         })) => {
+            model.refreshing_state = RefreshingState::None;
             let items = data.catchup;
             if items.is_empty() {
                 orders.send_msg(Msg::GoToSearchResults);
@@ -457,7 +471,9 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             }
         }
         Msg::CatchupResult(bad) => {
-            error!("catchup_query error: {bad:#?}");
+            let msg = format!("catchup_query error: {bad:#?}");
+            error!("{msg}");
+            model.refreshing_state = RefreshingState::Error(msg);
         }
         Msg::SelectionSetNone => {
             if let Context::SearchResult {

web/src/view/mod.rs

@@ -78,13 +78,16 @@ mod tw_classes {
 }
 
 pub fn view(model: &Model) -> Node<Msg> {
+    let is_loading = match model.refreshing_state {
+        RefreshingState::Loading => true,
+        _ => false,
+    };
     match &model.context {
         Context::None => normal_view(
             div![h1!["Loading"]],
             &model.versions,
             &model.query,
             &model.refreshing_state,
-            model.read_completion_ratio,
             &model.tags,
         ),
         Context::ThreadResult {
@@ -93,17 +96,23 @@ pub fn view(model: &Model) -> Node<Msg> {
         } => {
             if let Some(catchup) = &model.catchup {
                 catchup_view(
-                    thread(thread_data, open_messages, &model.content_el, true),
+                    thread(thread_data, open_messages, &model.content_el, true, 0.),
                     &catchup.items,
+                    is_loading,
                     model.read_completion_ratio,
                 )
             } else {
                 normal_view(
-                    thread(thread_data, open_messages, &model.content_el, false),
+                    thread(
+                        thread_data,
+                        open_messages,
+                        &model.content_el,
+                        false,
+                        model.read_completion_ratio,
+                    ),
                     &model.versions,
                     &model.query,
                     &model.refreshing_state,
-                    model.read_completion_ratio,
                     &model.tags,
                 )
             }
@@ -114,17 +123,17 @@ pub fn view(model: &Model) -> Node<Msg> {
         } => {
             if let Some(catchup) = &model.catchup {
                 catchup_view(
-                    news_post(post, &model.content_el, true),
+                    news_post(post, &model.content_el, true, 0.),
                     &catchup.items,
+                    is_loading,
                     model.read_completion_ratio,
                 )
             } else {
                 normal_view(
-                    news_post(post, &model.content_el, false),
+                    news_post(post, &model.content_el, false, model.read_completion_ratio),
                     &model.versions,
                     &model.query,
                     &model.refreshing_state,
-                    model.read_completion_ratio,
                     &model.tags,
                 )
             }
@@ -140,7 +149,6 @@ pub fn view(model: &Model) -> Node<Msg> {
             &model.versions,
             &model.query,
             &model.refreshing_state,
-            model.read_completion_ratio,
             &model.tags,
         ),
     }
@@ -151,7 +159,6 @@ fn normal_view(
     versions: &Version,
     query: &str,
     refreshing_state: &RefreshingState,
-    read_completion_ratio: f64,
     tags: &Option<Vec<Tag>>,
 ) -> Node<Msg> {
     div![
@@ -178,13 +185,13 @@ fn normal_view(
             content,
             view_header(query, refreshing_state, false),
         ],
-        reading_progress(read_completion_ratio),
     ]
 }
 
 fn catchup_view(
     content: Node<Msg>,
     items: &[CatchupItem],
+    is_loading: bool,
     read_completion_ratio: f64,
 ) -> Node<Msg> {
     div![
@@ -201,13 +208,34 @@ fn catchup_view(
                 "bg-black/50",
             ],
             div![
-                C!["absolute", "top-0", "right-4", "text-gray-500", "p-4"],
-                span![i![C!["fas", "fa-x"]]],
-                ev(Ev::Click, move |_| Msg::CatchupExit)
+                C!["absolute", "top-0", "left-4", "text-green-200", "p-4"],
+                IF!(is_loading=>span![i![C!["animate-spin", "fas", "fa-spinner"]]])
             ],
             h1![
                 C!["text-center"],
                 format!("{} left ", items.iter().filter(|i| !i.seen).count(),)
+            ],
+            div![
+                C!["absolute", "top-0", "right-4", "text-gray-500", "p-4"],
+                span![i![C!["fas", "fa-x"]]],
+                ev(Ev::Click, move |_| Msg::CatchupExit)
+            ],
+            div![
+                C![
+                    "absolute",
+                    "left-0",
+                    "right-0",
+                    "bottom-0",
+                    "w-full",
+                    "h-1",
+                    "bg-gray-200"
+                ],
+                div![
+                    C!["h-1", "bg-green-500"],
+                    style! {
+                        St::Width => format!("{}%", read_completion_ratio*100.)
+                    }
+                ]
             ]
         ],
         div![C!["mt-12", "mb-20"], content],
@@ -247,7 +275,6 @@ fn catchup_view(
                 ev(Ev::Click, |_| Msg::CatchupMarkAsRead)
             ]
         ],
-        reading_progress(read_completion_ratio)
     ]
 }
 
@@ -324,8 +351,8 @@ fn search_results(
                     attrs! {
                         At::Href => urls::thread(&tid)
                     },
-                    div![title_break, &r.subject],
-                    span![C!["text-xs"], pretty_authors(&r.authors)],
+                    div![C!["line-clamp-2"], title_break, &r.subject],
+                    span![C!["line-clamp-2", "text-xs"], pretty_authors(&r.authors)],
                     div![
                         C!["flex", "flex-wrap", "justify-between"],
                         span![tags_chiclet(&tags)],
@@ -1148,6 +1175,7 @@ fn thread(
     open_messages: &HashSet<String>,
     content_el: &ElRef<HtmlElement>,
     catchup_mode: bool,
+    read_completion_ratio: f64,
 ) -> Node<Msg> {
     // TODO(wathiede): show per-message subject if it changes significantly from top-level subject
     let subject = if thread.subject.is_empty() {
@@ -1232,7 +1260,8 @@ fn thread(
             el_ref(content_el),
             messages,
             IF!(!catchup_mode => click_to_top())
-        ]
+        ],
+        reading_progress(read_completion_ratio)
     ]
 }
 
@@ -1476,6 +1505,7 @@ fn news_post(
     post: &ShowThreadQueryThreadOnNewsPost,
     content_el: &ElRef<HtmlElement>,
     catchup_mode: bool,
+    read_completion_ratio: f64,
 ) -> Node<Msg> {
     let subject = &post.title;
     set_title(subject);
@@ -1563,6 +1593,7 @@ fn news_post(
             ]
         ],
         IF!(!catchup_mode => click_to_top()),
+        reading_progress(read_completion_ratio)
     ]
 }
 fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg> {