Skip to content

LordOS — a free, fast and secure GNU/Linux distribution based on Debian, with its own desktop environment: display server and Wayland compositor in C, a React UI engine on QuickJS, and private native apps.

Imager: say when nothing on the drive was touched; eject counts if the medium came out

Federico Pereiraa3a946090946
diff --git a/apps/imager/index.jsx b/apps/imager/index.jsx
index 7315812..2db5fce 100644
--- a/apps/imager/index.jsx
+++ b/apps/imager/index.jsx
@@ -25,7 +25,7 @@ export const Icon = ImagerIcon;
// Lumo's pose and tip for each step
const HELP = {
device: 'wave', image: 'shield', custom: 'confused', storage: 'wave', erase: 'shield', customise: 'wave', write: 'shield',
- writing: 'run', failed: 'confused', cancelled: 'shield', 'tab.general': 'wave', 'tab.user': 'shield', 'tab.wifi': 'wave', 'tab.remote': 'shield',
+ writing: 'run', failed: 'confused', cancelled: 'shield', untouched: 'confused', 'tab.general': 'wave', 'tab.user': 'shield', 'tab.wifi': 'wave', 'tab.remote': 'shield',
'tab.look': 'celebrate', 'tab.cooling': 'run', 'tab.more': 'shield',
};
@@ -70,7 +70,7 @@ function Sidebar({ s }) {
const steps = STEPS.filter((id) => id !== 'customise' || dev.customise);
const cur = s.step === 'done' ? steps.length : steps.indexOf(s.step);
const writing = isBusy(s.job) || s.job?.phase === 'failed';
- let tip = s.step === 'write' && writing ? (s.job.phase === 'failed' ? (s.job.cancelledByUser ? 'cancelled' : 'failed') : 'writing') : s.step;
+ let tip = s.step === 'write' && writing ? (s.job.phase === 'failed' ? (s.job.cancelledByUser ? 'cancelled' : s.job.wrote ? 'failed' : 'untouched') : 'writing') : s.step;
if (s.step === 'storage' && s.drive) tip = 'erase';
if (s.step === 'image' && s.image && !s.image.official) tip = 'custom';
if (s.step === 'customise' && s.customise) tip = `tab.${s.tab}`;
diff --git a/apps/imager/state.js b/apps/imager/state.js
index 64a7257..48cdfdd 100644
--- a/apps/imager/state.js
+++ b/apps/imager/state.js
@@ -85,7 +85,7 @@ function progress(phase, done, total) {
if (inst >= 0) speed = speed ? speed * 0.8 + inst * 0.2 : inst;
}
const eta = speed > 0 && total > done ? (total - done) / speed : null;
- setJob({ phase, done, total, speed, eta, last: { t, done } });
+ setJob({ phase, done, total, speed, eta, last: { t, done }, ...(phase === 'write' && done > 0 ? { wrote: true } : {}) });
}
export async function run() {
diff --git a/apps/imager/ui/StepWrite.jsx b/apps/imager/ui/StepWrite.jsx
index 2f704a5..318935a 100644
--- a/apps/imager/ui/StepWrite.jsx
+++ b/apps/imager/ui/StepWrite.jsx
@@ -70,7 +70,7 @@ function Progress({ s }) {
return (
<View>
<StepHeader title={tr(failed ? (j.cancelledByUser ? 'imager.write.cancelledTitle' : 'imager.write.failedTitle') : 'imager.write.title', { name: s.drive.model })}
- text={tr(failed ? (j.cancelledByUser ? 'imager.write.cancelledText' : 'imager.write.failedText') : 'imager.write.text')} />
+ text={tr(failed ? (!j.wrote ? 'imager.write.untouchedText' : j.cancelledByUser ? 'imager.write.cancelledText' : 'imager.write.failedText') : 'imager.write.text')} />
<View style={{ flexDirection: 'row', alignItems: 'center', gap: spacing.l, marginBottom: spacing.xl }}>
<DriveArt transport={s.drive.transport} size={48} />
<View style={{ flex: 1, gap: 8 }}>
diff --git a/assets/locales/en/imager.json b/assets/locales/en/imager.json
index 8d66d30..2003fe7 100644
--- a/assets/locales/en/imager.json
+++ b/assets/locales/en/imager.json
@@ -322,6 +322,8 @@
"tip.tab.user.title": "Only a hash goes on the card",
"tip.tab.wifi.text": "I store the network's derived key, not the password you type.",
"tip.tab.wifi.title": "No Wi-Fi password on the card",
+ "tip.untouched.text": "The drive is as it was. Read what happened and try again.",
+ "tip.untouched.title": "Nothing was touched",
"tip.write.text": "Look over the summary. After you confirm, the drive is erased and written.",
"tip.write.title": "Last check",
"tip.writing.text": "Don't remove the drive. I'll read everything back to be sure it's right.",
@@ -385,5 +387,6 @@
"write.start": "Erase and write",
"write.text": "Keep the drive plugged in. This takes a few minutes.",
"write.title": "Writing to {name}",
+ "write.untouchedText": "Nothing on the drive was changed.",
"write.why": "What happened"
}
diff --git a/assets/locales/es/imager.json b/assets/locales/es/imager.json
index 020428b..76fb2f0 100644
--- a/assets/locales/es/imager.json
+++ b/assets/locales/es/imager.json
@@ -322,6 +322,8 @@
"tip.tab.user.title": "En la tarjeta solo va un hash",
"tip.tab.wifi.text": "Guardo la clave derivada de la red, no la contraseña que escribís.",
"tip.tab.wifi.title": "Sin contraseña de Wi-Fi en la tarjeta",
+ "tip.untouched.text": "La unidad quedó como estaba. Leé qué pasó y probá de nuevo.",
+ "tip.untouched.title": "No se tocó nada",
"tip.write.text": "Revisá el resumen. Cuando confirmes, la unidad se borra y se graba.",
"tip.write.title": "Último repaso",
"tip.writing.text": "No saques la unidad. Voy a leer todo de vuelta para asegurarme de que quedó bien.",
@@ -385,5 +387,6 @@
"write.start": "Borrar y grabar",
"write.text": "No desconectes la unidad. Tarda unos minutos.",
"write.title": "Grabando en {name}",
+ "write.untouchedText": "No se cambió nada en la unidad.",
"write.why": "Qué pasó"
}
diff --git a/assets/locales/pt/imager.json b/assets/locales/pt/imager.json
index 9879140..e3e12f4 100644
--- a/assets/locales/pt/imager.json
+++ b/assets/locales/pt/imager.json
@@ -322,6 +322,8 @@
"tip.tab.user.title": "No cartão vai só um hash",
"tip.tab.wifi.text": "Guardo a chave derivada da rede, não a senha que você digita.",
"tip.tab.wifi.title": "Sem senha do Wi-Fi no cartão",
+ "tip.untouched.text": "A unidade ficou como estava. Veja o que aconteceu e tente de novo.",
+ "tip.untouched.title": "Nada foi mexido",
"tip.write.text": "Confira o resumo. Quando você confirmar, a unidade é apagada e gravada.",
"tip.write.title": "Última conferida",
"tip.writing.text": "Não remova a unidade. Vou ler tudo de volta para ter certeza de que ficou certo.",
@@ -385,5 +387,6 @@
"write.start": "Apagar e gravar",
"write.text": "Mantenha a unidade conectada. Isso leva alguns minutos.",
"write.title": "Gravando em {name}",
+ "write.untouchedText": "Nada foi alterado na unidade.",
"write.why": "O que aconteceu"
}
diff --git a/desktop/imager/core/src/drives.rs b/desktop/imager/core/src/drives.rs
index 2b3976a..863a858 100644
--- a/desktop/imager/core/src/drives.rs
+++ b/desktop/imager/core/src/drives.rs
@@ -314,8 +314,11 @@ mod linux {
let block = zbus::blocking::Proxy::new(&c, "org.freedesktop.UDisks2", op.as_str(), "org.freedesktop.UDisks2.Block").map_err(|e| Error::new("imager.ejectFailed", e.to_string()))?;
let drive: zbus::zvariant::OwnedObjectPath = block.get_property("Drive").map_err(|e| Error::new("imager.ejectFailed", e.to_string()))?;
let dp = zbus::blocking::Proxy::new(&c, "org.freedesktop.UDisks2", drive.as_str(), "org.freedesktop.UDisks2.Drive").map_err(|e| Error::new("imager.ejectFailed", e.to_string()))?;
- let _ = dp.call_method("Eject", &(opts(),));
- dp.call_method("PowerOff", &(opts(),)).map(|_| ()).map_err(|e| Error::new("imager.ejectFailed", e.to_string()))
+ // Eject takes the medium out (a card reader, a stick); PowerOff then cuts a USB drive's power.
+ // Either one is enough for the drive to be removed safely.
+ let ejected = dp.call_method("Eject", &(opts(),));
+ let off = dp.call_method("PowerOff", &(opts(),));
+ if ejected.is_ok() || off.is_ok() { Ok(()) } else { Err(Error::new("imager.ejectFailed", off.err().map(|e| e.to_string()).unwrap_or_default())) }
}
fn part1(d: &Drive) -> String { if d.path.chars().last().is_some_and(|c| c.is_ascii_digit()) { format!("{}p1", d.path) } else { format!("{}1", d.path) } }