wathiede/letterbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases Wiki Activity

web: clean up version string and reload on mismatch

Browse Source
This commit is contained in:
Bill Thiede 2024-09-01 15:02:34 -07:00
parent 1f393f1c7f
commit a8c5a164ff
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shared/src/lib.rs
View File

@ -39,7 +39,7 @@ pub fn build_version(bi:fn()->&'static BuildInfo) -> String {
let Some(VersionControl::Git(git)) = git else { let Some(VersionControl::Git(git)) = git else {
return String::new(); return String::new();
}; };
let mut s = vec![git.commit_short_id.clone()]; let mut s = vec!["-".to_string(), git.commit_short_id.clone()];
if git.dirty { if git.dirty {
s.push(".+".to_string()); s.push(".+".to_string());
} }
@ -51,5 +51,5 @@ pub fn build_version(bi:fn()->&'static BuildInfo) -> String {
} }
let bi = bi(); let bi = bi();
format!("{}-{}", bi.crate_info.version, commit(&bi.version_control)).to_string() format!("v{}{}", bi.crate_info.version, commit(&bi.version_control)).to_string()
} }

3
web/src/state.rs
View File

@ -519,9 +519,10 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
Msg::UpdateServerVersion(version) => { Msg::UpdateServerVersion(version) => {
if version != model.versions.client { if version != model.versions.client {
warn!( warn!(
"Server ({}) and client ({}) version mismatch", "Server ({}) and client ({}) version mismatch, reloading",
version, model.versions.client version, model.versions.client
); );
orders.send_msg(Msg::Reload);
} }
model.versions.server = Some(version); model.versions.server = Some(version);
} }