Compare commits

..

No commits in common. "8a6b3ff501971571454707bebef789156870e22e" and "fc845624194e454123edad4a3657b47a874be2cd" have entirely different histories.

6 changed files with 19 additions and 14 deletions

10
Cargo.lock generated
View File

@ -2965,7 +2965,7 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-notmuch" name = "letterbox-notmuch"
version = "0.10.3" version = "0.10.1"
dependencies = [ dependencies = [
"itertools 0.14.0", "itertools 0.14.0",
"log", "log",
@ -2980,14 +2980,14 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-procmail2notmuch" name = "letterbox-procmail2notmuch"
version = "0.10.3" version = "0.10.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
] ]
[[package]] [[package]]
name = "letterbox-server" name = "letterbox-server"
version = "0.10.3" version = "0.10.1"
dependencies = [ dependencies = [
"ammonia", "ammonia",
"anyhow", "anyhow",
@ -3030,7 +3030,7 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-shared" name = "letterbox-shared"
version = "0.10.3" version = "0.10.1"
dependencies = [ dependencies = [
"build-info", "build-info",
"letterbox-notmuch", "letterbox-notmuch",
@ -3039,7 +3039,7 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-web" name = "letterbox-web"
version = "0.10.3" version = "0.10.1"
dependencies = [ dependencies = [
"build-info", "build-info",
"build-info-build", "build-info-build",

View File

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

View File

@ -48,8 +48,8 @@ urlencoding = "2.1.3"
#xtracing = { path = "../../xtracing" } #xtracing = { path = "../../xtracing" }
#xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" } #xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
xtracing = { version = "0.3.0", registry = "xinu" } xtracing = { version = "0.3.0", registry = "xinu" }
letterbox-notmuch = { version = "0.10.3", path = "../notmuch", registry = "xinu" } letterbox-notmuch = { version = "0.10.1", path = "../notmuch", registry = "xinu" }
letterbox-shared = { version = "0.10.3", path = "../shared", registry = "xinu" } letterbox-shared = { version = "0.10.1", path = "../shared", registry = "xinu" }
[build-dependencies] [build-dependencies]
build-info-build = "0.0.40" build-info-build = "0.0.40"

View File

@ -12,5 +12,5 @@ version.workspace = true
[dependencies] [dependencies]
build-info = "0.0.40" build-info = "0.0.40"
letterbox-notmuch = { version = "0.10.3", path = "../notmuch", registry = "xinu" } letterbox-notmuch = { version = "0.10.1", path = "../notmuch", registry = "xinu" }
serde = { version = "1.0.147", features = ["derive"] } serde = { version = "1.0.147", features = ["derive"] }

View File

@ -33,8 +33,8 @@ wasm-bindgen = "=0.2.100"
uuid = { version = "1.13.1", features = [ uuid = { version = "1.13.1", features = [
"js", "js",
] } # direct dep to set js feature, prevents Rng issues ] } # direct dep to set js feature, prevents Rng issues
letterbox-shared = { version = "0.10.3", path = "../shared", registry = "xinu" } letterbox-shared = { version = "0.10.1", path = "../shared", registry = "xinu" }
letterbox-notmuch = { version = "0.10.3", path = "../notmuch", registry = "xinu" } letterbox-notmuch = { version = "0.10.1", path = "../notmuch", registry = "xinu" }
seed_hooks = { version = "0.4.0", registry = "xinu" } seed_hooks = { version = "0.4.0", registry = "xinu" }
strum_macros = "0.27.1" strum_macros = "0.27.1"

View File

@ -118,7 +118,7 @@ fn on_url_changed(old: &Url, mut new: Url) -> Msg {
// `update` describes how to handle each `Msg`. // `update` describes how to handle each `Msg`.
pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) { pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
info!("update({})", msg); debug!("update({})", msg);
match msg { match msg {
Msg::Noop => {} Msg::Noop => {}
Msg::RefreshStart => { Msg::RefreshStart => {
@ -293,6 +293,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
}); });
} }
Msg::FrontPageResult(Err(e)) => { Msg::FrontPageResult(Err(e)) => {
orders.send_msg(Msg::Reload);
error!("error FrontPageResult: {e:?}"); error!("error FrontPageResult: {e:?}");
} }
Msg::FrontPageResult(Ok(graphql_client::Response { Msg::FrontPageResult(Ok(graphql_client::Response {
@ -300,6 +301,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
errors: None, errors: None,
.. ..
})) => { })) => {
orders.send_msg(Msg::Reload);
error!("FrontPageResult no data or errors, should not happen"); error!("FrontPageResult no data or errors, should not happen");
} }
Msg::FrontPageResult(Ok(graphql_client::Response { Msg::FrontPageResult(Ok(graphql_client::Response {
@ -307,6 +309,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
errors: Some(e), errors: Some(e),
.. ..
})) => { })) => {
orders.send_msg(Msg::Reload);
error!("FrontPageResult error: {e:?}"); error!("FrontPageResult error: {e:?}");
} }
Msg::FrontPageResult(Ok(graphql_client::Response { Msg::FrontPageResult(Ok(graphql_client::Response {
@ -402,6 +405,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
orders.send_msg(Msg::WindowScrolled); orders.send_msg(Msg::WindowScrolled);
} }
Msg::ShowThreadResult(bad) => { Msg::ShowThreadResult(bad) => {
orders.send_msg(Msg::Reload);
error!("show_thread_query error: {bad:#?}"); error!("show_thread_query error: {bad:#?}");
} }
Msg::CatchupRequest { query } => { Msg::CatchupRequest { query } => {
@ -434,6 +438,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
} }
} }
Msg::CatchupResult(bad) => { Msg::CatchupResult(bad) => {
orders.send_msg(Msg::Reload);
error!("catchup_query error: {bad:#?}"); error!("catchup_query error: {bad:#?}");
} }
Msg::SelectionSetNone => { Msg::SelectionSetNone => {
@ -594,12 +599,12 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
model.read_completion_ratio = ratio; model.read_completion_ratio = ratio;
} }
Msg::UpdateServerVersion(version) => { Msg::UpdateServerVersion(version) => {
// Only git versions contain dash, don't autoreload there if version != model.versions.client {
if !version.contains('-') && version != model.versions.client {
warn!( warn!(
"Server ({}) and client ({}) version mismatch, reloading", "Server ({}) and client ({}) version mismatch, reloading",
version, model.versions.client version, model.versions.client
); );
#[cfg(not(debug_assertions))]
orders.send_msg(Msg::Reload); orders.send_msg(Msg::Reload);
} }
model.versions.server = Some(version); model.versions.server = Some(version);