Compare commits

..
Author SHA1 Message Date
nvrl 795dd7edb0 feat(gui): offline basemap under the Places map
Places now draws the proton-map-rs basemap that Proton Gallery uses: seas by
depth, lakes, rivers, built-up areas, borders and town names, in light and
dark. Tiles render on two worker threads into the existing tile layer, so
caching, ancestor stand-ins and density restarts work as before. Opening
Places sends no request.

The OpenFreeMap street map stays opt-in and replaces the basemap while it
is turned on. Without the basemap file the map falls back to the coarse
Natural Earth outlines.

scripts/fetch-basemap.sh downloads basemap-v1.pmtiles and checks it against
a pinned SHA-256. The deb, rpm, tarball, local and AUR PKGBUILDs, COPR spec
and Nix package install it to /usr/share/proton-drive-linux. PDFS_BASEMAP
points the app at another copy.

The new credit and preference text is translated in every catalog.
2026-11-22 00:44:14 +01:00
nvrl 7be4c7db1e Merge pull request #122 from narrrl/feat/protect-queued-changes
feat: protect queued changes at shutdown and sign-out (B66)
2026-11-21 23:46:37 +01:00
nvrl 2b5d6f2436 feat: protect queued changes at shutdown and sign-out (B66)
While the queue holds changes the drain can send, the daemon holds a logind
shutdown inhibitor through systemd-inhibit, so desktops show why a power-off
is held up. Parked transient files and changes that need the user never hold
it. pdfs sync flush retries failed changes and waits for the queue, exiting 3
when what is left needs the user and 4 on timeout. Signing out, in the app or
with pdfs logout, says how many changes are not on Proton Drive yet.
2026-11-21 23:42:54 +01:00
nvrl ff8ee9d997 Merge pull request #121 from narrrl/perf/takeout-parallel
perf(fuse): upload two Takeout photos at once
2026-11-21 23:07:35 +01:00
42 changed files with 4326 additions and 3473 deletions

No files matched your search

+5
View File
@@ -159,6 +159,9 @@ jobs:
install -Dm644 packaging/io.narl.proton-drive-linux.policy deb/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy install -Dm644 packaging/io.narl.proton-drive-linux.policy deb/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy
cp packaging/proton-drive.service deb/usr/lib/systemd/user/ cp packaging/proton-drive.service deb/usr/lib/systemd/user/
cp LICENSE deb/usr/share/licenses/proton-drive-linux/ cp LICENSE deb/usr/share/licenses/proton-drive-linux/
# The offline Places basemap, already fetched for the tarball.
scripts/fetch-basemap.sh
install -Dm644 data/basemap-v1.pmtiles deb/usr/share/proton-drive-linux/basemap-v1.pmtiles
po/build.sh deb/usr/share/locale po/build.sh deb/usr/share/locale
packaging/completions.sh target/release/pdfs deb/usr/share packaging/completions.sh target/release/pdfs deb/usr/share
@@ -191,6 +194,8 @@ jobs:
- name: Package Fedora package (.rpm) - name: Package Fedora package (.rpm)
run: | run: |
# The in-tree spec build installs the basemap from data/.
scripts/fetch-basemap.sh
# Sanitize version (replace hyphens with dots for RPM compatibility) # Sanitize version (replace hyphens with dots for RPM compatibility)
RPM_VERSION=$(echo "${{ env.VERSION }}" | tr '-' '.') RPM_VERSION=$(echo "${{ env.VERSION }}" | tr '-' '.')
+1
View File
@@ -65,6 +65,7 @@ jobs:
git config --global --add safe.directory "$GITHUB_WORKSPACE" git config --global --add safe.directory "$GITHUB_WORKSPACE"
VERSION=$(grep -m1 '^version' Cargo.toml | cut -d'"' -f2) VERSION=$(grep -m1 '^version' Cargo.toml | cut -d'"' -f2)
SHORT=${GITHUB_SHA::7} SHORT=${GITHUB_SHA::7}
scripts/fetch-basemap.sh
mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,BUILDROOT,db} mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,BUILDROOT,db}
rpmbuild -bb \ rpmbuild -bb \
--nodeps \ --nodeps \
+1
View File
@@ -5,3 +5,4 @@
/rpmbuild /rpmbuild
/result /result
/result-* /result-*
/data/*.pmtiles
Generated
+81
View File
@@ -2,6 +2,22 @@
# It is not intended for manual editing. # It is not intended for manual editing.
version = 4 version = 4
[[package]]
name = "ab_glyph"
version = "0.2.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2"
dependencies = [
"ab_glyph_rasterizer",
"owned_ttf_parser",
]
[[package]]
name = "ab_glyph_rasterizer"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
[[package]] [[package]]
name = "adler2" name = "adler2"
version = "2.0.1" version = "2.0.1"
@@ -232,6 +248,12 @@ dependencies = [
"zeroize", "zeroize",
] ]
[[package]]
name = "arrayref"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
[[package]] [[package]]
name = "arrayvec" name = "arrayvec"
version = "0.7.8" version = "0.7.8"
@@ -3425,6 +3447,15 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
] ]
[[package]]
name = "owned_ttf_parser"
version = "0.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b"
dependencies = [
"ttf-parser",
]
[[package]] [[package]]
name = "p256" name = "p256"
version = "0.13.2" version = "0.13.2"
@@ -3696,6 +3727,7 @@ dependencies = [
"pangocairo", "pangocairo",
"pdfs-core", "pdfs-core",
"proton-gallery-rs", "proton-gallery-rs",
"proton-map-rs",
"reqwest", "reqwest",
"serde", "serde",
"serde_json", "serde_json",
@@ -4045,6 +4077,18 @@ dependencies = [
"zip", "zip",
] ]
[[package]]
name = "proton-map-rs"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8440e8a25b89e1c3d3c0747285ebc558e84a019b237307111f21306f183e78d"
dependencies = [
"ab_glyph",
"flate2",
"thiserror 2.0.21",
"tiny-skia",
]
[[package]] [[package]]
name = "proton-media-rs" name = "proton-media-rs"
version = "0.1.1" version = "0.1.1"
@@ -5093,6 +5137,12 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
[[package]]
name = "strict-num"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
[[package]] [[package]]
name = "strsim" name = "strsim"
version = "0.11.1" version = "0.11.1"
@@ -5267,6 +5317,31 @@ dependencies = [
"zune-jpeg", "zune-jpeg",
] ]
[[package]]
name = "tiny-skia"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
dependencies = [
"arrayref",
"arrayvec",
"bytemuck",
"cfg-if",
"log",
"tiny-skia-path",
]
[[package]]
name = "tiny-skia-path"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
dependencies = [
"arrayref",
"bytemuck",
"strict-num",
]
[[package]] [[package]]
name = "tinystr" name = "tinystr"
version = "0.8.5" version = "0.8.5"
@@ -5504,6 +5579,12 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "ttf-parser"
version = "0.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
[[package]] [[package]]
name = "twofish" name = "twofish"
version = "0.7.1" version = "0.7.1"
+1
View File
@@ -19,6 +19,7 @@ proton-sdk = { version = "0.12.4" }
proton-drive-rs = { version = "0.12.4" } proton-drive-rs = { version = "0.12.4" }
proton-gallery-app-rs = "0.1.0" proton-gallery-app-rs = "0.1.0"
proton-gallery-rs = "0.1.5" proton-gallery-rs = "0.1.5"
proton-map-rs = "0.1.0"
chrono = { version = "0.4", default-features = false, features = ["std"] } chrono = { version = "0.4", default-features = false, features = ["std"] }
# Internal crates. # Internal crates.
+2 -1
View File
@@ -193,7 +193,8 @@ Proton Drive Linux is free and built in spare time. If it saves you a few headac
Released under the [MIT License](LICENSE). Released under the [MIT License](LICENSE).
The Places map uses [GeoNames](https://www.geonames.org/) data (CC BY 4.0) and The Places map uses [GeoNames](https://www.geonames.org/) data (CC BY 4.0) and
[Natural Earth](https://www.naturalearthdata.com/) outlines (public domain). The optional street [Natural Earth](https://www.naturalearthdata.com/) land, water and borders (public domain), drawn
through [proton-map-rs](https://github.com/narrrl/proton-rs). The optional street
map comes from [OpenFreeMap](https://openfreemap.org/), © [OpenStreetMap](https://www.openstreetmap.org/copyright) map comes from [OpenFreeMap](https://openfreemap.org/), © [OpenStreetMap](https://www.openstreetmap.org/copyright)
contributors. contributors.
+102 -5
View File
@@ -158,8 +158,12 @@ enum Command {
#[arg(long)] #[arg(long)]
forget: bool, forget: bool,
}, },
/// Forget the stored session. /// Forget the stored session. Asks first while changes are still queued.
Logout, Logout {
/// Do not ask first.
#[arg(long)]
yes: bool,
},
/// Show account login state, and mount status if a daemon is running. /// Show account login state, and mount status if a daemon is running.
Status, Status,
/// List every local Proton Drive location. /// List every local Proton Drive location.
@@ -857,6 +861,13 @@ enum SyncCmd {
}, },
/// List uploads and changes not yet on Proton Drive. /// List uploads and changes not yet on Proton Drive.
Queue, Queue,
/// Wait until every queued change is on Proton Drive. Exits 0 once nothing
/// is left, 3 when what is left needs you (see `sync issues`), 4 on timeout.
Flush {
/// Give up after this many seconds.
#[arg(long)]
timeout: Option<u64>,
},
/// List queued changes Proton Drive refused or that keep failing, and what to do. /// List queued changes Proton Drive refused or that keep failing, and what to do.
Issues, Issues,
/// Save the content of a queued upload (by id from `sync queue`) to a file. /// Save the content of a queued upload (by id from `sync queue`) to a file.
@@ -1047,7 +1058,7 @@ fn main() -> Result<()> {
cli.command, cli.command,
Command::Login { .. } Command::Login { .. }
| Command::Unlock { .. } | Command::Unlock { .. }
| Command::Logout | Command::Logout { .. }
| Command::Mount { .. } | Command::Mount { .. }
| Command::Daemon { .. } | Command::Daemon { .. }
) { ) {
@@ -1057,7 +1068,7 @@ fn main() -> Result<()> {
Command::Login { username, remember } => cmd_login(username, remember), Command::Login { username, remember } => cmd_login(username, remember),
Command::Unlock { remember } => cmd_unlock(remember), Command::Unlock { remember } => cmd_unlock(remember),
Command::Lock { forget } => cmd_lock(forget), Command::Lock { forget } => cmd_lock(forget),
Command::Logout => cmd_logout(), Command::Logout { yes } => cmd_logout(yes),
Command::Status => cmd_status(), Command::Status => cmd_status(),
Command::Locations => cmd_locations(), Command::Locations => cmd_locations(),
Command::Mount { mountpoint } => cmd_mount(mountpoint), Command::Mount { mountpoint } => cmd_mount(mountpoint),
@@ -1362,6 +1373,7 @@ fn cmd_sync(action: SyncCmd) -> Result<()> {
})?)? })?)?
} }
SyncCmd::Queue => return cmd_sync_queue(), SyncCmd::Queue => return cmd_sync_queue(),
SyncCmd::Flush { timeout } => return cmd_sync_flush(timeout),
SyncCmd::Issues => return cmd_sync_issues(), SyncCmd::Issues => return cmd_sync_issues(),
SyncCmd::Export { id, dest } => return cmd_sync_export(id, &dest), SyncCmd::Export { id, dest } => return cmd_sync_export(id, &dest),
SyncCmd::Limit { up, down } => return cmd_sync_limit(up, down), SyncCmd::Limit { up, down } => return cmd_sync_limit(up, down),
@@ -1465,6 +1477,71 @@ fn cmd_sync_queue() -> Result<()> {
Ok(()) Ok(())
} }
/// `pdfs sync flush`: wait for the queue to drain.
///
/// Failed changes are retried at once rather than after their backoff. The
/// wait ends early, with exit code 3, when everything left is waiting on the
/// user: refused by Drive, failing again and again, or a temporary file
/// waiting for its final name. Paused or offline, it keeps waiting and says
/// why.
fn cmd_sync_flush(timeout: Option<u64>) -> Result<()> {
const POLL: std::time::Duration = std::time::Duration::from_secs(1);
let deadline =
timeout.map(|secs| std::time::Instant::now() + std::time::Duration::from_secs(secs));
ok_or_bail(control_request(CtlRequest::RetryPendingOp { id: None })?)?;
let mut last_line = String::new();
loop {
let items = match control_request(CtlRequest::ListPendingOps)? {
CtlResponse::PendingOps { items } => items,
CtlResponse::Error { message, kind } => bail!("{}", cli_error(kind, &message)),
other => bail!("unexpected response: {other:?}"),
};
let waiting = items
.iter()
.filter(|op| !op.parked && !op.failing && op.issue.is_none())
.count();
if items.is_empty() {
finish_line(&last_line);
println!("Everything is on Proton Drive.");
return Ok(());
}
if waiting == 0 {
finish_line(&last_line);
eprintln!(
"{} queued change(s) need you before they can be sent. See `pdfs sync issues`.",
items.len()
);
std::process::exit(3);
}
let reason = match control_request(CtlRequest::Status)? {
CtlResponse::Status { paused: true, .. } => " (sync is paused; `pdfs sync resume`)",
CtlResponse::Status { online: false, .. } => " (offline; waiting for Proton Drive)",
_ => "",
};
let line = format!("{waiting} change(s) left to send{reason}");
if line != last_line {
if !last_line.is_empty() {
print!("\r\x1b[2K");
}
print!("{line}");
last_line = line;
}
if deadline.is_some_and(|deadline| std::time::Instant::now() >= deadline) {
finish_line(&last_line);
eprintln!("Timed out with {waiting} change(s) still queued.");
std::process::exit(4);
}
std::thread::sleep(POLL);
}
}
/// End a progress line so the next message starts on its own.
fn finish_line(last_line: &str) {
if !last_line.is_empty() {
println!();
}
}
/// `pdfs sync issues`: the queued changes that need the user, and what to do. /// `pdfs sync issues`: the queued changes that need the user, and what to do.
fn cmd_sync_issues() -> Result<()> { fn cmd_sync_issues() -> Result<()> {
let response = control_request(CtlRequest::ListPendingOps)?; let response = control_request(CtlRequest::ListPendingOps)?;
@@ -2298,7 +2375,27 @@ fn key_state_name() -> &'static str {
} }
} }
fn cmd_logout() -> Result<()> { fn cmd_logout(yes: bool) -> Result<()> {
// Queued changes stay staged on this computer and are sent after the next
// sign-in, but until then they exist nowhere else. Without a running
// daemon there is no count to show.
if !yes
&& let Ok(CtlResponse::Status {
pending_uploads,
pending_changes,
parked_uploads,
..
}) = control_request(CtlRequest::Status)
{
let queued = pending_uploads + pending_changes + parked_uploads;
if queued > 0 {
println!(
"{queued} change(s) are not on Proton Drive yet. They stay on this computer and are \
sent after you sign in again. Run `pdfs sync flush` first to send them now."
);
confirm("Sign out anyway?")?;
}
}
if auth::logout()? { if auth::logout()? {
println!("Signed out: the session is ended on Proton and cleared here."); println!("Signed out: the session is ended on Proton and cleared here.");
} else { } else {
+129
View File
@@ -0,0 +1,129 @@
//! Hold off a shutdown while queued changes exist only on this computer.
//!
//! A change made through the mount is staged here and sent by the drain. Until
//! it lands, this computer has the only copy, so powering off then risks it
//! more than the user expects (`docs/BUGS.md` B66). While the queue holds work
//! the drain can still send, the daemon takes a logind shutdown inhibitor
//! through `systemd-inhibit`, which desktops show in their power-off dialog
//! with the reason. It is let go as soon as the queue empties.
//!
//! Work that cannot drain on its own — a temporary file waiting for its final
//! name, or a change Drive refused or that keeps failing — never holds the
//! lock, or a shutdown would be held up for something that is not coming.
//! Without `systemd-inhibit` nothing happens.
use std::process::{Child, Command, Stdio};
use std::time::Duration;
use pdfs_core::db::PendingCounts;
use tracing::{debug, warn};
use super::Core;
/// How often the queue is looked at.
const CHECK_EVERY: Duration = Duration::from_secs(5);
/// Changes the drain can still send by itself.
fn sendable(counts: &PendingCounts) -> i64 {
(counts.uploads + counts.changes - counts.parked - counts.failing).max(0)
}
/// Run until the daemon stops, holding the inhibitor while changes wait.
pub(crate) fn run(core: Core) {
let mut held: Option<Child> = None;
loop {
let waiting = core
.db
.pending_op_counts()
.map(|counts| sendable(&counts))
.unwrap_or(0);
// The helper can go away (logind restarted, or it was killed); the
// lock is then taken again on the next round.
if let Some(child) = &mut held
&& !matches!(child.try_wait(), Ok(None))
{
held = None;
}
match (&mut held, waiting > 0) {
(None, true) => held = take(waiting),
(Some(child), false) => {
release(child);
held = None;
}
_ => {}
}
if !core.shutdown.sleep(CHECK_EVERY) {
break;
}
}
if let Some(mut child) = held {
release(&mut child);
}
}
fn take(waiting: i64) -> Option<Child> {
let why = if waiting == 1 {
"Sending 1 change to Proton Drive".to_string()
} else {
format!("Sending {waiting} changes to Proton Drive")
};
match Command::new("systemd-inhibit")
.args([
"--what=shutdown",
"--who=Proton Drive",
&format!("--why={why}"),
"--mode=block",
"sleep",
"infinity",
])
.stdin(Stdio::null())
.stdout(Stdio::null())
.stderr(Stdio::null())
.spawn()
{
Ok(child) => {
debug!(waiting, "holding off shutdown while changes are queued");
Some(child)
}
Err(error) if error.kind() == std::io::ErrorKind::NotFound => None,
Err(error) => {
warn!(%error, "taking the shutdown inhibitor failed");
None
}
}
}
fn release(child: &mut Child) {
let _ = child.kill();
let _ = child.wait();
debug!("queue drained; shutdown no longer held off");
}
#[cfg(test)]
mod tests {
use super::*;
fn counts(uploads: i64, changes: i64, parked: i64, failing: i64) -> PendingCounts {
PendingCounts {
uploads,
changes,
parked,
failing,
last_error: None,
}
}
#[test]
fn only_work_the_drain_can_send_holds_off_a_shutdown() {
assert_eq!(sendable(&counts(0, 0, 0, 0)), 0);
assert_eq!(sendable(&counts(2, 1, 0, 0)), 3);
assert_eq!(sendable(&counts(1, 0, 1, 0)), 0);
assert_eq!(sendable(&counts(2, 0, 0, 2)), 0);
assert_eq!(sendable(&counts(3, 2, 1, 1)), 3);
}
#[test]
fn counts_that_overlap_never_go_negative() {
assert_eq!(sendable(&counts(1, 0, 1, 1)), 0);
}
}
+1
View File
@@ -92,6 +92,7 @@ use drive::{DriveApi, RevisionRead};
mod events; mod events;
mod filesystem; mod filesystem;
mod gallery; mod gallery;
mod inhibit;
mod keeper; mod keeper;
mod link; mod link;
pub use filesystem::ProtonFs; pub use filesystem::ProtonFs;
+11
View File
@@ -793,6 +793,17 @@ pub(crate) fn mount_with(
warn!(%error, "start My Files share-id repair failed"); warn!(%error, "start My Files share-id repair failed");
} }
} }
// Hold off a shutdown while changes exist only here (B66). Only the real
// daemon: a simulation's queue is not the user's data.
if matches!(host, Host::Daemon) {
let inhibit_core = core.clone();
if let Err(error) = std::thread::Builder::new()
.name("pdfs-inhibit".into())
.spawn(move || crate::inhibit::run(inhibit_core))
{
warn!(%error, "start the shutdown inhibitor failed");
}
}
// Stop signals (SIGTERM from `systemctl --user stop`, SIGINT from Ctrl-C) // Stop signals (SIGTERM from `systemctl --user stop`, SIGINT from Ctrl-C)
// are delivered onto the async runtime; bridge them onto a sync channel so // are delivered onto the async runtime; bridge them onto a sync channel so
+6
View File
@@ -23,6 +23,8 @@ path = "src/prompt.rs"
[dependencies] [dependencies]
proton-gallery-rs.workspace = true proton-gallery-rs.workspace = true
# The offline basemap under the Places map.
proton-map-rs.workspace = true
base64.workspace = true base64.workspace = true
pdfs-core.workspace = true pdfs-core.workspace = true
tracing.workspace = true tracing.workspace = true
@@ -43,3 +45,7 @@ pangocairo = "0.22"
reqwest = { version = "0.13", default-features = false, features = ["rustls", "webpki-roots"] } reqwest = { version = "0.13", default-features = false, features = ["rustls", "webpki-roots"] }
# The system libintl (glibc) rather than a bundled gettext build. # The system libintl (glibc) rather than a bundled gettext build.
gettext-rs = { version = "0.8", features = ["gettext-system"] } gettext-rs = { version = "0.8", features = ["gettext-system"] }
[dev-dependencies]
# Builds small basemaps for the map tests.
proton-map-rs = { workspace = true, features = ["writer"] }
+1 -1
View File
@@ -1476,7 +1476,7 @@ fn install_window_actions(ui: &Rc<Ui>, window: &adw::ApplicationWindow) {
None, None,
gtk4::License::Custom, gtk4::License::Custom,
Some(&gettext( Some(&gettext(
"The places map is drawn from <a href=\"https://www.naturalearthdata.com/\">Natural Earth</a> land outlines and country borders, which are in the public domain.", "The places map is drawn from <a href=\"https://www.naturalearthdata.com/\">Natural Earth</a> land, water and borders, which are in the public domain.",
)), )),
); );
dialog.add_legal_section( dialog.add_legal_section(
+33 -3
View File
@@ -675,15 +675,45 @@ fn verify_in_browser(
/// Sign out, after a confirmation: disable+stop the mount service (so the /// Sign out, after a confirmation: disable+stop the mount service (so the
/// daemon isn't left running without credentials), forget the stored session, /// daemon isn't left running without credentials), forget the stored session,
/// and drop back to the login page. /// and drop back to the login page.
///
/// Changes still queued are named first: they stay staged here and are sent
/// after the next sign-in, but until then they exist nowhere else.
pub(crate) fn sign_out(ui: &Rc<Ui>) { pub(crate) fn sign_out(ui: &Rc<Ui>) {
let rx = spawn_request(ui.dirs.control_socket(), Request::Status);
let ui = ui.clone();
glib::spawn_future_local(async move {
let queued = match rx.recv().await {
Ok(Ok(Response::Status {
pending_uploads,
pending_changes,
parked_uploads,
..
})) => pending_uploads + pending_changes + parked_uploads,
_ => 0,
};
confirm_sign_out(&ui, queued);
});
}
fn confirm_sign_out(ui: &Rc<Ui>, queued: u64) {
let Some(window) = ui_window(ui) else { return }; let Some(window) = ui_window(ui) else { return };
let ui = ui.clone(); let ui = ui.clone();
let mut body = gettext(
"Proton Drive will disconnect and stop syncing until you sign in again. Files already on this computer stay where they are.",
);
if queued > 0 {
let warning = ngettext_f(
"{n} change is not on Proton Drive yet. It stays on this computer and is sent after you sign in again.",
"{n} changes are not on Proton Drive yet. They stay on this computer and are sent after you sign in again.",
queued,
&[],
);
body = format!("{warning}\n\n{body}");
}
confirm_destructive( confirm_destructive(
&window, &window,
&gettext("Sign Out?"), &gettext("Sign Out?"),
&gettext( &body,
"Proton Drive will disconnect and stop syncing until you sign in again. Files already on this computer stay where they are.",
),
&gettext("Sign Out"), &gettext("Sign Out"),
move || { move || {
let galleries = ui.drive_galleries.borrow().upgrade(); let galleries = ui.drive_galleries.borrow().upgrade();
+211 -22
View File
@@ -1,7 +1,12 @@
//! The online street map under the Places map: vector tiles from OpenFreeMap, //! The tiles under the Places map, made on worker threads and handed to the
//! fetched and drawn on a worker thread, and handed to the map as finished //! map as finished images. They come from one of two sources.
//! images.
//! //!
//! The offline basemap is a PMTiles file installed with the app and drawn by
//! `proton-map-rs`, the same map Proton Gallery shows: seas, lakes, rivers,
//! built-up areas, borders and town names from Natural Earth and GeoNames.
//! It sends nothing anywhere. Its names are drawn into the tiles.
//!
//! The online street map is vector tiles from OpenFreeMap.
//! It is off unless turned on in Preferences, since every tile fetched tells //! It is off unless turned on in Preferences, since every tile fetched tells
//! OpenFreeMap which part of the world is being looked at. OpenFreeMap needs //! OpenFreeMap which part of the world is being looked at. OpenFreeMap needs
//! no account or key, and its tiles are OpenStreetMap data in the //! no account or key, and its tiles are OpenStreetMap data in the
@@ -20,9 +25,17 @@ use std::sync::{Arc, Mutex};
use std::time::Duration; use std::time::Duration;
use gtk4::cairo; use gtk4::cairo;
use proton_map::{Basemap, Style, TileId};
use super::mvt::{self, Kind, Layer}; use super::mvt::{self, Kind, Layer};
/// The basemap's file name, wherever it is installed.
pub(crate) const BASEMAP_FILE: &str = "basemap-v1.pmtiles";
/// How many threads draw basemap tiles. Drawing is all CPU; two keep the map
/// quick without taking the machine.
const BASEMAP_THREADS: usize = 2;
/// Where OpenFreeMap describes its current tile set. /// Where OpenFreeMap describes its current tile set.
const TILEJSON_URL: &str = "https://tiles.openfreemap.org/planet"; const TILEJSON_URL: &str = "https://tiles.openfreemap.org/planet";
@@ -254,8 +267,20 @@ struct Job {
dark: bool, dark: bool,
} }
/// The worker thread making tiles. Dropping it stops the thread once the /// Where a tile worker gets its tiles.
/// fetches under way are done. pub(crate) enum Source {
/// OpenFreeMap's street map, cached under `cache_dir`, with names in
/// `language` where the map has them.
Online {
cache_dir: PathBuf,
language: String,
},
/// The basemap installed at this path.
Offline(PathBuf),
}
/// The worker threads making tiles. Dropping it stops them once the tiles
/// under way are done.
pub(crate) struct Tiles { pub(crate) struct Tiles {
jobs: async_channel::Sender<Job>, jobs: async_channel::Sender<Job>,
wanted: Arc<Mutex<HashSet<TileKey>>>, wanted: Arc<Mutex<HashSet<TileKey>>>,
@@ -264,27 +289,35 @@ pub(crate) struct Tiles {
} }
impl Tiles { impl Tiles {
/// Start the worker, caching under `cache_dir`, drawing names in /// Start the worker for `source`. Finished tiles arrive on the returned
/// `language` where the map has them. Finished tiles arrive on the /// channel.
/// returned channel. pub(crate) fn start(source: Source, scale: i32) -> (Self, async_channel::Receiver<Done>) {
pub(crate) fn start(
cache_dir: PathBuf,
language: String,
scale: i32,
) -> (Self, async_channel::Receiver<Done>) {
let (jobs, job_rx) = async_channel::unbounded(); let (jobs, job_rx) = async_channel::unbounded();
let (done_tx, done_rx) = async_channel::unbounded(); let (done_tx, done_rx) = async_channel::unbounded();
let wanted = Arc::new(Mutex::new(HashSet::new())); let wanted = Arc::new(Mutex::new(HashSet::new()));
let worker = Worker { let spawned = match source {
dir: cache_dir, Source::Online {
language, cache_dir,
scale, language,
wanted: wanted.clone(), } => {
done: done_tx, let worker = Worker {
dir: cache_dir,
language,
scale,
wanted: wanted.clone(),
done: done_tx,
};
std::thread::Builder::new()
.name("map-tiles".into())
.spawn(move || worker.run(job_rx))
}
Source::Offline(path) => {
let wanted = wanted.clone();
std::thread::Builder::new()
.name("map-basemap".into())
.spawn(move || draw_basemap(&path, scale, &wanted, &job_rx, &done_tx))
}
}; };
let spawned = std::thread::Builder::new()
.name("map-tiles".into())
.spawn(move || worker.run(job_rx));
if let Err(e) = spawned { if let Err(e) = spawned {
tracing::warn!("map tiles: cannot start the worker: {e}"); tracing::warn!("map tiles: cannot start the worker: {e}");
} }
@@ -463,6 +496,126 @@ impl Worker {
} }
} }
/// Where the basemap may be installed, most specific first.
fn basemap_paths() -> Vec<PathBuf> {
let mut paths = Vec::new();
if let Some(path) = std::env::var_os("PDFS_BASEMAP") {
paths.push(PathBuf::from(path));
}
if let Some(dir) = std::env::current_exe()
.ok()
.and_then(|exe| exe.parent().map(Path::to_path_buf))
{
paths.push(dir.join("../share/proton-drive-linux").join(BASEMAP_FILE));
}
paths.push(Path::new("/usr/share/proton-drive-linux").join(BASEMAP_FILE));
if let Some(dir) = std::env::var_os("XDG_DATA_HOME")
.map(PathBuf::from)
.or_else(|| std::env::var_os("HOME").map(|home| Path::new(&home).join(".local/share")))
{
paths.push(dir.join("proton-drive-linux").join(BASEMAP_FILE));
}
if cfg!(debug_assertions) {
// `scripts/fetch-basemap.sh` puts it here for development builds.
paths
.push(Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/../../data")).join(BASEMAP_FILE));
}
paths
}
/// The installed basemap's path, if there is one.
pub(crate) fn find_basemap() -> Option<PathBuf> {
basemap_paths().into_iter().find(|path| path.is_file())
}
/// The basemap, read once per run: the map restarts its worker when the
/// window moves to a screen of another density, and the file is 25 MB.
fn open_basemap(path: &Path) -> Option<Arc<Basemap>> {
static OPENED: Mutex<Option<(PathBuf, Arc<Basemap>)>> = Mutex::new(None);
let mut opened = OPENED.lock().ok()?;
if let Some((at, basemap)) = opened.as_ref()
&& at == path
{
return Some(basemap.clone());
}
match Basemap::open(path) {
Ok(basemap) => {
let basemap = Arc::new(basemap);
*opened = Some((path.to_path_buf(), basemap.clone()));
Some(basemap)
}
Err(e) => {
tracing::warn!("map tiles: cannot open the basemap: {e}");
None
}
}
}
/// Open the basemap at `path` and draw the tiles asked for on
/// [`BASEMAP_THREADS`] threads until the map lets go of the worker. Without
/// a readable basemap every tile fails, and the outline shows.
fn draw_basemap(
path: &Path,
scale: i32,
wanted: &Mutex<HashSet<TileKey>>,
jobs: &async_channel::Receiver<Job>,
done: &async_channel::Sender<Done>,
) {
let basemap = open_basemap(path);
std::thread::scope(|scope| {
for _ in 0..BASEMAP_THREADS {
let basemap = basemap.clone();
scope.spawn(move || {
while let Ok(job) = jobs.recv_blocking() {
let key = job.key;
let still_wanted = wanted.lock().map(|w| w.contains(&key)).unwrap_or(true);
let result = match &basemap {
_ if !still_wanted => Done::Dropped(key),
Some(basemap) => Done::Tile(draw_basemap_tile(basemap, job, scale)),
None => Done::Failed(key),
};
if done.send_blocking(result).is_err() {
break;
}
}
});
}
});
}
/// One basemap tile at `scale` device px per logical px.
fn draw_basemap_tile(basemap: &Basemap, job: Job, scale: i32) -> Raster {
let style = if job.dark {
Style::dark()
} else {
Style::light()
};
let key = job.key;
let tile = proton_map::render_tile(
basemap,
TileId::new(key.z, key.x, key.y),
scale.max(1) as f32,
&style,
);
Raster {
key,
dark: job.dark,
edge: tile.width as i32,
pixels: rgba_to_cairo(tile.rgba),
labels: Vec::new(),
}
}
/// Premultiplied RGBA bytes to cairo's premultiplied ARGB, one native-endian
/// word per pixel.
fn rgba_to_cairo(mut pixels: Vec<u8>) -> Vec<u8> {
for px in pixels.as_chunks_mut::<4>().0 {
let [r, g, b, a] = *px;
*px = u32::from_be_bytes([a, r, g, b]).to_ne_bytes();
}
pixels
}
/// The first tile URL template in a TileJSON document. /// The first tile URL template in a TileJSON document.
fn tile_template(json: &[u8]) -> Option<String> { fn tile_template(json: &[u8]) -> Option<String> {
let doc: serde_json::Value = serde_json::from_slice(json).ok()?; let doc: serde_json::Value = serde_json::from_slice(json).ok()?;
@@ -823,6 +976,42 @@ fn label_name(layer: &Layer, feature: &mvt::Feature, language: &str) -> Option<S
mod tests { mod tests {
use super::*; use super::*;
fn empty_basemap() -> Basemap {
Basemap::from_bytes(proton_map::pmtiles::writer::Writer::new().finish(
"{}",
[-180.0, -85.0, 180.0, 85.0],
[0.0, 0.0],
))
.expect("empty archive opens")
}
#[test]
fn rgba_pixels_become_cairo_words() {
let pixels = rgba_to_cairo(vec![0x11, 0x22, 0x33, 0xff]);
let word = u32::from_ne_bytes(pixels.try_into().expect("one pixel"));
assert_eq!(word, 0xff11_2233);
}
#[test]
fn basemap_tiles_come_at_the_screen_density_in_the_theme_asked() {
let basemap = empty_basemap();
let key = TileKey { z: 3, x: 4, y: 2 };
for dark in [false, true] {
let raster = draw_basemap_tile(&basemap, Job { key, dark }, 2);
assert_eq!((raster.key, raster.dark), (key, dark));
assert_eq!(raster.edge, 512);
assert_eq!(raster.pixels.len(), 512 * 512 * 4);
// An empty basemap is all open sea.
let sea = if dark { Style::dark() } else { Style::light() }.water[0];
let word = u32::from_ne_bytes(raster.pixels[..4].try_into().expect("a pixel"));
assert_eq!(
word & 0x00ff_ffff,
u32::from_be_bytes([0, sea.r, sea.g, sea.b])
);
assert!(raster.surface().is_some());
}
}
#[test] #[test]
fn deep_tiles_draw_from_their_ancestor_at_the_data_zoom() { fn deep_tiles_draw_from_their_ancestor_at_the_data_zoom() {
let key = TileKey { let key = TileKey {
+104 -62
View File
@@ -2,13 +2,13 @@
//! their newest photo, and once the map is zoomed in close, each photo where //! their newest photo, and once the map is zoomed in close, each photo where
//! it was taken. //! it was taken.
//! //!
//! Underneath is one of two maps. The built-in one is drawn here from Natural //! Underneath are up to two maps. The outline is drawn here from Natural
//! Earth's 1:50m land polygons and country borders (public domain), trimmed //! Earth's 1:50m land polygons and country borders (public domain), trimmed
//! into `data/land.txt` and `data/borders.txt` by //! into `data/land.txt` and `data/borders.txt` by
//! `scripts/natural-earth-land.py`; it needs no network and tells nobody //! `scripts/natural-earth-land.py`, and is always there. Over it go tiles
//! anything. The street map from OpenFreeMap ([`super::map_tiles`]) is //! ([`super::map_tiles`]) wherever they have arrived: the offline basemap
//! opt-in, in Preferences, and draws over the built-in one wherever its tiles //! installed with the app, which needs no network and tells nobody anything,
//! have arrived. //! or, when turned on in Preferences, the street map from OpenFreeMap.
//! //!
//! The projection is Web Mercator, the one every other map uses, so the //! The projection is Web Mercator, the one every other map uses, so the
//! world looks the way people expect. Markers that would overlap on screen //! world looks the way people expect. Markers that would overlap on screen
@@ -27,7 +27,7 @@ use std::time::{Duration, Instant};
use gtk4::cairo; use gtk4::cairo;
use pdfs_core::control::PhotoLocation; use pdfs_core::control::PhotoLocation;
use super::map_tiles::{self, Done, Label, LabelClass, Palette, TILE_EDGE, TileKey, Tiles}; use super::map_tiles::{self, Done, Label, LabelClass, Palette, Source, TILE_EDGE, TileKey, Tiles};
use crate::*; use crate::*;
const LAND: &str = include_str!("../../../data/land.txt"); const LAND: &str = include_str!("../../../data/land.txt");
@@ -37,8 +37,8 @@ const BORDERS: &str = include_str!("../../../data/borders.txt");
const MAX_LATITUDE: f64 = 85.0; const MAX_LATITUDE: f64 = 85.0;
/// How far in the map zooms, as a multiple of the whole world fitting the /// How far in the map zooms, as a multiple of the whole world fitting the
/// widget: far enough for photos in one town to part on the built-in map, /// widget: far enough for photos in one town to part on the outline and the
/// and down to single streets on the street map. /// basemap, and down to single streets on the street map.
const MAX_ZOOM: f64 = 8192.0; const MAX_ZOOM: f64 = 8192.0;
const ONLINE_MAX_ZOOM: f64 = 65536.0; const ONLINE_MAX_ZOOM: f64 = 65536.0;
@@ -66,7 +66,7 @@ const MIN_SEGMENT: f64 = 0.75;
/// Edge in px of the square a marker's photo is scaled down to once. /// Edge in px of the square a marker's photo is scaled down to once.
const COVER_PX: i32 = 128; const COVER_PX: i32 = 128;
/// How many street-map tiles stay in memory. /// How many map tiles stay in memory.
const TILE_CACHE: usize = 160; const TILE_CACHE: usize = 160;
/// Photo marker covers kept, 64 KiB each. A town's own cover is never /// Photo marker covers kept, 64 KiB each. A town's own cover is never
@@ -190,7 +190,7 @@ struct Marker {
target: Target, target: Target,
} }
/// A street-map tile ready to draw, and the names on it. /// A map tile ready to draw, and the names on it.
struct CachedTile { struct CachedTile {
surface: cairo::ImageSurface, surface: cairo::ImageSurface,
labels: Rc<Vec<Label>>, labels: Rc<Vec<Label>>,
@@ -198,9 +198,11 @@ struct CachedTile {
used: u64, used: u64,
} }
/// The street map, while it is turned on. /// The tiles drawn over the outline, from the basemap or the street map.
struct Online { struct TileLayer {
tiles: Tiles, tiles: Tiles,
/// Whether they come from the street map.
online: bool,
cache: HashMap<TileKey, CachedTile>, cache: HashMap<TileKey, CachedTile>,
pending: HashSet<TileKey>, pending: HashSet<TileKey>,
failed: HashMap<TileKey, Instant>, failed: HashMap<TileKey, Instant>,
@@ -239,7 +241,11 @@ struct MapState {
drag_origin: Option<View>, drag_origin: Option<View>,
/// The scale a pinch started from. /// The scale a pinch started from.
pinch_origin: Option<View>, pinch_origin: Option<View>,
online: Option<Online>, tiles: Option<TileLayer>,
/// Whether the street map is turned on in Preferences.
street_map: bool,
/// The installed basemap, if any.
basemap: Option<PathBuf>,
cache_dir: Option<PathBuf>, cache_dir: Option<PathBuf>,
/// The spot [`PlacesMap::show_spot`] went to, ringed until the map is /// The spot [`PlacesMap::show_spot`] went to, ringed until the map is
/// fitted to all places again. /// fitted to all places again.
@@ -295,32 +301,11 @@ impl PlacesMap {
buttons.append(&zoom); buttons.append(&zoom);
buttons.append(&fit); buttons.append(&fit);
let link = |url: &str, name: &str| format!("<a href=\"{url}\">{name}</a>");
let credit = gtk4::Label::builder() let credit = gtk4::Label::builder()
.use_markup(true) .use_markup(true)
.halign(gtk4::Align::End) .halign(gtk4::Align::End)
.valign(gtk4::Align::End) .valign(gtk4::Align::End)
.visible(false) .visible(false)
.label(gettext_f(
// Translators: the credit on the street map. {openfreemap},
// {openmaptiles} and {openstreetmap} are the linked names of
// the projects, which stay as they are.
"{openfreemap} © {openmaptiles} Data from {openstreetmap}",
&[
(
"openfreemap",
&link("https://openfreemap.org", "OpenFreeMap"),
),
(
"openmaptiles",
&link("https://www.openmaptiles.org/", "OpenMapTiles"),
),
(
"openstreetmap",
&link("https://www.openstreetmap.org/copyright", "OpenStreetMap"),
),
],
))
.build(); .build();
credit.add_css_class("places-map-credit"); credit.add_css_class("places-map-credit");
credit.add_css_class("caption"); credit.add_css_class("caption");
@@ -354,7 +339,9 @@ impl PlacesMap {
pointer: (0.0, 0.0), pointer: (0.0, 0.0),
drag_origin: None, drag_origin: None,
pinch_origin: None, pinch_origin: None,
online: None, tiles: None,
street_map: false,
basemap: map_tiles::find_basemap(),
cache_dir: None, cache_dir: None,
pin: None, pin: None,
}), }),
@@ -494,39 +481,53 @@ impl PlacesMap {
self.area.queue_draw(); self.area.queue_draw();
} }
/// Draw OpenFreeMap's street map under the markers, or stop, keeping its /// Draw OpenFreeMap's street map under the markers, keeping its tiles in
/// tiles in `cache_dir`. /// `cache_dir`, or else the installed basemap.
pub(crate) fn set_online(self: &Rc<Self>, on: bool, cache_dir: PathBuf) { pub(crate) fn set_online(self: &Rc<Self>, on: bool, cache_dir: PathBuf) {
{ {
let mut state = self.state.borrow_mut(); let mut state = self.state.borrow_mut();
state.cache_dir = Some(cache_dir); state.cache_dir = Some(cache_dir);
if on == state.online.is_some() { let started = state.tiles.is_some() || state.basemap.is_none();
if on == state.street_map && started {
return; return;
} }
state.online = None; state.street_map = on;
} state.tiles = None;
self.credit.set_visible(on);
if on {
self.start_tiles();
} }
self.start_tiles();
self.clamp_zoom(); self.clamp_zoom();
self.area.queue_draw(); self.area.queue_draw();
} }
/// Start a tile worker for the widget's current pixel density. /// Start a tile worker for the widget's current pixel density, and show
/// the credit for what it draws.
fn start_tiles(self: &Rc<Self>) { fn start_tiles(self: &Rc<Self>) {
let Some(dir) = self.state.borrow().cache_dir.clone() else { let source = {
let state = self.state.borrow();
match (&state.cache_dir, &state.basemap) {
(Some(dir), _) if state.street_map => {
let language = gtk4::pango::Language::default().to_string();
let language = language.split(['-', '_']).next().unwrap_or("en").to_owned();
Some(Source::Online {
cache_dir: dir.join("map-tiles"),
language,
})
}
(_, Some(basemap)) => Some(Source::Offline(basemap.clone())),
_ => None,
}
};
let Some(source) = source else {
self.credit.set_visible(false);
return; return;
}; };
let language = gtk4::pango::Language::default().to_string(); let online = matches!(source, Source::Online { .. });
let language = language.split(['-', '_']).next().unwrap_or("en").to_owned(); self.credit.set_label(&credit_text(online));
let (tiles, done) = Tiles::start( self.credit.set_visible(true);
dir.join("map-tiles"), let (tiles, done) = Tiles::start(source, self.area.scale_factor().max(1));
language, self.state.borrow_mut().tiles = Some(TileLayer {
self.area.scale_factor().max(1),
);
self.state.borrow_mut().online = Some(Online {
tiles, tiles,
online,
cache: HashMap::new(), cache: HashMap::new(),
pending: HashSet::new(), pending: HashSet::new(),
failed: HashMap::new(), failed: HashMap::new(),
@@ -546,7 +547,7 @@ impl PlacesMap {
fn tile_done(&self, done: Done) { fn tile_done(&self, done: Done) {
let mut state = self.state.borrow_mut(); let mut state = self.state.borrow_mut();
let Some(online) = state.online.as_mut() else { let Some(online) = state.tiles.as_mut() else {
return; return;
}; };
match done { match done {
@@ -732,7 +733,7 @@ impl PlacesMap {
} }
fn max_scale(&self) -> f64 { fn max_scale(&self) -> f64 {
let zoom = if self.state.borrow().online.is_some() { let zoom = if self.state.borrow().tiles.as_ref().is_some_and(|t| t.online) {
ONLINE_MAX_ZOOM ONLINE_MAX_ZOOM
} else { } else {
MAX_ZOOM MAX_ZOOM
@@ -827,11 +828,11 @@ impl PlacesMap {
let restart = self let restart = self
.state .state
.borrow() .borrow()
.online .tiles
.as_ref() .as_ref()
.is_some_and(|o| o.tiles.scale != area.scale_factor().max(1)); .is_some_and(|o| o.tiles.scale != area.scale_factor().max(1));
if restart { if restart {
self.state.borrow_mut().online = None; self.state.borrow_mut().tiles = None;
self.start_tiles(); self.start_tiles();
} }
@@ -846,7 +847,7 @@ impl PlacesMap {
let view = state.view; let view = state.view;
state.draws += 1; state.draws += 1;
paint_outline(cr, view, size, colors); paint_outline(cr, view, size, colors);
let labels = match state.online.as_mut() { let labels = match state.tiles.as_mut() {
Some(online) => paint_tiles(cr, online, view, size, dark, area.scale_factor()), Some(online) => paint_tiles(cr, online, view, size, dark, area.scale_factor()),
None => Vec::new(), None => Vec::new(),
}; };
@@ -999,16 +1000,16 @@ fn paint_outline(cr: &cairo::Context, view: View, size: (f64, f64), colors: &Pal
let _ = cr.stroke(); let _ = cr.stroke();
} }
/// The street-map zoom whose tiles come closest to their own size on screen. /// The tile zoom whose tiles come closest to their own size on screen.
fn tile_zoom(scale: f64) -> u8 { fn tile_zoom(scale: f64) -> u8 {
(scale / TILE_EDGE).log2().round().clamp(0.0, 18.0) as u8 (scale / TILE_EDGE).log2().round().clamp(0.0, 18.0) as u8
} }
/// Draw the street-map tiles on screen, asking for the missing ones and /// Draw the map tiles on screen, asking for the missing ones and standing in
/// standing in their nearest ancestor meanwhile. Returns the names on them. /// their nearest ancestor meanwhile. Returns the names on them.
fn paint_tiles( fn paint_tiles(
cr: &cairo::Context, cr: &cairo::Context,
online: &mut Online, online: &mut TileLayer,
view: View, view: View,
size: (f64, f64), size: (f64, f64),
dark: bool, dark: bool,
@@ -1565,6 +1566,47 @@ impl PlacesMap {
/// How many town names a merged marker's tooltip lists. /// How many town names a merged marker's tooltip lists.
const TOOLTIP_NAMES: usize = 5; const TOOLTIP_NAMES: usize = 5;
/// The credit for the map's tiles, as Pango markup.
fn credit_text(online: bool) -> String {
let link = |url: &str, name: &str| format!("<a href=\"{url}\">{name}</a>");
if online {
gettext_f(
// Translators: the credit on the street map. {openfreemap},
// {openmaptiles} and {openstreetmap} are the linked names of
// the projects, which stay as they are.
"{openfreemap} © {openmaptiles} Data from {openstreetmap}",
&[
(
"openfreemap",
&link("https://openfreemap.org", "OpenFreeMap"),
),
(
"openmaptiles",
&link("https://www.openmaptiles.org/", "OpenMapTiles"),
),
(
"openstreetmap",
&link("https://www.openstreetmap.org/copyright", "OpenStreetMap"),
),
],
)
} else {
gettext_f(
// Translators: the credit on the offline map. {naturalearth} and
// {geonames} are the linked names of the projects, which stay as
// they are.
"Map data © {naturalearth} (public domain) and {geonames} (CC BY 4.0)",
&[
(
"naturalearth",
&link("https://www.naturalearthdata.com/", "Natural Earth"),
),
("geonames", &link("https://www.geonames.org/", "GeoNames")),
],
)
}
}
fn map_button(icon: &str, tooltip: &str) -> gtk4::Button { fn map_button(icon: &str, tooltip: &str) -> gtk4::Button {
let button = gtk4::Button::from_icon_name(icon); let button = gtk4::Button::from_icon_name(icon);
button.set_tooltip_text(Some(tooltip)); button.set_tooltip_text(Some(tooltip));
+1 -1
View File
@@ -245,7 +245,7 @@ pub(crate) fn build_main_page() -> MainWidgets {
let online_map_row = adw::SwitchRow::builder() let online_map_row = adw::SwitchRow::builder()
.title(gettext("Street map for Places")) .title(gettext("Street map for Places"))
.subtitle(gettext( .subtitle(gettext(
"Show streets and town names from OpenFreeMap. It learns which parts of the world you look at.", "Show streets from OpenFreeMap instead of the offline map. It learns which parts of the world you look at.",
)) ))
.build(); .build();
appearance_group.add(&online_map_row); appearance_group.add(&online_map_row);
+15 -2
View File
@@ -74,7 +74,6 @@ original wording.
| [B134](#b134--a-file-deleted-online-while-the-drain-checks-its-write-is-kept-as-a-conflict-copy) | A file deleted online while the drain checks its write is kept as a conflict copy | Only with `local_first` off | | [B134](#b134--a-file-deleted-online-while-the-drain-checks-its-write-is-kept-as-a-conflict-copy) | A file deleted online while the drain checks its write is kept as a conflict copy | Only with `local_first` off |
| [B91](#b91--the-daemon-hung-overnight-and-nothing-could-say-what-it-was-waiting-on) | The daemon hung overnight, and nothing could say what it was waiting on | The cause is not diagnosed; the daemon now reports where it is stuck and is restarted | | [B91](#b91--the-daemon-hung-overnight-and-nothing-could-say-what-it-was-waiting-on) | The daemon hung overnight, and nothing could say what it was waiting on | The cause is not diagnosed; the daemon now reports where it is stuck and is restarted |
| [B67](#b67--fresh-state-restore-can-silently-select-a-new-device-high-22) | Fresh-state restore can silently select a new device (HIGH-22) | An ambiguous device after a loss of local state is not asked about | | [B67](#b67--fresh-state-restore-can-silently-select-a-new-device-high-22) | Fresh-state restore can silently select a new device (HIGH-22) | An ambiguous device after a loss of local state is not asked about |
| [B66](#b66--local-only-pending-data-is-not-protected-at-shutdown-high-21) | Local-only pending data is not protected at shutdown (HIGH-21) | No shutdown protection and no `pdfs sync flush` |
| [B65](#b65--release-artifacts-lack-supply-chain-verification-med-11) | Release artifacts lack supply-chain verification (MED-11) | No SBOM, provenance or checksums | | [B65](#b65--release-artifacts-lack-supply-chain-verification-med-11) | Release artifacts lack supply-chain verification (MED-11) | No SBOM, provenance or checksums |
| [B15](#b15--an-empty-but-listed-folder-and-duplicated-folder-uids) | An empty-but-`listed` folder, and duplicated folder uids | Cause not attributed | | [B15](#b15--an-empty-but-listed-folder-and-duplicated-folder-uids) | An empty-but-`listed` folder, and duplicated folder uids | Cause not attributed |
| [B10](#b10--glib-critical-when-the-launcher-closes-over-an-in-flight-open) | GLib critical when the launcher closes over an in-flight open | | | [B10](#b10--glib-critical-when-the-launcher-closes-over-an-in-flight-open) | GLib critical when the launcher closes over an in-flight open | |
@@ -109,6 +108,7 @@ a live account since.
| Entry | Title | | Entry | Title |
|---|---| |---|---|
| [B66](#b66--local-only-pending-data-is-not-protected-at-shutdown-high-21) | Local-only pending data is not protected at shutdown (HIGH-21) |
| [B291](#b291--on-fedora-45s-oo7-every-saved-sign-in-is-lost-at-the-next-reboot) | On Fedora 45's oo7, every saved sign-in is lost at the next reboot | | [B291](#b291--on-fedora-45s-oo7-every-saved-sign-in-is-lost-at-the-next-reboot) | On Fedora 45's oo7, every saved sign-in is lost at the next reboot |
| [B289](#b289--the-takeout-import-mixes-in-other-services-and-drops-location-and-live-photos) | The Takeout import mixes in other services and drops location and live photos | | [B289](#b289--the-takeout-import-mixes-in-other-services-and-drops-location-and-live-photos) | The Takeout import mixes in other services and drops location and live photos |
| [B288](#b288--an-interrupted-takeout-import-reads-as-finished-and-one-error-ends-it) | An interrupted Takeout import reads as finished, and one error ends it | | [B288](#b288--an-interrupted-takeout-import-reads-as-finished-and-one-error-ends-it) | An interrupted Takeout import reads as finished, and one error ends it |
@@ -7475,7 +7475,7 @@ duplicates, renamed folders, multiple devices, and byte-identical restoration.
### B66 — Local-only pending data is not protected at shutdown (HIGH-21) ### B66 — Local-only pending data is not protected at shutdown (HIGH-21)
**Status:** Open — 1.0 data-safety/UX blocker **Status:** Fixed, unverified live
**Found:** 2026-07-22, 1.0 recovery audit **Found:** 2026-07-22, 1.0 recovery audit
**Where:** shutdown, CLI/GUI status, logout/unregister workflows **Where:** shutdown, CLI/GUI status, logout/unregister workflows
@@ -7488,6 +7488,19 @@ and last errors, and protect destructive lifecycle actions. Test offline stop,
logout, unregister, reboot, retry exhaustion, and drain. Credential removal must logout, unregister, reboot, retry exhaustion, and drain. Credential removal must
never delete staged bytes. never delete staged bytes.
**Fix:** `crates/pdfs-fuse/src/inhibit.rs` takes a logind shutdown inhibitor
(`systemd-inhibit --what=shutdown --mode=block`) while the queue holds changes
the drain can send, and lets it go once they land. Parked transient files and
changes that need the user are left out, so they never hold a power-off up for
good. `pdfs sync flush` retries failed changes and waits for the queue, with
its own exit codes for "needs you" and timeout. `pdfs logout` and the app's
Sign Out dialog say how many changes are still queued and that they stay
staged. Credential removal never touched `staging/`.
**Verified:** unit tests for which work holds the lock; `systemd-inhibit` in
block mode taken by a user process on 2026-11-21. A power-off with a queued
upload is still owed.
--- ---
### B65 — Release artifacts lack supply-chain verification (MED-11) ### B65 — Release artifacts lack supply-chain verification (MED-11)
+16
View File
@@ -11,8 +11,24 @@ scratch (user data in `staging/` and `recovery/` is never touched by this).
## [Unreleased] ## [Unreleased]
### Added
- `pdfs sync flush` waits until every queued change is on Proton Drive, retrying
failed ones at once. It exits 3 when what is left needs you and 4 on `--timeout`.
- While changes are queued that only this computer has, the daemon holds off a
shutdown through logind, and desktops show "Sending N changes to Proton Drive" in
their power-off dialog. Changes waiting on you never hold it up (B66).
- Signing out, in the app or with `pdfs logout`, says how many changes are not on
Proton Drive yet. They stay on this computer and are sent after the next sign-in.
### Changed ### Changed
- The Places map draws an offline basemap, the one Proton Gallery shows: seas by
depth, lakes, rivers, built-up areas, borders and town names, in light and dark,
rendered in the background through `proton-map-rs`. It ships with every package
(about 25 MB, fetched by `scripts/fetch-basemap.sh` against a pinned SHA-256) and
sends no request. The street map stays opt-in and replaces it when turned on.
Without the file the map falls back to the coarse outlines.
- A Google Photos import uploads two photos at once instead of one, while the next - A Google Photos import uploads two photos at once instead of one, while the next
photo is read out of its archive. Live-photo videos still go after their stills, and photo is read out of its archive. Live-photo videos still go after their stills, and
cancelling still lets the uploads in flight finish. cancelling still lets the uploads in flight finish.
+2 -1
View File
@@ -70,7 +70,7 @@ The script runs `pdfs` from `PATH` on every Tab, so it keeps working after an up
| `pdfs login [-u EMAIL] [--remember]` | Sign in (password, then a 2FA code if the account has one) and store the session in the system keyring. Restarts the service if it is running. `--remember` keeps a two-password account unlocked across logins. | | `pdfs login [-u EMAIL] [--remember]` | Sign in (password, then a 2FA code if the account has one) and store the session in the system keyring. Restarts the service if it is running. `--remember` keeps a two-password account unlocked across logins. |
| `pdfs unlock [--remember]` | Enter the mailbox password of a two-password account, so the service can open your files. Needed once per login session, or once with `--remember`. | | `pdfs unlock [--remember]` | Enter the mailbox password of a two-password account, so the service can open your files. Needed once per login session, or once with `--remember`. |
| `pdfs lock` | Forget the unlock held in memory; the account is locked again. | | `pdfs lock` | Forget the unlock held in memory; the account is locked again. |
| `pdfs logout` | End the session on Proton and remove the stored session. | | `pdfs logout [--yes]` | End the session on Proton and remove the stored session. Asks first while changes are still queued; they stay on this computer and are sent after the next sign-in. |
| `pdfs status` | Account, mount, queue and cache state. | | `pdfs status` | Account, mount, queue and cache state. |
| `pdfs quota` | Storage used across all Proton products. | | `pdfs quota` | Storage used across all Proton products. |
| `pdfs locations` | Every local place the service occupies: the Proton Drive folder and each synced folder, with mode and state. | | `pdfs locations` | Every local place the service occupies: the Proton Drive folder and each synced folder, with mode and state. |
@@ -125,6 +125,7 @@ commands are for scripts and for cases where the mount is not available.
| `pdfs sync ignore check PATH` | Say whether a file in a synced folder is synced, and which pattern decides. | | `pdfs sync ignore check PATH` | Say whether a file in a synced folder is synced, and which pattern decides. |
| `pdfs sync limit [--up RATE] [--down RATE]` | Cap bandwidth, for example `500K` or `2M` per second. `0` removes a cap. Without options, prints the current caps. | | `pdfs sync limit [--up RATE] [--down RATE]` | Cap bandwidth, for example `500K` or `2M` per second. `0` removes a cap. Without options, prints the current caps. |
| `pdfs sync queue` | List changes that have not reached Proton Drive yet. | | `pdfs sync queue` | List changes that have not reached Proton Drive yet. |
| `pdfs sync flush [--timeout SECS]` | Retry failed changes now and wait until the queue is empty. Exits 0 when everything is on Proton Drive, 3 when what is left needs you (see `sync issues`), 4 on timeout. Says so while sync is paused or offline. |
| `pdfs sync issues` | List queued changes Proton Drive refused or that keep failing, and what to do. | | `pdfs sync issues` | List queued changes Proton Drive refused or that keep failing, and what to do. |
| `pdfs sync export ID DEST` | Save a copy of a queued upload's content. `DEST` may be a folder; an existing file is never overwritten. The upload stays queued. | | `pdfs sync export ID DEST` | Save a copy of a queued upload's content. `DEST` may be a folder; an existing file is never overwritten. The upload stays queued. |
| `pdfs sync discard ID [--yes]` | Drop a queued change and undo it here: a new file or folder goes, anything else goes back to what Proton Drive has. Content not exported first is lost. | | `pdfs sync discard ID [--yes]` | Drop a queued change and undo it here: a new file or folder goes, anything else goes back to what Proton Drive has. Content not exported first is lost. |
+5
View File
@@ -360,8 +360,12 @@ git clone https://github.com/narrrl/proton-drive-linux.git
cd proton-drive-linux cd proton-drive-linux
cargo build --release --locked cargo build --release --locked
po/build.sh target/locale # optional: compile the translations po/build.sh target/locale # optional: compile the translations
scripts/fetch-basemap.sh # optional: the offline Places map, into data/
``` ```
Install `data/basemap-v1.pmtiles` as `~/.local/share/proton-drive-linux/basemap-v1.pmtiles`, or
point `PDFS_BASEMAP` at it. Without it Places shows coarse outlines only.
The four programs are in `target/release/`: `pdfs`, `pdfs-app`, `pdfs-tray` and `pdfs-prompt`. The four programs are in `target/release/`: `pdfs`, `pdfs-app`, `pdfs-tray` and `pdfs-prompt`.
### Build a package from the working tree ### Build a package from the working tree
@@ -376,6 +380,7 @@ cd packaging && makepkg -fi
```bash ```bash
sudo dnf install -y rpm-build sudo dnf install -y rpm-build
scripts/fetch-basemap.sh
rpmbuild -bb packaging/proton-drive-linux.spec \ rpmbuild -bb packaging/proton-drive-linux.spec \
--define "git_dir $PWD" \ --define "git_dir $PWD" \
--define "_rpmdir $PWD/packaging/out" \ --define "_rpmdir $PWD/packaging/out" \
+6 -3
View File
@@ -68,11 +68,14 @@ albums, and add or remove photos. Deleting an album keeps its photos in the time
**Places** groups photos by the town they were taken in, as cards or on a map. Town names come **Places** groups photos by the town they were taken in, as cards or on a map. Town names come
from [GeoNames](https://www.geonames.org/) data (CC BY 4.0) and the map from from [GeoNames](https://www.geonames.org/) data (CC BY 4.0) and the map from
[Natural Earth](https://www.naturalearthdata.com/) (public domain). Both ship with the app, so [Natural Earth](https://www.naturalearthdata.com/) (public domain): seas by depth, lakes, rivers,
nothing is fetched online. built-up areas, borders and town names, in light and dark. Both ship with the app as
`/usr/share/proton-drive-linux/basemap-v1.pmtiles`, so nothing is fetched online. Without that file,
for example in a build from source that skipped `scripts/fetch-basemap.sh`, the map shows coarse
land outlines only. `PDFS_BASEMAP` points the app at another copy.
A street map from [OpenFreeMap](https://openfreemap.org/) (© OpenStreetMap contributors) can be A street map from [OpenFreeMap](https://openfreemap.org/) (© OpenStreetMap contributors) can be
turned on under **Preferences → General → Appearance**. It is off by default, because the map turned on instead under **Preferences → General → Appearance**. It is off by default, because the map
server learns which areas you look at. server learns which areas you look at.
## Viewer and duplicates ## Viewer and duplicates
+1 -1
View File
@@ -43,7 +43,7 @@ them along.
| Item | State | Notes | | Item | State | Notes |
|---|---|---| |---|---|---|
| Protect queued changes at shutdown | Not started | A systemd inhibitor lock while `staging/` holds unsent data, a warning when signing out, and a `pdfs sync flush` that waits for the queue. Today the queue is visible in `pdfs sync queue`, the tray and **Sync → Overview**, but nothing stops a shutdown (B66) | | Protect queued changes at shutdown | Done, live check owed | The daemon holds a logind shutdown inhibitor while the queue holds changes it can send, signing out warns with the count, and `pdfs sync flush` waits for the queue (B66) |
| Restore pins from the machine profile | Not started | `profile.json` records pins; `pdfs sync restore` does not apply them yet | | Restore pins from the machine profile | Not started | `profile.json` records pins; `pdfs sync restore` does not apply them yet |
| Profile backup health | Not started | A failed profile upload is a `WARN` in the log and nothing in the app (B68) | | Profile backup health | Not started | A failed profile upload is a `WARN` in the log and nothing in the app (B68) |
| Rotated credentials survive a keyring failure | Open | Report and retry keyring write failures, so a rotated single-use refresh token is not lost (B61) | | Rotated credentials survive a keyring failure | Open | Report and retry keyring write failures, so a rotated single-use refresh token is not lost (B61) |
Binary file not shown.

Before

Width:  |  Height:  |  Size: 283 KiB

After

Width:  |  Height:  |  Size: 702 KiB

+5 -1
View File
@@ -16,7 +16,7 @@ arch=('x86_64')
url="https://proton-drive.narl.io" url="https://proton-drive.narl.io"
license=('MIT') license=('MIT')
depends=('fuse3' 'polkit' 'gtk4' 'libadwaita' 'webkitgtk-6.0' 'perl-image-exiftool') depends=('fuse3' 'polkit' 'gtk4' 'libadwaita' 'webkitgtk-6.0' 'perl-image-exiftool')
makedepends=('cargo' 'git' 'gettext') makedepends=('cargo' 'git' 'gettext' 'curl')
provides=('pdfs') provides=('pdfs')
# Files-on-demand mount + keyring need these at runtime. # Files-on-demand mount + keyring need these at runtime.
optdepends=('gnome-keyring: credential storage via Secret Service' optdepends=('gnome-keyring: credential storage via Secret Service'
@@ -80,6 +80,10 @@ package() {
install -Dm644 "packaging/io.narl.proton-drive-linux.policy" \ install -Dm644 "packaging/io.narl.proton-drive-linux.policy" \
"$pkgdir/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy" "$pkgdir/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy"
# The offline Places basemap, fetched and checked against its pinned
# SHA-256 by scripts/fetch-basemap.sh.
scripts/fetch-basemap.sh "$pkgdir/usr/share/proton-drive-linux/basemap-v1.pmtiles"
# Translations: compiled from po/ into /usr/share/locale. # Translations: compiled from po/ into /usr/share/locale.
po/build.sh "$pkgdir/usr/share/locale" po/build.sh "$pkgdir/usr/share/locale"
@@ -49,6 +49,10 @@ package() {
install -Dm644 lib/systemd/user/proton-drive.service \ install -Dm644 lib/systemd/user/proton-drive.service \
"$pkgdir/usr/lib/systemd/user/proton-drive.service" "$pkgdir/usr/lib/systemd/user/proton-drive.service"
# The offline Places basemap.
install -Dm644 share/proton-drive-linux/basemap-v1.pmtiles \
"$pkgdir/usr/share/proton-drive-linux/basemap-v1.pmtiles"
# Translations and shell completion for bash, zsh and fish. # Translations and shell completion for bash, zsh and fish.
install -dm755 "$pkgdir/usr/share" install -dm755 "$pkgdir/usr/share"
cp -r --no-preserve=ownership share/locale share/bash-completion share/zsh share/fish \ cp -r --no-preserve=ownership share/locale share/bash-completion share/zsh share/fish \
@@ -25,8 +25,10 @@ conflicts=('proton-drive-linux' 'proton-drive-for-linux' 'proton-drive-for-linux
options=('!lto') options=('!lto')
# Stops the running daemon before removal, so the mount stops mirroring deletes. # Stops the running daemon before removal, so the mount stops mirroring deletes.
install=proton-drive.install install=proton-drive.install
source=("$pkgname::git+$_repo.git") source=("$pkgname::git+$_repo.git"
sha256sums=('SKIP') "basemap-v1.pmtiles::https://github.com/narrrl/proton-rs/releases/download/basemap-v1/basemap-v1.pmtiles")
sha256sums=('SKIP'
'ce9acab1b7ed7f15b23e2365b1b6a580db79f4bc4421851ee673eff4c920d280')
pkgver() { pkgver() {
cd "$pkgname" cd "$pkgname"
@@ -81,6 +83,10 @@ package() {
install -Dm644 "packaging/io.narl.proton-drive-linux.policy" \ install -Dm644 "packaging/io.narl.proton-drive-linux.policy" \
"$pkgdir/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy" "$pkgdir/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy"
# The offline Places basemap.
install -Dm644 "$srcdir/basemap-v1.pmtiles" \
"$pkgdir/usr/share/proton-drive-linux/basemap-v1.pmtiles"
# Translations: compiled from po/ into /usr/share/locale. # Translations: compiled from po/ into /usr/share/locale.
po/build.sh "$pkgdir/usr/share/locale" po/build.sh "$pkgdir/usr/share/locale"
@@ -25,8 +25,10 @@ conflicts=('proton-drive-linux' 'proton-drive-for-linux-bin' 'proton-drive-for-l
options=('!lto') options=('!lto')
# Stops the running daemon before removal, so the mount stops mirroring deletes. # Stops the running daemon before removal, so the mount stops mirroring deletes.
install=proton-drive.install install=proton-drive.install
source=("$pkgname-$pkgver.tar.gz::$_repo/archive/refs/tags/v$pkgver.tar.gz") source=("$pkgname-$pkgver.tar.gz::$_repo/archive/refs/tags/v$pkgver.tar.gz"
sha256sums=('095186fa108f27ff2b175188bb13466a94cc8ecfd71088df47a41d4d9baa58c1') "basemap-v1.pmtiles::https://github.com/narrrl/proton-rs/releases/download/basemap-v1/basemap-v1.pmtiles")
sha256sums=('095186fa108f27ff2b175188bb13466a94cc8ecfd71088df47a41d4d9baa58c1'
'ce9acab1b7ed7f15b23e2365b1b6a580db79f4bc4421851ee673eff4c920d280')
_srcname="proton-drive-linux-$pkgver" _srcname="proton-drive-linux-$pkgver"
@@ -76,6 +78,10 @@ package() {
install -Dm644 "packaging/io.narl.proton-drive-linux.policy" \ install -Dm644 "packaging/io.narl.proton-drive-linux.policy" \
"$pkgdir/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy" "$pkgdir/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy"
# The offline Places basemap.
install -Dm644 "$srcdir/basemap-v1.pmtiles" \
"$pkgdir/usr/share/proton-drive-linux/basemap-v1.pmtiles"
# Translations: compiled from po/ into /usr/share/locale. # Translations: compiled from po/ into /usr/share/locale.
po/build.sh "$pkgdir/usr/share/locale" po/build.sh "$pkgdir/usr/share/locale"
+7
View File
@@ -3,6 +3,7 @@
{ {
lib, lib,
rustPlatform, rustPlatform,
fetchurl,
adwaita-icon-theme, adwaita-icon-theme,
pkg-config, pkg-config,
gettext, gettext,
@@ -23,6 +24,11 @@
let let
cargoToml = lib.importTOML ../../Cargo.toml; cargoToml = lib.importTOML ../../Cargo.toml;
# The offline Places basemap, as scripts/fetch-basemap.sh pins it.
basemap = fetchurl {
url = "https://github.com/narrrl/proton-rs/releases/download/basemap-v1/basemap-v1.pmtiles";
sha256 = "ce9acab1b7ed7f15b23e2365b1b6a580db79f4bc4421851ee673eff4c920d280";
};
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "proton-drive-linux"; pname = "proton-drive-linux";
@@ -116,6 +122,7 @@ rustPlatform.buildRustPackage {
packaging/completions.sh $out/bin/pdfs $out/share packaging/completions.sh $out/bin/pdfs $out/share
# Nix brings new releases, so the app never checks for them itself. # Nix brings new releases, so the app never checks for them itself.
install -Dm644 ${basemap} $out/share/proton-drive-linux/basemap-v1.pmtiles
install -Dm644 /dev/null $out/share/proton-drive-linux/managed-updates install -Dm644 /dev/null $out/share/proton-drive-linux/managed-updates
''; '';
+14
View File
@@ -25,7 +25,10 @@ ExclusiveArch: x86_64
%if 0%{!?git_dir:1} %if 0%{!?git_dir:1}
Source0: %{forge}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source0: %{forge}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: %{forge}/releases/download/v%{version}/%{name}-vendor-%{version}.tar.xz Source1: %{forge}/releases/download/v%{version}/%{name}-vendor-%{version}.tar.xz
# The offline Places basemap, checked against its pinned SHA-256 in %%prep.
Source2: https://github.com/narrrl/proton-rs/releases/download/basemap-v1/basemap-v1.pmtiles
%endif %endif
%global basemap_sha256 ce9acab1b7ed7f15b23e2365b1b6a580db79f4bc4421851ee673eff4c920d280
BuildRequires: cargo BuildRequires: cargo
BuildRequires: rust >= 1.96 BuildRequires: rust >= 1.96
@@ -75,6 +78,7 @@ cp -a %{git_dir}/LICENSE .
%else %else
# -a 1 unpacks the vendored crates and their source mappings. # -a 1 unpacks the vendored crates and their source mappings.
%autosetup -n %{name}-%{version} -a 1 %autosetup -n %{name}-%{version} -a 1
echo "%{basemap_sha256} %{SOURCE2}" | sha256sum --check --quiet
# Older vendor tarballs contained only crates.io dependencies. # Older vendor tarballs contained only crates.io dependencies.
if [ ! -f .cargo/config.toml ]; then if [ ! -f .cargo/config.toml ]; then
mkdir -p .cargo mkdir -p .cargo
@@ -119,6 +123,14 @@ install -D -m0644 %{src}/packaging/io.narl.proton-drive-linux.policy \
%{buildroot}/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy %{buildroot}/usr/share/polkit-1/actions/io.narl.proton-drive-linux.policy
install -D -m0644 %{src}/packaging/proton-drive.service \ install -D -m0644 %{src}/packaging/proton-drive.service \
%{buildroot}/usr/lib/systemd/user/proton-drive.service %{buildroot}/usr/lib/systemd/user/proton-drive.service
%if 0%{?git_dir:1}
# scripts/fetch-basemap.sh puts it here for in-tree builds.
basemap=%{git_dir}/data/basemap-v1.pmtiles
%else
basemap=%{SOURCE2}
%endif
echo "%{basemap_sha256} $basemap" | sha256sum --check --quiet
install -D -m0644 "$basemap" %{buildroot}%{_datadir}/proton-drive-linux/basemap-v1.pmtiles
%{src}/po/build.sh %{buildroot}%{_datadir}/locale %{src}/po/build.sh %{buildroot}%{_datadir}/locale
%{src}/packaging/completions.sh "$rel/pdfs" %{buildroot}%{_datadir} %{src}/packaging/completions.sh "$rel/pdfs" %{buildroot}%{_datadir}
%if 0%{!?git_dir:1} %if 0%{!?git_dir:1}
@@ -160,6 +172,8 @@ fi
%{_datadir}/bash-completion/completions/pdfs %{_datadir}/bash-completion/completions/pdfs
%{_datadir}/zsh/site-functions/_pdfs %{_datadir}/zsh/site-functions/_pdfs
%{_datadir}/fish/vendor_completions.d/pdfs.fish %{_datadir}/fish/vendor_completions.d/pdfs.fish
%dir %{_datadir}/proton-drive-linux
%{_datadir}/proton-drive-linux/basemap-v1.pmtiles
%if 0%{!?git_dir:1} %if 0%{!?git_dir:1}
%{_datadir}/proton-drive-linux/managed-updates %{_datadir}/proton-drive-linux/managed-updates
%endif %endif
+6 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Lay out the release tarball: built binaries, desktop files, icon, user # Lay out the release tarball: built binaries, desktop files, icon, user
# service, translations, shell completions and install.sh, under one top-level # service, the Places basemap, translations, shell completions and install.sh, under one top-level
# directory with a /usr-like tree, then pack it. # directory with a /usr-like tree, then pack it.
# #
# usage: packaging/tarball/build.sh <binary dir> <version> <output dir> # usage: packaging/tarball/build.sh <binary dir> <version> <output dir>
@@ -37,6 +37,11 @@ install -Dm644 "$repo/packaging/io.narl.proton-drive-linux.policy" \
install -Dm644 "$repo/packaging/proton-drive.service" \ install -Dm644 "$repo/packaging/proton-drive.service" \
"$root/lib/systemd/user/proton-drive.service" "$root/lib/systemd/user/proton-drive.service"
install -Dm644 "$repo/LICENSE" "$root/share/licenses/proton-drive-linux/LICENSE" install -Dm644 "$repo/LICENSE" "$root/share/licenses/proton-drive-linux/LICENSE"
# The offline Places basemap, fetched once into data/ and checked against
# its pinned SHA-256.
"$repo/scripts/fetch-basemap.sh"
install -Dm644 "$repo/data/basemap-v1.pmtiles" \
"$root/share/proton-drive-linux/basemap-v1.pmtiles"
"$repo/po/build.sh" "$root/share/locale" "$repo/po/build.sh" "$root/share/locale"
"$repo/packaging/completions.sh" "$root/bin/pdfs" "$root/share" "$repo/packaging/completions.sh" "$root/bin/pdfs" "$root/share"
install -Dm755 "$repo/packaging/tarball/install.sh" "$root/install.sh" install -Dm755 "$repo/packaging/tarball/install.sh" "$root/install.sh"
+1
View File
@@ -40,6 +40,7 @@ grep -qx "ExecStart=\"$prefix/bin/pdfs\" daemon" "$unit" || fail "ExecStart= was
[ -f "$prefix/share/locale/de/LC_MESSAGES/pdfs.mo" ] || fail "no translations" [ -f "$prefix/share/locale/de/LC_MESSAGES/pdfs.mo" ] || fail "no translations"
[ -f "$prefix/share/icons/hicolor/scalable/apps/io.narl.proton-drive-linux.svg" ] || fail "no icon" [ -f "$prefix/share/icons/hicolor/scalable/apps/io.narl.proton-drive-linux.svg" ] || fail "no icon"
[ -f "$prefix/share/bash-completion/completions/pdfs" ] || fail "no bash completion" [ -f "$prefix/share/bash-completion/completions/pdfs" ] || fail "no bash completion"
[ -f "$prefix/share/proton-drive-linux/basemap-v1.pmtiles" ] || fail "no Places basemap"
[ ! -e "$prefix/share/proton-drive-linux/managed-updates" ] || fail "the update check must stay on offer" [ ! -e "$prefix/share/proton-drive-linux/managed-updates" ] || fail "the update check must stay on offer"
uninstaller="$prefix/share/proton-drive-linux/install.sh" uninstaller="$prefix/share/proton-drive-linux/install.sh"
[ -x "$uninstaller" ] || fail "install.sh was not kept for --uninstall" [ -x "$uninstaller" ] || fail "install.sh was not kept for --uninstall"
+391 -376
View File
File diff suppressed because it is too large. Load diff
+389 -375
View File
File diff suppressed because it is too large. Load diff
+392 -376
View File
File diff suppressed because it is too large. Load diff
+392 -375
View File
File diff suppressed because it is too large. Load diff
+392 -376
View File
File diff suppressed because it is too large. Load diff
+390 -374
View File
File diff suppressed because it is too large. Load diff
+382 -364
View File
File diff suppressed because it is too large. Load diff
+391 -373
View File
File diff suppressed because it is too large. Load diff
+392 -376
View File
File diff suppressed because it is too large. Load diff
+23
View File
@@ -0,0 +1,23 @@
#!/usr/bin/env bash
# Download the offline Places basemap built by proton-rs's `basemap` tool,
# checked against its pinned SHA-256. Without it the map shows coarse
# outlines only.
set -euo pipefail
root=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)
name=basemap-v1.pmtiles
url=https://github.com/narrrl/proton-rs/releases/download/basemap-v1/$name
sha256=ce9acab1b7ed7f15b23e2365b1b6a580db79f4bc4421851ee673eff4c920d280
out=${1:-$root/data/$name}
if [[ -f $out ]] && echo "$sha256 $out" | sha256sum --check --status; then
exit 0
fi
mkdir -p "$(dirname -- "$out")"
part=$(mktemp "$out.XXXXXX")
trap 'rm -f -- "$part"' EXIT
curl --fail --location --silent --show-error --retry 3 --output "$part" "$url"
echo "$sha256 $part" | sha256sum --check --status || {
echo "The downloaded $name doesn't match its pinned checksum." >&2
exit 1
}
chmod 644 "$part"
mv -- "$part" "$out"
+4
View File
@@ -233,6 +233,9 @@ printf '[Settings]\ngtk-decoration-layout=:close\n' >"$root/config/gtk-4.0/setti
home=/home/alex home=/home/alex
[[ -e "$home" ]] && home="$root/home" [[ -e "$home" ]] && home="$root/home"
# The offline Places basemap, as the packages install it.
"$repo/scripts/fetch-basemap.sh"
outer_bus=${DBUS_SESSION_BUS_ADDRESS:-unset} outer_bus=${DBUS_SESSION_BUS_ADDRESS:-unset}
env -i \ env -i \
PATH="$PATH" LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 TZ="${TZ:-Europe/Berlin}" \ PATH="$PATH" LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 TZ="${TZ:-Europe/Berlin}" \
@@ -241,6 +244,7 @@ env -i \
XDG_CACHE_HOME="$root/cache" XDG_DATA_HOME="$root/data" \ XDG_CACHE_HOME="$root/cache" XDG_DATA_HOME="$root/data" \
XDG_RUNTIME_DIR="$root/run" \ XDG_RUNTIME_DIR="$root/run" \
PDFS_DEMO_ROOT="$root" PDFS_DEMO_OUTER_BUS="$outer_bus" \ PDFS_DEMO_ROOT="$root" PDFS_DEMO_OUTER_BUS="$outer_bus" \
PDFS_BASEMAP="$repo/data/basemap-v1.pmtiles" \
GSETTINGS_BACKEND=memory ADW_DEBUG_COLOR_SCHEME=prefer-dark GTK_A11Y=none GDK_DEBUG=no-portals \ GSETTINGS_BACKEND=memory ADW_DEBUG_COLOR_SCHEME=prefer-dark GTK_A11Y=none GDK_DEBUG=no-portals \
BIN="$bin" PHOTOS="$photos" OUT="$out" SHOTS="$shots" SETTLE="$settle" \ BIN="$bin" PHOTOS="$photos" OUT="$out" SHOTS="$shots" SETTLE="$settle" \
dbus-run-session -- "$repo/scripts/screenshots.sh" --session 2>"$root/session.log" dbus-run-session -- "$repo/scripts/screenshots.sh" --session 2>"$root/session.log"