mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-18 08:15:29 +00:00
Merge pull request #508 from cdhdt/update-dialog-translations
craft-update: the update dialogs take the app's translator
This commit is contained in:
4 files changed
+451
-55
No files matched your search
+173
-34
@@ -4,6 +4,7 @@ use egui::{Align, Align2, Color32, Layout, RichText, Vec2};
|
||||
|
||||
use crate::app::App;
|
||||
use crate::release::Release;
|
||||
use crate::translate::{Note, Translate, button, english};
|
||||
use crate::updater::Status;
|
||||
|
||||
/// What the user chose in the startup update prompt.
|
||||
@@ -27,15 +28,63 @@ pub struct StartupPrompt {
|
||||
pub running_version: String,
|
||||
pub is_self_updating: bool,
|
||||
pub open: bool,
|
||||
/// A message shown as it is: an error from the network or the installer.
|
||||
pub status_message: Option<String>,
|
||||
/// One of the crate's own messages, translated each time the prompt draws. `status_message`
|
||||
/// wins when both are set, so an error written straight to it shows.
|
||||
/// [`StartupPrompt::set_note`] and [`StartupPrompt::set_message`] keep only one.
|
||||
pub status_note: Option<Note>,
|
||||
pub is_installing: bool,
|
||||
/// Puts the card's words in the interface language ([`crate::translate`]); English by default.
|
||||
pub translate: Translate,
|
||||
}
|
||||
|
||||
impl StartupPrompt {
|
||||
/// Creates a new prompt dialog state for the given app and newly discovered release.
|
||||
pub fn new(app: &'static App, release: Release, running_version: impl Into<String>) -> Self {
|
||||
let is_self_updating = crate::self_update::is_self_updating(app);
|
||||
Self { app, release, running_version: running_version.into(), is_self_updating, open: true, status_message: None, is_installing: false }
|
||||
Self {
|
||||
app,
|
||||
release,
|
||||
running_version: running_version.into(),
|
||||
is_self_updating,
|
||||
open: true,
|
||||
status_message: None,
|
||||
status_note: None,
|
||||
is_installing: false,
|
||||
translate: english,
|
||||
}
|
||||
}
|
||||
|
||||
/// Shows one of the crate's own messages, in the interface language whenever it draws.
|
||||
pub fn set_note(&mut self, note: Note) {
|
||||
self.status_note = Some(note);
|
||||
self.status_message = None;
|
||||
}
|
||||
|
||||
/// Shows `message` as it is (an error from elsewhere).
|
||||
pub fn set_message(&mut self, message: String) {
|
||||
self.status_note = None;
|
||||
self.status_message = Some(message);
|
||||
}
|
||||
|
||||
/// Clears the message.
|
||||
pub fn clear_message(&mut self) {
|
||||
self.status_note = None;
|
||||
self.status_message = None;
|
||||
}
|
||||
|
||||
/// The message the prompt shows, in the interface language: `status_message` (an error
|
||||
/// written to it), else the note.
|
||||
pub fn message(&self) -> Option<String> {
|
||||
self.status_message.clone().or_else(|| self.status_note.as_ref().map(|note| note.translated(self.translate)))
|
||||
}
|
||||
|
||||
/// The prompt with its words in the interface language ([`crate::translate`]).
|
||||
#[must_use]
|
||||
pub fn with_translator(mut self, translate: Translate) -> Self {
|
||||
self.translate = translate;
|
||||
self
|
||||
}
|
||||
|
||||
/// Renders the modal window on the given egui context.
|
||||
@@ -54,6 +103,8 @@ impl StartupPrompt {
|
||||
|
||||
let pal = Palette::new(ctx, self.app);
|
||||
let Palette { is_dark, card_bg, border_color, text_primary, text_muted, fill, on_fill } = pal;
|
||||
let t = self.translate;
|
||||
let version = self.release.version_label();
|
||||
|
||||
egui::Area::new(egui::Id::unique("craft_update.startup_prompt"))
|
||||
.anchor(Align2::CENTER_CENTER, Vec2::ZERO)
|
||||
@@ -67,14 +118,14 @@ impl StartupPrompt {
|
||||
.show(ui, |ui| {
|
||||
ui.set_width(400.0);
|
||||
style_card(ui, &pal);
|
||||
let version_line = format!("v{} to {}", self.running_version, self.release.version_label());
|
||||
if card_header(ui, self.app, &pal, true, &version_line) {
|
||||
let version_line = t("v{from} to {to}", &[("from", &self.running_version), ("to", &version)]);
|
||||
if card_header(ui, self.app, &pal, t, true, &version_line) {
|
||||
response = StartupPromptResponse::Later;
|
||||
}
|
||||
|
||||
ui.add_space(8.0);
|
||||
|
||||
if let Some(msg) = &self.status_message {
|
||||
if let Some(msg) = self.message() {
|
||||
let alert_bg = if is_dark { Color32::from_rgb(50, 30, 20) } else { Color32::from_rgb(255, 242, 235) };
|
||||
let alert_color = Color32::from_rgb(225, 95, 30);
|
||||
egui::Frame::new()
|
||||
@@ -92,11 +143,13 @@ impl StartupPrompt {
|
||||
if self.is_installing {
|
||||
ui.horizontal(|ui| {
|
||||
ui.spinner();
|
||||
ui.label(RichText::new("Downloading and installing update…").size(12.0).color(text_primary));
|
||||
ui.label(RichText::new(t("Downloading and installing update…", &[])).size(12.0).color(text_primary));
|
||||
});
|
||||
} else {
|
||||
let desc =
|
||||
format!("{} {} is available with the latest features and bug fixes.", self.app.name, self.release.version_label());
|
||||
let desc = t(
|
||||
"{app} {version} is available with the latest features and bug fixes.",
|
||||
&[("app", self.app.name), ("version", &version)],
|
||||
);
|
||||
ui.label(RichText::new(desc).size(12.5).color(text_muted));
|
||||
}
|
||||
|
||||
@@ -110,9 +163,9 @@ impl StartupPrompt {
|
||||
ui.with_layout(Layout::left_to_right(Align::Center), |ui| {
|
||||
ui.set_min_height(26.0);
|
||||
// Body text, so it reads on any card; the underline carries the accent.
|
||||
let link =
|
||||
ui.add(egui::Label::new(RichText::new("What's new").size(11.5).color(text_primary)).sense(egui::Sense::click()));
|
||||
link.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Link, true, "What's new"));
|
||||
let whats_new = t("What's new", &[]);
|
||||
let link = ui.add(egui::Label::new(RichText::new(&whats_new).size(11.5).color(text_primary)).sense(egui::Sense::click()));
|
||||
link.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Link, true, &whats_new));
|
||||
let y = link.rect.bottom() - 0.5;
|
||||
ui.painter()
|
||||
.line_segment([egui::pos2(link.rect.left(), y), egui::pos2(link.rect.right(), y)], egui::Stroke::new(1.0, fill));
|
||||
@@ -130,7 +183,7 @@ impl StartupPrompt {
|
||||
|
||||
ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
|
||||
if self.is_installing {
|
||||
let dismiss_btn = egui::Button::new(RichText::new("DISMISS").size(10.5).monospace().color(text_muted))
|
||||
let dismiss_btn = egui::Button::new(RichText::new(button(t, "Dismiss")).size(10.5).monospace().color(text_muted))
|
||||
.corner_radius(egui::CornerRadius::ZERO)
|
||||
.min_size(Vec2::new(72.0, 26.0));
|
||||
if ui.add(dismiss_btn).clicked() {
|
||||
@@ -138,25 +191,27 @@ impl StartupPrompt {
|
||||
}
|
||||
} else {
|
||||
if self.is_self_updating {
|
||||
let update_btn =
|
||||
egui::Button::new(RichText::new("UPDATE AND RESTART").size(10.5).strong().monospace().color(on_fill))
|
||||
.fill(fill)
|
||||
.corner_radius(egui::CornerRadius::ZERO)
|
||||
.min_size(Vec2::new(140.0, 26.0));
|
||||
let update_btn = egui::Button::new(
|
||||
RichText::new(button(t, "Update and Restart")).size(10.5).strong().monospace().color(on_fill),
|
||||
)
|
||||
.fill(fill)
|
||||
.corner_radius(egui::CornerRadius::ZERO)
|
||||
.min_size(Vec2::new(140.0, 26.0));
|
||||
if ui.add(update_btn).clicked() {
|
||||
response = StartupPromptResponse::UpdateAndRestart;
|
||||
}
|
||||
} else {
|
||||
let dl_btn = egui::Button::new(RichText::new("DOWNLOAD").size(10.5).strong().monospace().color(on_fill))
|
||||
.fill(fill)
|
||||
.corner_radius(egui::CornerRadius::ZERO)
|
||||
.min_size(Vec2::new(90.0, 26.0));
|
||||
let dl_btn =
|
||||
egui::Button::new(RichText::new(button(t, "Download")).size(10.5).strong().monospace().color(on_fill))
|
||||
.fill(fill)
|
||||
.corner_radius(egui::CornerRadius::ZERO)
|
||||
.min_size(Vec2::new(90.0, 26.0));
|
||||
if ui.add(dl_btn).clicked() {
|
||||
response = StartupPromptResponse::Download;
|
||||
}
|
||||
}
|
||||
|
||||
let later_btn = egui::Button::new(RichText::new("LATER").size(10.5).monospace().color(text_primary))
|
||||
let later_btn = egui::Button::new(RichText::new(button(t, "Later")).size(10.5).monospace().color(text_primary))
|
||||
.corner_radius(egui::CornerRadius::ZERO)
|
||||
.min_size(Vec2::new(65.0, 26.0));
|
||||
if ui.add(later_btn).clicked() {
|
||||
@@ -238,8 +293,8 @@ fn style_card(ui: &mut egui::Ui, pal: &Palette) {
|
||||
}
|
||||
|
||||
/// Header row: app icon (or its initial in a badge), name, developer, `second_line` and a close
|
||||
/// button. `update_pill` adds the "UPDATE" chip. True when the close button was clicked.
|
||||
fn card_header(ui: &mut egui::Ui, app: &App, pal: &Palette, update_pill: bool, second_line: &str) -> bool {
|
||||
/// button, worded by `t`. `update_pill` adds the "UPDATE" chip. True when the close button was clicked.
|
||||
fn card_header(ui: &mut egui::Ui, app: &App, pal: &Palette, t: Translate, update_pill: bool, second_line: &str) -> bool {
|
||||
let Palette { text_primary, text_muted, fill, on_fill, .. } = *pal;
|
||||
let mut closed = false;
|
||||
ui.horizontal(|ui| {
|
||||
@@ -259,12 +314,12 @@ fn card_header(ui: &mut egui::Ui, app: &App, pal: &Palette, update_pill: bool, s
|
||||
ui.spacing_mut().item_spacing.y = 2.0;
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(RichText::new(app.name).size(15.0).strong().color(text_primary));
|
||||
ui.label(RichText::new(format!("by {}", app.developer)).size(11.5).color(text_muted));
|
||||
ui.label(RichText::new(t("by {developer}", &[("developer", app.developer)])).size(11.5).color(text_muted));
|
||||
if update_pill {
|
||||
// A chip, not accent-coloured text: small accent text misses WCAG's 4.5:1 for
|
||||
// several apps (PdfCraft's red on the dark card, amber on the light one).
|
||||
egui::Frame::new().fill(fill).inner_margin(egui::Margin::symmetric(4, 1)).show(ui, |ui| {
|
||||
ui.label(RichText::new("UPDATE").size(10.0).monospace().color(on_fill));
|
||||
ui.label(RichText::new(button(t, "Update")).size(10.0).monospace().color(on_fill));
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -276,7 +331,7 @@ fn card_header(ui: &mut egui::Ui, app: &App, pal: &Palette, update_pill: bool, s
|
||||
ui.with_layout(Layout::right_to_left(Align::Min), |ui| {
|
||||
// Two strokes, not a "✕" glyph: none of the bundled faces has U+2715.
|
||||
let (rect, close) = ui.allocate_exact_size(Vec2::splat(18.0), egui::Sense::click());
|
||||
close.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, "Close"));
|
||||
close.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, t("Close", &[])));
|
||||
let color = if close.hovered() { text_primary } else { text_muted };
|
||||
let (center, reach) = (rect.center(), 4.5);
|
||||
let stroke = egui::Stroke::new(1.5, color);
|
||||
@@ -313,12 +368,20 @@ pub enum CheckResultResponse {
|
||||
pub struct CheckResultDialog {
|
||||
app: &'static App,
|
||||
running_version: &'static str,
|
||||
translate: Translate,
|
||||
}
|
||||
|
||||
impl CheckResultDialog {
|
||||
/// A dialog for `app`, which is running `running_version`.
|
||||
pub fn new(app: &'static App, running_version: &'static str) -> Self {
|
||||
Self { app, running_version }
|
||||
Self { app, running_version, translate: english }
|
||||
}
|
||||
|
||||
/// The dialog with its words in the interface language ([`crate::translate`]).
|
||||
#[must_use]
|
||||
pub fn with_translator(mut self, translate: Translate) -> Self {
|
||||
self.translate = translate;
|
||||
self
|
||||
}
|
||||
|
||||
/// Draws the modal card for `status` and returns what the user chose. [`Status::Idle`] draws
|
||||
@@ -337,6 +400,7 @@ impl CheckResultDialog {
|
||||
|
||||
let pal = Palette::new(ctx, self.app);
|
||||
let Palette { card_bg, border_color, text_primary, text_muted, fill, on_fill, .. } = pal;
|
||||
let t = self.translate;
|
||||
egui::Area::new(egui::Id::unique("craft_update.check_result")).anchor(Align2::CENTER_CENTER, Vec2::ZERO).order(egui::Order::Foreground).show(
|
||||
ctx,
|
||||
|ui| {
|
||||
@@ -348,7 +412,7 @@ impl CheckResultDialog {
|
||||
.show(ui, |ui| {
|
||||
ui.set_width(400.0);
|
||||
style_card(ui, &pal);
|
||||
if card_header(ui, self.app, &pal, false, &format!("v{}", self.running_version)) {
|
||||
if card_header(ui, self.app, &pal, t, false, &format!("v{}", self.running_version)) {
|
||||
response = CheckResultResponse::Close;
|
||||
}
|
||||
ui.add_space(8.0);
|
||||
@@ -357,19 +421,24 @@ impl CheckResultDialog {
|
||||
Status::Checking => {
|
||||
ui.horizontal(|ui| {
|
||||
ui.spinner();
|
||||
ui.label(RichText::new("Checking for updates…").size(12.5).color(text_primary));
|
||||
ui.label(RichText::new(t("Checking for updates…", &[])).size(12.5).color(text_primary));
|
||||
});
|
||||
}
|
||||
Status::UpToDate => {
|
||||
let text = format!("{} {} is the newest version available.", self.app.name, self.running_version);
|
||||
let text = t(
|
||||
"{app} {version} is the newest version available.",
|
||||
&[("app", self.app.name), ("version", self.running_version)],
|
||||
);
|
||||
ui.label(RichText::new(text).size(12.5).color(text_muted));
|
||||
}
|
||||
Status::Failed(error) => {
|
||||
let alert_color = Color32::from_rgb(225, 95, 30);
|
||||
ui.label(RichText::new("Could not check for updates.").size(12.5).strong().color(alert_color));
|
||||
ui.label(RichText::new(t("Could not check for updates.", &[])).size(12.5).strong().color(alert_color));
|
||||
ui.add(egui::Label::new(RichText::new(error).size(12.0).color(text_muted)).selectable(true));
|
||||
ui.label(
|
||||
RichText::new(format!("All releases are listed at {}", self.app.releases_url())).size(11.5).color(text_muted),
|
||||
RichText::new(t("All releases are listed at {url}", &[("url", &self.app.releases_url())]))
|
||||
.size(11.5)
|
||||
.color(text_muted),
|
||||
);
|
||||
}
|
||||
Status::Idle => {}
|
||||
@@ -382,7 +451,7 @@ impl CheckResultDialog {
|
||||
ui.add_space(8.0);
|
||||
ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
|
||||
ui.set_min_height(26.0);
|
||||
let ok = egui::Button::new(RichText::new("OK").size(10.5).strong().monospace().color(on_fill))
|
||||
let ok = egui::Button::new(RichText::new(button(t, "OK")).size(10.5).strong().monospace().color(on_fill))
|
||||
.fill(fill)
|
||||
.corner_radius(egui::CornerRadius::ZERO)
|
||||
.min_size(Vec2::new(65.0, 26.0));
|
||||
@@ -390,7 +459,7 @@ impl CheckResultDialog {
|
||||
response = CheckResultResponse::Close;
|
||||
}
|
||||
if matches!(status, Status::Failed(_)) {
|
||||
let again = egui::Button::new(RichText::new("CHECK AGAIN").size(10.5).monospace().color(text_primary))
|
||||
let again = egui::Button::new(RichText::new(button(t, "Check Again")).size(10.5).monospace().color(text_primary))
|
||||
.corner_radius(egui::CornerRadius::ZERO)
|
||||
.min_size(Vec2::new(100.0, 26.0));
|
||||
if ui.add(again).clicked() {
|
||||
@@ -502,7 +571,9 @@ mod tests {
|
||||
is_self_updating,
|
||||
open: true,
|
||||
status_message: None,
|
||||
status_note: None,
|
||||
is_installing: false,
|
||||
translate: english,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -820,6 +891,19 @@ mod tests {
|
||||
assert!(painted.lines().any(|l| l == "by Someone Else") && !painted.contains("by ArtCraft"), "{painted}");
|
||||
}
|
||||
|
||||
/// An error written straight to `status_message` shows even when a note was set before.
|
||||
#[test]
|
||||
fn a_literal_error_wins_over_a_stale_note() {
|
||||
let mut prompt = prompt_for(false);
|
||||
prompt.set_note(Note::new("Save or close your open work first; the update restarts the app.", &[]));
|
||||
prompt.status_message = Some("disk full".into());
|
||||
assert_eq!(prompt.message().as_deref(), Some("disk full"));
|
||||
prompt.set_note(Note::new("Close {app}", &[("app", "PhotoCraft")]));
|
||||
assert_eq!(prompt.message().as_deref(), Some("Close PhotoCraft"));
|
||||
prompt.clear_message();
|
||||
assert_eq!(prompt.message(), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn creates_startup_prompt_dialog() {
|
||||
let release = Release { version: crate::version::parse("0.2.0"), tag: "v0.2.0".to_string(), ..Release::default() };
|
||||
@@ -968,4 +1052,59 @@ mod tests {
|
||||
let escape = Event::Key { key: Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE };
|
||||
assert_eq!(run(&dark_context(), &Status::UpToDate, vec![escape]).0, CheckResultResponse::Close);
|
||||
}
|
||||
|
||||
/// A pseudo-language for the tests: every string bracketed, its values reordered first, so a
|
||||
/// string the card draws without asking the app shows up as plain English.
|
||||
fn pseudo(text: &str, args: &[(&str, &str)]) -> String {
|
||||
let values: Vec<&str> = args.iter().map(|(_, value)| *value).collect();
|
||||
format!("[{} | {}]", values.join(", "), text.split('{').next().unwrap_or(""))
|
||||
}
|
||||
|
||||
/// Each painted line of a translated card is the app's (bracketed), or a value the card
|
||||
/// doesn't translate (the badge initial, the app name, an error).
|
||||
fn assert_all_translated(painted: &str, untranslated: &[&str]) {
|
||||
for line in painted.lines() {
|
||||
assert!(line.starts_with('[') || untranslated.contains(&line), "{line:?} is not translated in {painted:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_prompt_draws_its_words_through_the_apps_translator() {
|
||||
for (self_updating, installing) in [(false, false), (true, false), (true, true)] {
|
||||
let ctx = dark_context();
|
||||
let mut prompt = StartupPrompt { is_installing: installing, ..prompt_for(self_updating) }.with_translator(pseudo);
|
||||
frame(&ctx, &mut prompt, Vec::new());
|
||||
let (_, output) = frame(&ctx, &mut prompt, Vec::new());
|
||||
let painted = painted_text(&output);
|
||||
assert_all_translated(&painted, &["P", "PhotoCraft"]);
|
||||
// Values reach the translation; buttons are looked up in title case and drawn in capitals.
|
||||
assert!(painted.contains("[0.1.0, 0.2.0 | v]") && painted.contains("[ArtCraft | by ]"), "{painted}");
|
||||
let button = match (self_updating, installing) {
|
||||
(_, true) => "[ | DISMISS]",
|
||||
(true, false) => "[ | UPDATE AND RESTART]",
|
||||
(false, false) => "[ | DOWNLOAD]",
|
||||
};
|
||||
assert!(painted.contains(button) && painted.contains("[ | UPDATE]"), "{painted}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_result_dialog_draws_its_words_through_the_apps_translator() {
|
||||
let dialog = CheckResultDialog::new(&PHOTOCRAFT, "0.1.0").with_translator(pseudo);
|
||||
for status in [Status::Checking, Status::UpToDate, Status::Failed("no network".into())] {
|
||||
let ctx = dark_context();
|
||||
let mut output = None;
|
||||
for _ in 0..2 {
|
||||
let mut out = ctx.run_ui(RawInput { screen_rect: Some(screen()), ..RawInput::default() }, |ui| {
|
||||
dialog.show(ui.ctx(), &status);
|
||||
});
|
||||
out.textures_delta.clear();
|
||||
output = Some(out);
|
||||
}
|
||||
let painted = output.map(|o| painted_text(&o)).unwrap_or_default();
|
||||
// The version line is a number, and a failure's reason comes from the network as it is.
|
||||
assert_all_translated(&painted, &["P", "PhotoCraft", "v0.1.0", "no network"]);
|
||||
assert!(painted.contains("[ArtCraft | by ]"), "{painted}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -29,6 +29,7 @@ pub mod source;
|
||||
pub mod status;
|
||||
pub mod suite;
|
||||
pub mod time;
|
||||
pub mod translate;
|
||||
pub mod version;
|
||||
|
||||
#[cfg(feature = "egui")]
|
||||
|
||||
@@ -0,0 +1,118 @@
|
||||
//! The words the update dialogs and the [`Updater`](crate::updater::Updater) show, in the app's
|
||||
//! interface language.
|
||||
//!
|
||||
//! The crate keeps its text in English, and that English text is the lookup key, as in the
|
||||
//! craft-i18n catalogs. An app with translations passes a [`Translate`] function to
|
||||
//! `StartupPrompt::with_translator`, `CheckResultDialog::with_translator` and
|
||||
//! `Updater::with_translator`. The dialogs call it each time they draw a string, so a change of
|
||||
//! interface language shows on the next frame. Without one the text stays in English.
|
||||
//!
|
||||
//! A template names its values in braces (`{app} {version} is available…`) and the function
|
||||
//! gets the values beside it, so a translation can put them in another order. An app built on
|
||||
//! craft-i18n passes `|text, args| craft_i18n::fmt(i18n.t(lang, text), args)`. That also keeps a
|
||||
//! Latin app name in its place in a right-to-left sentence. Button labels are looked up in title
|
||||
//! case (`Later`, `Check Again`) and drawn in capitals, so the rows the app already has for its
|
||||
//! own buttons serve here too.
|
||||
//!
|
||||
//! The card otherwise draws only ASCII, so a font that lacks a glyph can't trip it. An app that
|
||||
//! translates it must have fonts for its translations, which it needs for its own interface anyway.
|
||||
|
||||
/// The English `text` (a key) in the interface language, its `{name}` placeholders filled from
|
||||
/// `args`. A `fn`, not a closure, so the dialogs stay `Copy` and `Debug`. An app's lookup reads
|
||||
/// the current language from its own state.
|
||||
pub type Translate = fn(text: &str, args: &[(&str, &str)]) -> String;
|
||||
|
||||
/// The [`Translate`] used when the app gives none: the English text, its placeholders filled.
|
||||
pub fn english(text: &str, args: &[(&str, &str)]) -> String {
|
||||
fill(text, args)
|
||||
}
|
||||
|
||||
/// `template` with each `{name}` in `args` replaced by its value, by the rules of
|
||||
/// `craft_i18n::fmt` (without its bidi isolates): a placeholder runs from a `{` to the next `}`,
|
||||
/// and one that `args` lacks stays as written, braces and all. An inserted value is never read as
|
||||
/// a template, so a value containing `{app}` stays intact.
|
||||
pub fn fill(template: &str, args: &[(&str, &str)]) -> String {
|
||||
let mut out = String::with_capacity(template.len());
|
||||
let mut rest = template;
|
||||
while let Some((before, after_open)) = rest.split_once('{') {
|
||||
out.push_str(before);
|
||||
let Some((name, after_close)) = after_open.split_once('}') else {
|
||||
out.push('{');
|
||||
rest = after_open;
|
||||
break;
|
||||
};
|
||||
match args.iter().find(|(key, _)| *key == name) {
|
||||
Some((_, value)) => out.push_str(value),
|
||||
None => {
|
||||
out.push('{');
|
||||
out.push_str(name);
|
||||
out.push('}');
|
||||
}
|
||||
}
|
||||
rest = after_close;
|
||||
}
|
||||
out.push_str(rest);
|
||||
out
|
||||
}
|
||||
|
||||
/// One of the crate's own messages in the startup prompt ("The update is installed…"), kept as
|
||||
/// its English text and values so it is translated each time the prompt draws: a change of
|
||||
/// interface language while it shows changes it too.
|
||||
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||
pub struct Note {
|
||||
/// The English text, the lookup key.
|
||||
pub text: &'static str,
|
||||
/// The values of its `{name}` placeholders.
|
||||
pub args: Vec<(&'static str, String)>,
|
||||
}
|
||||
|
||||
impl Note {
|
||||
pub fn new(text: &'static str, args: &[(&'static str, &str)]) -> Self {
|
||||
Self { text, args: args.iter().map(|(k, v)| (*k, (*v).to_owned())).collect() }
|
||||
}
|
||||
|
||||
/// The note in the interface language.
|
||||
pub fn translated(&self, translate: Translate) -> String {
|
||||
let args: Vec<(&str, &str)> = self.args.iter().map(|(k, v)| (*k, v.as_str())).collect();
|
||||
translate(self.text, &args)
|
||||
}
|
||||
}
|
||||
|
||||
/// A button label: `label` (title case, the lookup key) translated, then in capitals, as the card
|
||||
/// draws its buttons.
|
||||
pub(crate) fn button(translate: Translate, label: &str) -> String {
|
||||
translate(label, &[]).to_uppercase()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn placeholders_are_filled_and_values_are_not_templates() {
|
||||
assert_eq!(fill("{app} {version} is out", &[("app", "PhotoCraft"), ("version", "0.2.0")]), "PhotoCraft 0.2.0 is out");
|
||||
// Reordered, as a translation may do.
|
||||
assert_eq!(fill("{version}: {app}", &[("app", "A"), ("version", "1")]), "1: A");
|
||||
// Unknown and unclosed placeholders stay; a value holding a placeholder stays as it is.
|
||||
assert_eq!(fill("{nope} and {app", &[("app", "X")]), "{nope} and {app");
|
||||
// An unknown candidate stays whole through its closing brace, as craft_i18n::fmt keeps it.
|
||||
assert_eq!(fill("{bad {app}", &[("app", "X")]), "{bad {app}");
|
||||
assert_eq!(fill("{bad} {app}", &[("app", "X")]), "{bad} X");
|
||||
assert_eq!(fill("by {developer}", &[("developer", "{developer}")]), "by {developer}");
|
||||
assert_eq!(fill("é {app} ü", &[("app", "日本")]), "é 日本 ü");
|
||||
assert_eq!(fill("", &[]), "");
|
||||
assert_eq!(fill("{}", &[]), "{}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn english_is_the_default_and_buttons_are_capitals() {
|
||||
assert_eq!(english("{app} is ready", &[("app", "PdfCraft")]), "PdfCraft is ready");
|
||||
assert_eq!(button(english, "Check Again"), "CHECK AGAIN");
|
||||
fn french(text: &str, args: &[(&str, &str)]) -> String {
|
||||
fill(if text == "Later" { "Plus tard" } else { text }, args)
|
||||
}
|
||||
assert_eq!(button(french, "Later"), "PLUS TARD");
|
||||
let note = Note::new("Close {app} to finish", &[("app", "PdfCraft")]);
|
||||
assert_eq!(note.translated(english), "Close PdfCraft to finish");
|
||||
}
|
||||
}
|
||||
+159
-21
@@ -15,6 +15,7 @@ use std::time::Duration;
|
||||
use crate::dialog::{StartupPrompt, StartupPromptResponse};
|
||||
use crate::pins::{Choice, Pins};
|
||||
use crate::release::Release;
|
||||
use crate::translate::{Note, Translate, english};
|
||||
use crate::{App, Http, Paths, Platform, Stop, check_for_update, self_update};
|
||||
|
||||
/// Asks for the newest release (blocking; it runs on its own thread). Tests stand in for the network
|
||||
@@ -47,6 +48,38 @@ pub enum Action {
|
||||
|
||||
type Checked = Result<Option<Release>, String>;
|
||||
|
||||
/// Why an installation failed: the installer's own words, shown as they are, or the updater's,
|
||||
/// shown in the interface language.
|
||||
#[derive(Debug)]
|
||||
enum Failure {
|
||||
Installer(String),
|
||||
Updater(Note),
|
||||
}
|
||||
|
||||
impl Failure {
|
||||
/// The worker panicked.
|
||||
fn panicked() -> Self {
|
||||
Self::Updater(Note::new("The update failed unexpectedly.", &[]))
|
||||
}
|
||||
|
||||
/// The worker went away without an answer.
|
||||
fn dropped() -> Self {
|
||||
Self::Updater(Note::new("The update stopped unexpectedly.", &[]))
|
||||
}
|
||||
}
|
||||
|
||||
impl From<String> for Failure {
|
||||
fn from(e: String) -> Self {
|
||||
Self::Installer(e)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<&str> for Failure {
|
||||
fn from(e: &str) -> Self {
|
||||
Self::Installer(e.to_owned())
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Updater {
|
||||
app: &'static App,
|
||||
version: String,
|
||||
@@ -56,7 +89,7 @@ pub struct Updater {
|
||||
requested: bool,
|
||||
started: bool,
|
||||
check: Option<Receiver<Checked>>,
|
||||
install: Option<(Receiver<Result<(), String>>, Release)>,
|
||||
install: Option<(Receiver<Result<(), Failure>>, Release)>,
|
||||
prompt: Option<StartupPrompt>,
|
||||
restart: bool,
|
||||
/// An update is installed and waits for the app to exit; nothing starts a second one.
|
||||
@@ -65,6 +98,8 @@ pub struct Updater {
|
||||
pins_path: Option<PathBuf>,
|
||||
/// The launcher's choice for this app when it is not stable, as of the last check or offer.
|
||||
managed: Option<Choice>,
|
||||
/// Puts the prompt and its messages in the interface language ([`crate::translate`]).
|
||||
translate: Translate,
|
||||
}
|
||||
|
||||
impl Updater {
|
||||
@@ -85,9 +120,32 @@ impl Updater {
|
||||
installed: false,
|
||||
pins_path: None,
|
||||
managed: None,
|
||||
translate: english,
|
||||
}
|
||||
}
|
||||
|
||||
/// Words the startup prompt and the messages it shows with `translate`, in the app's
|
||||
/// interface language ([`crate::translate`]). Errors from the network stay as they came.
|
||||
#[must_use]
|
||||
pub fn with_translator(mut self, translate: Translate) -> Self {
|
||||
self.translate = translate;
|
||||
// A prompt already open (an offer made before) speaks the new language from its next draw.
|
||||
if let Some(prompt) = &mut self.prompt {
|
||||
prompt.translate = translate;
|
||||
}
|
||||
self
|
||||
}
|
||||
|
||||
/// The startup prompt for `release`, in the interface language.
|
||||
fn prompt_for(&self, release: Release) -> StartupPrompt {
|
||||
StartupPrompt::new(self.app, release, self.version.clone()).with_translator(self.translate)
|
||||
}
|
||||
|
||||
/// "The update is installed…", translated when the prompt draws.
|
||||
fn installed_note(&self) -> Note {
|
||||
Note::new("The update is installed. Close {app} to finish; it restarts by itself.", &[("app", self.app.name)])
|
||||
}
|
||||
|
||||
/// Replaces the network with `source` (tests).
|
||||
pub fn with_source(mut self, source: CheckSource) -> Self {
|
||||
self.source = Some(source);
|
||||
@@ -142,7 +200,7 @@ impl Updater {
|
||||
/// Opens the startup prompt for a release the app found itself.
|
||||
pub fn offer(&mut self, release: Release) {
|
||||
if self.install.is_none() && !self.installed && !self.read_choice() {
|
||||
self.prompt = Some(StartupPrompt::new(self.app, release, self.version.clone()));
|
||||
self.prompt = Some(self.prompt_for(release));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -211,7 +269,7 @@ impl Updater {
|
||||
Ok(Some(release)) => {
|
||||
self.status = Status::Idle;
|
||||
if self.prompt.is_none() && self.install.is_none() && !self.installed {
|
||||
self.prompt = Some(StartupPrompt::new(self.app, release, self.version.clone()));
|
||||
self.prompt = Some(self.prompt_for(release));
|
||||
}
|
||||
}
|
||||
Ok(None) => self.status = if requested { Status::UpToDate } else { Status::Idle },
|
||||
@@ -245,7 +303,7 @@ impl Updater {
|
||||
ctx.request_repaint_after(Duration::from_millis(100));
|
||||
None
|
||||
}
|
||||
Err(TryRecvError::Disconnected) => Some(Err("the update stopped unexpectedly".into())),
|
||||
Err(TryRecvError::Disconnected) => Some(Err(Failure::dropped())),
|
||||
};
|
||||
if let Some(outcome) = outcome {
|
||||
let release = self.install.take().map(|(_, release)| release);
|
||||
@@ -253,23 +311,29 @@ impl Updater {
|
||||
Ok(()) => {
|
||||
self.installed = true;
|
||||
self.restart = true;
|
||||
let note = self.installed_note();
|
||||
if let Some(prompt) = &mut self.prompt {
|
||||
prompt.is_installing = false;
|
||||
prompt.status_message =
|
||||
Some(format!("The update is installed. Close {} to finish; it restarts by itself.", self.app.name));
|
||||
prompt.set_note(note);
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
log::warn!("{} self-update failed: {e}", self.app.name);
|
||||
Err(failure) => {
|
||||
match &failure {
|
||||
Failure::Installer(e) => log::warn!("{} self-update failed: {e}", self.app.name),
|
||||
Failure::Updater(note) => log::warn!("{} self-update failed: {}", self.app.name, note.translated(english)),
|
||||
}
|
||||
// The prompt may have been dismissed meanwhile: bring it back with the reason.
|
||||
if self.prompt.is_none()
|
||||
&& let Some(release) = release
|
||||
{
|
||||
self.prompt = Some(StartupPrompt::new(self.app, release, self.version.clone()));
|
||||
self.prompt = Some(self.prompt_for(release));
|
||||
}
|
||||
if let Some(prompt) = &mut self.prompt {
|
||||
prompt.is_installing = false;
|
||||
prompt.status_message = Some(e);
|
||||
match failure {
|
||||
Failure::Installer(e) => prompt.set_message(e),
|
||||
Failure::Updater(note) => prompt.set_note(note),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -316,7 +380,7 @@ impl Updater {
|
||||
if can_start {
|
||||
self.start_install(ctx);
|
||||
} else if let Some(prompt) = &mut self.prompt {
|
||||
prompt.status_message = Some("Save or close your open work first; the update restarts the app.".into());
|
||||
prompt.set_note(Note::new("Save or close your open work first; the update restarts the app.", &[]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -325,25 +389,25 @@ impl Updater {
|
||||
if self.install.is_none() && !self.installed && self.read_choice() {
|
||||
return;
|
||||
}
|
||||
let installed_note = self.installed_note();
|
||||
let Some(prompt) = &mut self.prompt else { return };
|
||||
if self.installed {
|
||||
prompt.status_message = Some(format!("The update is installed. Close {} to finish; it restarts by itself.", self.app.name));
|
||||
prompt.set_note(installed_note);
|
||||
return;
|
||||
}
|
||||
let Some(installed) = self_update::current(self.app) else {
|
||||
prompt.status_message = Some("Cannot auto-update this installation type. Please download manually.".into());
|
||||
prompt.set_note(Note::new("Cannot auto-update this installation type. Please download manually.", &[]));
|
||||
prompt.is_installing = false;
|
||||
return;
|
||||
};
|
||||
prompt.is_installing = true;
|
||||
prompt.status_message = None;
|
||||
prompt.clear_message();
|
||||
let (tx, rx) = channel();
|
||||
let (app, version, ctx, release) = (self.app, self.version.clone(), ctx.clone(), prompt.release.clone());
|
||||
let worker_release = release.clone();
|
||||
let spawned = std::thread::Builder::new().name("self-update".into()).spawn(move || {
|
||||
let run = || install(app, &installed, worker_release, &version);
|
||||
let outcome =
|
||||
std::panic::catch_unwind(std::panic::AssertUnwindSafe(run)).unwrap_or_else(|_| Err("the update failed unexpectedly".into()));
|
||||
let run = || install(app, &installed, worker_release, &version).map_err(Failure::Installer);
|
||||
let outcome = std::panic::catch_unwind(std::panic::AssertUnwindSafe(run)).unwrap_or_else(|_| Err(Failure::panicked()));
|
||||
let _ = tx.send(outcome);
|
||||
ctx.request_repaint();
|
||||
});
|
||||
@@ -351,7 +415,7 @@ impl Updater {
|
||||
Ok(_) => self.install = Some((rx, release)),
|
||||
Err(e) => {
|
||||
prompt.is_installing = false;
|
||||
prompt.status_message = Some(format!("couldn't start the update ({e})"));
|
||||
prompt.set_note(Note::new("Couldn't start the update ({error})", &[("error", &e.to_string())]));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -578,11 +642,57 @@ mod tests {
|
||||
fn a_dropped_install_worker_is_an_error() {
|
||||
let ctx = egui::Context::default();
|
||||
let mut u = updater(Ok(None));
|
||||
let (tx, rx) = channel::<Result<(), String>>();
|
||||
let (tx, rx) = channel::<Result<(), Failure>>();
|
||||
u.install = Some((rx, newer()));
|
||||
drop(tx);
|
||||
u.tick(&ctx);
|
||||
assert!(u.prompt.as_ref().is_some_and(|p| p.status_message.is_some()));
|
||||
assert!(u.prompt.as_ref().is_some_and(|p| p.message().is_some()));
|
||||
}
|
||||
|
||||
/// A translator given after the prompt opened reaches it too.
|
||||
#[test]
|
||||
fn a_translator_given_later_reaches_the_open_prompt() {
|
||||
fn shout(text: &str, args: &[(&str, &str)]) -> String {
|
||||
crate::translate::fill(&text.to_uppercase(), args)
|
||||
}
|
||||
let ctx = egui::Context::default();
|
||||
let mut u = updater(Ok(None));
|
||||
u.offer(newer());
|
||||
u.request_install(&ctx, false);
|
||||
let mut u = u.with_translator(shout);
|
||||
let message = |u: &Updater| u.prompt.as_ref().and_then(StartupPrompt::message).unwrap_or_default();
|
||||
assert!(message(&u).starts_with("SAVE OR CLOSE"), "{}", message(&u));
|
||||
// And the prompts it opens later.
|
||||
u.prompt = None;
|
||||
u.offer(newer());
|
||||
u.request_install(&ctx, false);
|
||||
assert!(message(&u).starts_with("SAVE OR CLOSE"), "{}", message(&u));
|
||||
}
|
||||
|
||||
/// The updater's own failures (a dropped or panicking worker) are in the interface language;
|
||||
/// the installer's are shown as they came.
|
||||
#[test]
|
||||
fn the_updaters_own_failures_are_translated_and_the_installers_are_not() {
|
||||
fn shout(text: &str, args: &[(&str, &str)]) -> String {
|
||||
crate::translate::fill(&text.to_uppercase(), args)
|
||||
}
|
||||
let ctx = egui::Context::default();
|
||||
let message = |u: &Updater| u.prompt.as_ref().and_then(StartupPrompt::message).unwrap_or_default();
|
||||
for (failure, want) in [
|
||||
(Some(Failure::panicked()), "THE UPDATE FAILED UNEXPECTEDLY."),
|
||||
(None, "THE UPDATE STOPPED UNEXPECTEDLY."),
|
||||
(Some("disk full".into()), "disk full"),
|
||||
] {
|
||||
let mut u = updater(Ok(None)).with_translator(shout);
|
||||
let (tx, rx) = channel();
|
||||
u.install = Some((rx, newer()));
|
||||
match failure {
|
||||
Some(f) => assert!(tx.send(Err(f)).is_ok()),
|
||||
None => drop(tx),
|
||||
}
|
||||
u.tick(&ctx);
|
||||
assert_eq!(message(&u), want);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -608,7 +718,35 @@ mod tests {
|
||||
u.offer(newer());
|
||||
u.request_install(&ctx, false);
|
||||
assert!(u.install.is_none(), "nothing is scheduled while there is unsaved work");
|
||||
assert!(u.prompt.as_ref().is_some_and(|p| !p.is_installing && p.status_message.is_some()));
|
||||
assert!(u.prompt.as_ref().is_some_and(|p| !p.is_installing && p.message().is_some()));
|
||||
}
|
||||
|
||||
/// The updater's own messages follow the interface language while the prompt shows them:
|
||||
/// they are translated when it draws, not when they are set.
|
||||
#[test]
|
||||
fn the_prompts_own_messages_follow_a_language_change() {
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
static FRENCH: AtomicBool = AtomicBool::new(false);
|
||||
fn translate(text: &str, args: &[(&str, &str)]) -> String {
|
||||
let text = if FRENCH.load(Ordering::Relaxed) { format!("FR {text}") } else { text.to_owned() };
|
||||
crate::translate::fill(&text, args)
|
||||
}
|
||||
let ctx = egui::Context::default();
|
||||
let mut u = updater(Ok(None)).with_translator(translate);
|
||||
u.offer(newer());
|
||||
u.request_install(&ctx, false);
|
||||
let message = |u: &Updater| u.prompt.as_ref().and_then(StartupPrompt::message).unwrap_or_default();
|
||||
assert!(message(&u).starts_with("Save or close"), "{}", message(&u));
|
||||
FRENCH.store(true, Ordering::Relaxed);
|
||||
assert!(message(&u).starts_with("FR Save or close"), "{}", message(&u));
|
||||
// An installed update names the app, in the language of the moment.
|
||||
let (tx, rx) = channel();
|
||||
u.install = Some((rx, newer()));
|
||||
assert!(tx.send(Ok(())).is_ok());
|
||||
u.tick(&ctx);
|
||||
assert!(message(&u).starts_with("FR The update is installed. Close PhotoCraft"), "{}", message(&u));
|
||||
FRENCH.store(false, Ordering::Relaxed);
|
||||
assert!(message(&u).starts_with("The update is installed."), "{}", message(&u));
|
||||
}
|
||||
|
||||
/// One frame with the updater's prompt drawn.
|
||||
|
||||
Reference in new issue
Block a user