mirror of
https://github.com/narrrl/proton-drive-linux.git
synced 2026-11-21 18:23:48 +01:00
Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
43b76d4791 | ||
|
|
734e9040fb | ||
|
|
01e3860741 | ||
|
|
7a65e7011f | ||
|
|
233d9e9e51 | ||
|
|
73c4e1f6bf | ||
|
|
26272cda6c | ||
|
|
370abd58dc | ||
|
|
24594b24ae | ||
|
|
04f0713012 |
No files matched your search
Generated
+137
-66
@@ -182,6 +182,17 @@ version = "1.0.104"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
|
checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "apple-native-keyring-store"
|
||||||
|
version = "1.0.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2b350bfd03649e07aa05c0a81b3e15934374e585c98204a57e20b9d49f49bb9a"
|
||||||
|
dependencies = [
|
||||||
|
"keyring-core",
|
||||||
|
"log",
|
||||||
|
"security-framework",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "arbitrary"
|
name = "arbitrary"
|
||||||
version = "1.5.0"
|
version = "1.5.0"
|
||||||
@@ -3618,23 +3629,23 @@ dependencies = [
|
|||||||
"dbus-secret-service-keyring-store",
|
"dbus-secret-service-keyring-store",
|
||||||
"directories",
|
"directories",
|
||||||
"ignore",
|
"ignore",
|
||||||
"kamadak-exif",
|
|
||||||
"keyring-core",
|
"keyring-core",
|
||||||
"libc",
|
"libc",
|
||||||
"parking_lot 0.13.0",
|
"parking_lot 0.13.0",
|
||||||
|
"proton-auth-rs",
|
||||||
|
"proton-base-rs",
|
||||||
"proton-drive-rs",
|
"proton-drive-rs",
|
||||||
|
"proton-gallery-rs",
|
||||||
"proton-sdk",
|
"proton-sdk",
|
||||||
"rusqlite",
|
"rusqlite",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"sha1 0.11.0",
|
|
||||||
"sha2 0.11.1",
|
"sha2 0.11.1",
|
||||||
"shell-words",
|
"shell-words",
|
||||||
"thiserror 2.0.21",
|
"thiserror 2.0.21",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tracing",
|
"tracing",
|
||||||
"zeroize",
|
"zeroize",
|
||||||
"zip",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3655,9 +3666,10 @@ dependencies = [
|
|||||||
"notify",
|
"notify",
|
||||||
"parking_lot 0.13.0",
|
"parking_lot 0.13.0",
|
||||||
"pdfs-core",
|
"pdfs-core",
|
||||||
"pg-app",
|
|
||||||
"pg-core",
|
|
||||||
"proton-drive-rs",
|
"proton-drive-rs",
|
||||||
|
"proton-gallery-app-rs",
|
||||||
|
"proton-gallery-rs",
|
||||||
|
"proton-media-rs",
|
||||||
"rustix",
|
"rustix",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
@@ -3683,7 +3695,7 @@ dependencies = [
|
|||||||
"libadwaita",
|
"libadwaita",
|
||||||
"pangocairo",
|
"pangocairo",
|
||||||
"pdfs-core",
|
"pdfs-core",
|
||||||
"pg-core",
|
"proton-gallery-rs",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
@@ -3708,65 +3720,6 @@ version = "2.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
|
checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pg-app"
|
|
||||||
version = "0.3.0"
|
|
||||||
source = "git+https://github.com/narrrl/proton-gallery.git?rev=858d2446f71214ec5357eb8b543d6b82abf47386#858d2446f71214ec5357eb8b543d6b82abf47386"
|
|
||||||
dependencies = [
|
|
||||||
"async-trait",
|
|
||||||
"hex",
|
|
||||||
"pg-core",
|
|
||||||
"pg-drive",
|
|
||||||
"proton-drive-rs",
|
|
||||||
"proton-sdk",
|
|
||||||
"serde_json",
|
|
||||||
"sha2 0.11.1",
|
|
||||||
"tempfile",
|
|
||||||
"thiserror 2.0.21",
|
|
||||||
"tokio",
|
|
||||||
"tracing",
|
|
||||||
"zeroize",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pg-core"
|
|
||||||
version = "0.3.0"
|
|
||||||
source = "git+https://github.com/narrrl/proton-gallery.git?rev=858d2446f71214ec5357eb8b543d6b82abf47386#858d2446f71214ec5357eb8b543d6b82abf47386"
|
|
||||||
dependencies = [
|
|
||||||
"aes-gcm 0.11.1",
|
|
||||||
"async-trait",
|
|
||||||
"getrandom 0.4.3",
|
|
||||||
"hex",
|
|
||||||
"rusqlite",
|
|
||||||
"serde",
|
|
||||||
"serde_json",
|
|
||||||
"sha2 0.11.1",
|
|
||||||
"tempfile",
|
|
||||||
"thiserror 2.0.21",
|
|
||||||
"tokio",
|
|
||||||
"tokio-util",
|
|
||||||
"zeroize",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pg-drive"
|
|
||||||
version = "0.3.0"
|
|
||||||
source = "git+https://github.com/narrrl/proton-gallery.git?rev=858d2446f71214ec5357eb8b543d6b82abf47386#858d2446f71214ec5357eb8b543d6b82abf47386"
|
|
||||||
dependencies = [
|
|
||||||
"async-trait",
|
|
||||||
"hex",
|
|
||||||
"pg-core",
|
|
||||||
"proton-drive-rs",
|
|
||||||
"proton-sdk",
|
|
||||||
"serde",
|
|
||||||
"serde_json",
|
|
||||||
"sha2 0.11.1",
|
|
||||||
"thiserror 2.0.21",
|
|
||||||
"tokio",
|
|
||||||
"tracing",
|
|
||||||
"zeroize",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pgp"
|
name = "pgp"
|
||||||
version = "0.21.0"
|
version = "0.21.0"
|
||||||
@@ -3971,6 +3924,32 @@ dependencies = [
|
|||||||
"syn 2.0.119",
|
"syn 2.0.119",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proton-auth-rs"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e140db8b4444e50c818c9793c2078b57c16c5b6c285a8d4bbd74886f41b05c6f"
|
||||||
|
dependencies = [
|
||||||
|
"apple-native-keyring-store",
|
||||||
|
"dbus-secret-service",
|
||||||
|
"dbus-secret-service-keyring-store",
|
||||||
|
"keyring-core",
|
||||||
|
"thiserror 2.0.21",
|
||||||
|
"tracing",
|
||||||
|
"windows-native-keyring-store",
|
||||||
|
"zeroize",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proton-base-rs"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "451151bb1025ea5cb362f69e2bfb2d45afed603e5c6daa3dc752333a7c29c878"
|
||||||
|
dependencies = [
|
||||||
|
"rusqlite",
|
||||||
|
"thiserror 2.0.21",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proton-drive-rs"
|
name = "proton-drive-rs"
|
||||||
version = "0.12.1"
|
version = "0.12.1"
|
||||||
@@ -3999,6 +3978,85 @@ dependencies = [
|
|||||||
"tracing",
|
"tracing",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proton-gallery-app-rs"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d6d18d11266ab2be5ab2f4b4040941caf2736c257e13909af7be8ea331892d59"
|
||||||
|
dependencies = [
|
||||||
|
"async-trait",
|
||||||
|
"futures-util",
|
||||||
|
"hex",
|
||||||
|
"proton-drive-rs",
|
||||||
|
"proton-gallery-drive-rs",
|
||||||
|
"proton-gallery-rs",
|
||||||
|
"proton-sdk",
|
||||||
|
"serde_json",
|
||||||
|
"sha2 0.11.1",
|
||||||
|
"tempfile",
|
||||||
|
"thiserror 2.0.21",
|
||||||
|
"tokio",
|
||||||
|
"tracing",
|
||||||
|
"zeroize",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proton-gallery-drive-rs"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "535a14f63fd542701d2606acb971d4a7e8f235ca7b9439fea8c80a3f26110186"
|
||||||
|
dependencies = [
|
||||||
|
"async-trait",
|
||||||
|
"hex",
|
||||||
|
"proton-drive-rs",
|
||||||
|
"proton-gallery-rs",
|
||||||
|
"proton-sdk",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"sha2 0.11.1",
|
||||||
|
"thiserror 2.0.21",
|
||||||
|
"tokio",
|
||||||
|
"tracing",
|
||||||
|
"zeroize",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proton-gallery-rs"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "dc9c9bbb76a5fba4071ee90de4aada71c292c0e408024ddfb04a12869291404a"
|
||||||
|
dependencies = [
|
||||||
|
"aes-gcm 0.11.1",
|
||||||
|
"async-trait",
|
||||||
|
"getrandom 0.4.3",
|
||||||
|
"hex",
|
||||||
|
"kamadak-exif",
|
||||||
|
"rusqlite",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"sha2 0.11.1",
|
||||||
|
"tempfile",
|
||||||
|
"thiserror 2.0.21",
|
||||||
|
"tokio",
|
||||||
|
"tokio-util",
|
||||||
|
"tracing",
|
||||||
|
"zeroize",
|
||||||
|
"zip",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proton-media-rs"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f03aa6c403e4f2f7a8f9a444dff1e268d8bc9bcaf1d0d953cc3a1312d798f1ef"
|
||||||
|
dependencies = [
|
||||||
|
"lru",
|
||||||
|
"sha2 0.11.1",
|
||||||
|
"thiserror 2.0.21",
|
||||||
|
"tokio",
|
||||||
|
"tracing",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proton-sdk"
|
name = "proton-sdk"
|
||||||
version = "0.12.1"
|
version = "0.12.1"
|
||||||
@@ -5139,7 +5197,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
|
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fastrand",
|
"fastrand",
|
||||||
"getrandom 0.3.4",
|
"getrandom 0.4.3",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"rustix",
|
"rustix",
|
||||||
"windows-sys 0.61.2",
|
"windows-sys 0.61.2",
|
||||||
@@ -5857,6 +5915,19 @@ version = "0.2.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
|
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-native-keyring-store"
|
||||||
|
version = "1.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "063426e76fdec7438d56bb777f67e318a84a25c707b07e575cb8b78e10c028f8"
|
||||||
|
dependencies = [
|
||||||
|
"byteorder",
|
||||||
|
"keyring-core",
|
||||||
|
"regex",
|
||||||
|
"windows-sys 0.61.2",
|
||||||
|
"zeroize",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-result"
|
name = "windows-result"
|
||||||
version = "0.4.1"
|
version = "0.4.1"
|
||||||
|
|||||||
+7
-2
@@ -17,8 +17,8 @@ categories = ["filesystem", "command-line-utilities"]
|
|||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
proton-sdk = { version = "0.12.1" }
|
proton-sdk = { version = "0.12.1" }
|
||||||
proton-drive-rs = { version = "0.12.1" }
|
proton-drive-rs = { version = "0.12.1" }
|
||||||
pg-app = { git = "https://github.com/narrrl/proton-gallery.git", rev = "858d2446f71214ec5357eb8b543d6b82abf47386" }
|
proton-gallery-app-rs = "0.1.0"
|
||||||
pg-core = { git = "https://github.com/narrrl/proton-gallery.git", rev = "858d2446f71214ec5357eb8b543d6b82abf47386" }
|
proton-gallery-rs = "0.1.1"
|
||||||
chrono = { version = "0.4", default-features = false, features = ["std"] }
|
chrono = { version = "0.4", default-features = false, features = ["std"] }
|
||||||
|
|
||||||
# Internal crates.
|
# Internal crates.
|
||||||
@@ -63,6 +63,11 @@ rusqlite = { version = "0.41", features = ["bundled"] }
|
|||||||
# Secret Service store is the one keyring 3's `sync-secret-service` wrapped, and
|
# Secret Service store is the one keyring 3's `sync-secret-service` wrapped, and
|
||||||
# with no `target` it matches items v3 wrote, so existing logins survive.
|
# with no `target` it matches items v3 wrote, so existing logins survive.
|
||||||
keyring-core = "1"
|
keyring-core = "1"
|
||||||
|
# The keyring store all three apps share: reconnects after a Secret Service
|
||||||
|
# restart (B285) and replaces items instead of editing them (B291).
|
||||||
|
proton-auth-rs = "0.1"
|
||||||
|
proton-base-rs = "0.1"
|
||||||
|
proton-media-rs = "0.1.1"
|
||||||
dbus-secret-service-keyring-store = { version = "1", features = ["crypto-rust"] }
|
dbus-secret-service-keyring-store = { version = "1", features = ["crypto-rust"] }
|
||||||
# The same Secret Service client the store wraps, used directly to replace an
|
# The same Secret Service client the store wraps, used directly to replace an
|
||||||
# item instead of editing it, which oo7 before 0.7.0 kept only in memory (B291).
|
# item instead of editing it, which oo7 before 0.7.0 kept only in memory (B291).
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ description = "Core auth/session/config for the Proton Drive Linux client"
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
proton-sdk.workspace = true
|
proton-sdk.workspace = true
|
||||||
proton-drive-rs.workspace = true
|
proton-drive-rs.workspace = true
|
||||||
|
proton-gallery-rs.workspace = true
|
||||||
chrono.workspace = true
|
chrono.workspace = true
|
||||||
tokio.workspace = true
|
tokio.workspace = true
|
||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
@@ -22,10 +23,10 @@ directories.workspace = true
|
|||||||
ignore.workspace = true
|
ignore.workspace = true
|
||||||
shell-words.workspace = true
|
shell-words.workspace = true
|
||||||
sha2.workspace = true
|
sha2.workspace = true
|
||||||
sha1.workspace = true
|
|
||||||
zip.workspace = true
|
|
||||||
rusqlite.workspace = true
|
rusqlite.workspace = true
|
||||||
keyring-core.workspace = true
|
keyring-core.workspace = true
|
||||||
|
proton-auth-rs = { workspace = true, features = ["keyring"] }
|
||||||
|
proton-base-rs.workspace = true
|
||||||
dbus-secret-service-keyring-store.workspace = true
|
dbus-secret-service-keyring-store.workspace = true
|
||||||
dbus-secret-service.workspace = true
|
dbus-secret-service.workspace = true
|
||||||
parking_lot.workspace = true
|
parking_lot.workspace = true
|
||||||
@@ -33,4 +34,3 @@ async-trait.workspace = true
|
|||||||
libc.workspace = true
|
libc.workspace = true
|
||||||
zeroize.workspace = true
|
zeroize.workspace = true
|
||||||
base64.workspace = true
|
base64.workspace = true
|
||||||
exif = { version = "0.6", package = "kamadak-exif" }
|
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -1,250 +0,0 @@
|
|||||||
AD Andorra
|
|
||||||
AE United Arab Emirates
|
|
||||||
AF Afghanistan
|
|
||||||
AG Antigua and Barbuda
|
|
||||||
AI Anguilla
|
|
||||||
AL Albania
|
|
||||||
AM Armenia
|
|
||||||
AO Angola
|
|
||||||
AQ Antarctica
|
|
||||||
AR Argentina
|
|
||||||
AS American Samoa
|
|
||||||
AT Austria
|
|
||||||
AU Australia
|
|
||||||
AW Aruba
|
|
||||||
AX Åland Islands
|
|
||||||
AZ Azerbaijan
|
|
||||||
BA Bosnia and Herzegovina
|
|
||||||
BB Barbados
|
|
||||||
BD Bangladesh
|
|
||||||
BE Belgium
|
|
||||||
BF Burkina Faso
|
|
||||||
BG Bulgaria
|
|
||||||
BH Bahrain
|
|
||||||
BI Burundi
|
|
||||||
BJ Benin
|
|
||||||
BL Saint Barthélemy
|
|
||||||
BM Bermuda
|
|
||||||
BN Brunei Darussalam
|
|
||||||
BO Bolivia, Plurinational State of
|
|
||||||
BQ Bonaire, Sint Eustatius and Saba
|
|
||||||
BR Brazil
|
|
||||||
BS Bahamas
|
|
||||||
BT Bhutan
|
|
||||||
BV Bouvet Island
|
|
||||||
BW Botswana
|
|
||||||
BY Belarus
|
|
||||||
BZ Belize
|
|
||||||
CA Canada
|
|
||||||
CC Cocos (Keeling) Islands
|
|
||||||
CD Congo, The Democratic Republic of the
|
|
||||||
CF Central African Republic
|
|
||||||
CG Congo
|
|
||||||
CH Switzerland
|
|
||||||
CI Côte d'Ivoire
|
|
||||||
CK Cook Islands
|
|
||||||
CL Chile
|
|
||||||
CM Cameroon
|
|
||||||
CN China
|
|
||||||
CO Colombia
|
|
||||||
CR Costa Rica
|
|
||||||
CU Cuba
|
|
||||||
CV Cabo Verde
|
|
||||||
CW Curaçao
|
|
||||||
CX Christmas Island
|
|
||||||
CY Cyprus
|
|
||||||
CZ Czechia
|
|
||||||
DE Germany
|
|
||||||
DJ Djibouti
|
|
||||||
DK Denmark
|
|
||||||
DM Dominica
|
|
||||||
DO Dominican Republic
|
|
||||||
DZ Algeria
|
|
||||||
EC Ecuador
|
|
||||||
EE Estonia
|
|
||||||
EG Egypt
|
|
||||||
EH Western Sahara
|
|
||||||
ER Eritrea
|
|
||||||
ES Spain
|
|
||||||
ET Ethiopia
|
|
||||||
FI Finland
|
|
||||||
FJ Fiji
|
|
||||||
FK Falkland Islands (Malvinas)
|
|
||||||
FM Micronesia, Federated States of
|
|
||||||
FO Faroe Islands
|
|
||||||
FR France
|
|
||||||
GA Gabon
|
|
||||||
GB United Kingdom
|
|
||||||
GD Grenada
|
|
||||||
GE Georgia
|
|
||||||
GF French Guiana
|
|
||||||
GG Guernsey
|
|
||||||
GH Ghana
|
|
||||||
GI Gibraltar
|
|
||||||
GL Greenland
|
|
||||||
GM Gambia
|
|
||||||
GN Guinea
|
|
||||||
GP Guadeloupe
|
|
||||||
GQ Equatorial Guinea
|
|
||||||
GR Greece
|
|
||||||
GS South Georgia and the South Sandwich Islands
|
|
||||||
GT Guatemala
|
|
||||||
GU Guam
|
|
||||||
GW Guinea-Bissau
|
|
||||||
GY Guyana
|
|
||||||
HK Hong Kong
|
|
||||||
HM Heard Island and McDonald Islands
|
|
||||||
HN Honduras
|
|
||||||
HR Croatia
|
|
||||||
HT Haiti
|
|
||||||
HU Hungary
|
|
||||||
ID Indonesia
|
|
||||||
IE Ireland
|
|
||||||
IL Israel
|
|
||||||
IM Isle of Man
|
|
||||||
IN India
|
|
||||||
IO British Indian Ocean Territory
|
|
||||||
IQ Iraq
|
|
||||||
IR Iran, Islamic Republic of
|
|
||||||
IS Iceland
|
|
||||||
IT Italy
|
|
||||||
JE Jersey
|
|
||||||
JM Jamaica
|
|
||||||
JO Jordan
|
|
||||||
JP Japan
|
|
||||||
KE Kenya
|
|
||||||
KG Kyrgyzstan
|
|
||||||
KH Cambodia
|
|
||||||
KI Kiribati
|
|
||||||
KM Comoros
|
|
||||||
KN Saint Kitts and Nevis
|
|
||||||
KP Korea, Democratic People's Republic of
|
|
||||||
KR Korea, Republic of
|
|
||||||
KW Kuwait
|
|
||||||
KY Cayman Islands
|
|
||||||
KZ Kazakhstan
|
|
||||||
LA Lao People's Democratic Republic
|
|
||||||
LB Lebanon
|
|
||||||
LC Saint Lucia
|
|
||||||
LI Liechtenstein
|
|
||||||
LK Sri Lanka
|
|
||||||
LR Liberia
|
|
||||||
LS Lesotho
|
|
||||||
LT Lithuania
|
|
||||||
LU Luxembourg
|
|
||||||
LV Latvia
|
|
||||||
LY Libya
|
|
||||||
MA Morocco
|
|
||||||
MC Monaco
|
|
||||||
MD Moldova, Republic of
|
|
||||||
ME Montenegro
|
|
||||||
MF Saint Martin (French part)
|
|
||||||
MG Madagascar
|
|
||||||
MH Marshall Islands
|
|
||||||
MK North Macedonia
|
|
||||||
ML Mali
|
|
||||||
MM Myanmar
|
|
||||||
MN Mongolia
|
|
||||||
MO Macao
|
|
||||||
MP Northern Mariana Islands
|
|
||||||
MQ Martinique
|
|
||||||
MR Mauritania
|
|
||||||
MS Montserrat
|
|
||||||
MT Malta
|
|
||||||
MU Mauritius
|
|
||||||
MV Maldives
|
|
||||||
MW Malawi
|
|
||||||
MX Mexico
|
|
||||||
MY Malaysia
|
|
||||||
MZ Mozambique
|
|
||||||
NA Namibia
|
|
||||||
NC New Caledonia
|
|
||||||
NE Niger
|
|
||||||
NF Norfolk Island
|
|
||||||
NG Nigeria
|
|
||||||
NI Nicaragua
|
|
||||||
NL Netherlands
|
|
||||||
NO Norway
|
|
||||||
NP Nepal
|
|
||||||
NR Nauru
|
|
||||||
NU Niue
|
|
||||||
NZ New Zealand
|
|
||||||
OM Oman
|
|
||||||
PA Panama
|
|
||||||
PE Peru
|
|
||||||
PF French Polynesia
|
|
||||||
PG Papua New Guinea
|
|
||||||
PH Philippines
|
|
||||||
PK Pakistan
|
|
||||||
PL Poland
|
|
||||||
PM Saint Pierre and Miquelon
|
|
||||||
PN Pitcairn
|
|
||||||
PR Puerto Rico
|
|
||||||
PS Palestine, State of
|
|
||||||
PT Portugal
|
|
||||||
PW Palau
|
|
||||||
PY Paraguay
|
|
||||||
QA Qatar
|
|
||||||
RE Réunion
|
|
||||||
RO Romania
|
|
||||||
RS Serbia
|
|
||||||
RU Russian Federation
|
|
||||||
RW Rwanda
|
|
||||||
SA Saudi Arabia
|
|
||||||
SB Solomon Islands
|
|
||||||
SC Seychelles
|
|
||||||
SD Sudan
|
|
||||||
SE Sweden
|
|
||||||
SG Singapore
|
|
||||||
SH Saint Helena, Ascension and Tristan da Cunha
|
|
||||||
SI Slovenia
|
|
||||||
SJ Svalbard and Jan Mayen
|
|
||||||
SK Slovakia
|
|
||||||
SL Sierra Leone
|
|
||||||
SM San Marino
|
|
||||||
SN Senegal
|
|
||||||
SO Somalia
|
|
||||||
SR Suriname
|
|
||||||
SS South Sudan
|
|
||||||
ST Sao Tome and Principe
|
|
||||||
SV El Salvador
|
|
||||||
SX Sint Maarten (Dutch part)
|
|
||||||
SY Syrian Arab Republic
|
|
||||||
SZ Eswatini
|
|
||||||
TC Turks and Caicos Islands
|
|
||||||
TD Chad
|
|
||||||
TF French Southern Territories
|
|
||||||
TG Togo
|
|
||||||
TH Thailand
|
|
||||||
TJ Tajikistan
|
|
||||||
TK Tokelau
|
|
||||||
TL Timor-Leste
|
|
||||||
TM Turkmenistan
|
|
||||||
TN Tunisia
|
|
||||||
TO Tonga
|
|
||||||
TR Türkiye
|
|
||||||
TT Trinidad and Tobago
|
|
||||||
TV Tuvalu
|
|
||||||
TW Taiwan, Province of China
|
|
||||||
TZ Tanzania, United Republic of
|
|
||||||
UA Ukraine
|
|
||||||
UG Uganda
|
|
||||||
UM United States Minor Outlying Islands
|
|
||||||
US United States
|
|
||||||
UY Uruguay
|
|
||||||
UZ Uzbekistan
|
|
||||||
VA Holy See (Vatican City State)
|
|
||||||
VC Saint Vincent and the Grenadines
|
|
||||||
VE Venezuela, Bolivarian Republic of
|
|
||||||
VG Virgin Islands, British
|
|
||||||
VI Virgin Islands, U.S.
|
|
||||||
VN Viet Nam
|
|
||||||
VU Vanuatu
|
|
||||||
WF Wallis and Futuna
|
|
||||||
WS Samoa
|
|
||||||
XK Kosovo
|
|
||||||
YE Yemen
|
|
||||||
YT Mayotte
|
|
||||||
ZA South Africa
|
|
||||||
ZM Zambia
|
|
||||||
ZW Zimbabwe
|
|
||||||
|
@@ -28,6 +28,7 @@ use std::time::Duration;
|
|||||||
use base64::Engine as _;
|
use base64::Engine as _;
|
||||||
use base64::engine::general_purpose::STANDARD as BASE64;
|
use base64::engine::general_purpose::STANDARD as BASE64;
|
||||||
use keyring_core::Entry;
|
use keyring_core::Entry;
|
||||||
|
use proton_auth_rs::{KeyringStore, SecretStore};
|
||||||
use proton_drive_rs::{KeySalt, ProtonDriveClient};
|
use proton_drive_rs::{KeySalt, ProtonDriveClient};
|
||||||
use proton_sdk::account::KeyPassphrases;
|
use proton_sdk::account::KeyPassphrases;
|
||||||
use proton_sdk::api::{HumanVerification, HumanVerificationCredential};
|
use proton_sdk::api::{HumanVerification, HumanVerificationCredential};
|
||||||
@@ -125,82 +126,28 @@ fn client_config() -> ProtonClientConfiguration {
|
|||||||
|
|
||||||
/// Run `op` on the session's keyring entry.
|
/// Run `op` on the session's keyring entry.
|
||||||
fn with_keyring<T>(op: impl Fn(&Entry) -> keyring_core::Result<T>) -> Result<T> {
|
fn with_keyring<T>(op: impl Fn(&Entry) -> keyring_core::Result<T>) -> Result<T> {
|
||||||
with_keyring_entry(KEYRING_SERVICE, KEYRING_USER, op)
|
Ok(keyring().with_entry(KEYRING_USER, op)?)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Run `op` on the entry `service`/`user`, reconnecting once if the Secret
|
/// The process's keyring, connected on first use.
|
||||||
/// Service fails the call.
|
|
||||||
///
|
///
|
||||||
/// The store holds one D-Bus connection and one Secret Service session for the
|
/// One connection for the whole process; when the Secret Service fails it
|
||||||
/// whole process. The session lives in the provider's memory: once the provider
|
/// (a restarted provider forgets the session, `docs/BUGS.md` B285), the call
|
||||||
/// restarts (oo7's unit restarts it on failure, and both oo7 and gnome-keyring
|
/// reconnects and is made once more. A changed session replaces its item
|
||||||
/// can be `--replace`d), every read and write on the old session fails with
|
/// instead of editing it (B291). Both live in `proton-auth-rs`.
|
||||||
/// `NoSession`, for as long as this process runs. A daemon then keeps refreshed
|
fn keyring() -> &'static KeyringStore {
|
||||||
/// tokens only in memory, and a cold boot loses them (`docs/BUGS.md` B285). A
|
static STORE: std::sync::OnceLock<KeyringStore> = std::sync::OnceLock::new();
|
||||||
/// platform failure therefore drops the store, and the call is made once more
|
STORE.get_or_init(|| {
|
||||||
/// on a new one. A locked keyring, a dismissed prompt or a missing entry is
|
#[cfg(not(test))]
|
||||||
/// not the connection's fault and comes back as it is.
|
{
|
||||||
fn with_keyring_entry<T>(
|
KeyringStore::new(KEYRING_SERVICE)
|
||||||
service: &str,
|
|
||||||
user: &str,
|
|
||||||
op: impl Fn(&Entry) -> keyring_core::Result<T>,
|
|
||||||
) -> Result<T> {
|
|
||||||
let store = keyring_store()?;
|
|
||||||
match op(&Entry::new(service, user)?) {
|
|
||||||
Err(keyring_core::Error::PlatformFailure(e)) => {
|
|
||||||
tracing::warn!(
|
|
||||||
error = %e,
|
|
||||||
"the Secret Service failed this process's connection; reconnecting"
|
|
||||||
);
|
|
||||||
drop_keyring_store(&store);
|
|
||||||
keyring_store()?;
|
|
||||||
Ok(op(&Entry::new(service, user)?)?)
|
|
||||||
}
|
}
|
||||||
result => Ok(result?),
|
#[cfg(test)]
|
||||||
}
|
{
|
||||||
}
|
KeyringStore::with_connector(KEYRING_SERVICE, Arc::new(tests::connect_keyring_store))
|
||||||
|
.replace_items(|| tests::MOCK_STORE.lock().is_none())
|
||||||
/// Held while the default store is looked at and replaced, so that threads
|
}
|
||||||
/// failing at the same time drop the broken store once and share its
|
})
|
||||||
/// replacement.
|
|
||||||
static KEYRING_STORE: parking_lot::Mutex<()> = parking_lot::Mutex::new(());
|
|
||||||
|
|
||||||
/// The process's Secret Service store, connected now if there is none.
|
|
||||||
///
|
|
||||||
/// Connected lazily rather than once at startup so a session bus that was not
|
|
||||||
/// up yet on the first attempt is tried again on the next one.
|
|
||||||
fn keyring_store() -> Result<Arc<keyring_core::CredentialStore>> {
|
|
||||||
let _swap = KEYRING_STORE.lock();
|
|
||||||
if let Some(store) = keyring_core::get_default_store() {
|
|
||||||
return Ok(store);
|
|
||||||
}
|
|
||||||
let store = connect_keyring_store()?;
|
|
||||||
keyring_core::set_default_store(Arc::clone(&store));
|
|
||||||
Ok(store)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Forget `failed`, unless another thread has already replaced it.
|
|
||||||
fn drop_keyring_store(failed: &Arc<keyring_core::CredentialStore>) {
|
|
||||||
let _swap = KEYRING_STORE.lock();
|
|
||||||
if keyring_core::get_default_store().is_some_and(|store| Arc::ptr_eq(&store, failed)) {
|
|
||||||
keyring_core::unset_default_store();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(not(test))]
|
|
||||||
fn connect_keyring_store() -> Result<Arc<keyring_core::CredentialStore>> {
|
|
||||||
Ok(dbus_secret_service_keyring_store::Store::new()?)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The tests' in-memory store when they set one, so a reconnect finds the
|
|
||||||
/// same entries; the real Secret Service otherwise.
|
|
||||||
#[cfg(test)]
|
|
||||||
fn connect_keyring_store() -> Result<Arc<keyring_core::CredentialStore>> {
|
|
||||||
tests::KEYRING_CONNECTS.fetch_add(1, Ordering::SeqCst);
|
|
||||||
match tests::MOCK_STORE.lock().clone() {
|
|
||||||
Some(store) => Ok(store),
|
|
||||||
None => Ok(dbus_secret_service_keyring_store::Store::new()?),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// What the user answered when asked for the mailbox password.
|
/// What the user answered when asked for the mailbox password.
|
||||||
@@ -492,33 +439,12 @@ fn classify_verification_gate(e: ProtonError) -> Error {
|
|||||||
|
|
||||||
/// Save `stored` to the keyring.
|
/// Save `stored` to the keyring.
|
||||||
///
|
///
|
||||||
/// An existing entry is replaced by a new item rather than edited, because
|
/// Save the session. An existing entry is replaced by a new item rather than
|
||||||
/// oo7 before 0.7.0 keeps an edit only in memory and a reboot brings the
|
/// edited, because oo7 before 0.7.0 keeps an edit only in memory and a reboot
|
||||||
/// spent refresh token back (`docs/BUGS.md` B291). The usual write is the
|
/// brings the spent refresh token back (`docs/BUGS.md` B291).
|
||||||
/// fallback: for the first save, and whenever replacing is not possible.
|
|
||||||
fn write_stored(stored: &StoredSession) -> Result<()> {
|
fn write_stored(stored: &StoredSession) -> Result<()> {
|
||||||
let json = Zeroizing::new(serde_json::to_string(stored)?);
|
let json = Zeroizing::new(serde_json::to_string(stored)?);
|
||||||
if replace_items() {
|
Ok(keyring().set(KEYRING_USER, &json)?)
|
||||||
match crate::secretservice::replace(KEYRING_SERVICE, KEYRING_USER, json.as_bytes()) {
|
|
||||||
crate::secretservice::Replaced::Saved => return Ok(()),
|
|
||||||
crate::secretservice::Replaced::Skipped(why) => {
|
|
||||||
tracing::debug!(%why, "not replacing the keyring item; writing it in place");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
with_keyring(|entry| entry.set_password(&json))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Whether [`write_stored`] talks to the Secret Service directly: always,
|
|
||||||
/// except in tests that use the in-memory store.
|
|
||||||
#[cfg(not(test))]
|
|
||||||
fn replace_items() -> bool {
|
|
||||||
true
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
fn replace_items() -> bool {
|
|
||||||
tests::MOCK_STORE.lock().is_none()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A short, one-way tag for a refresh token, for the log: enough to tell
|
/// A short, one-way tag for a refresh token, for the log: enough to tell
|
||||||
@@ -1324,9 +1250,30 @@ mod tests {
|
|||||||
let store: Arc<keyring_core::CredentialStore> = keyring_core::mock::Store::new().unwrap();
|
let store: Arc<keyring_core::CredentialStore> = keyring_core::mock::Store::new().unwrap();
|
||||||
*MOCK_STORE.lock() = Some(Arc::clone(&store));
|
*MOCK_STORE.lock() = Some(Arc::clone(&store));
|
||||||
keyring_core::set_default_store(store);
|
keyring_core::set_default_store(store);
|
||||||
|
keyring().disconnect();
|
||||||
turn
|
turn
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The tests' in-memory store when they set one, so a reconnect finds the
|
||||||
|
/// same entries; the real Secret Service otherwise.
|
||||||
|
pub(super) fn connect_keyring_store() -> keyring_core::Result<Arc<keyring_core::CredentialStore>>
|
||||||
|
{
|
||||||
|
KEYRING_CONNECTS.fetch_add(1, Ordering::SeqCst);
|
||||||
|
match MOCK_STORE.lock().clone() {
|
||||||
|
Some(store) => Ok(store),
|
||||||
|
None => Ok(dbus_secret_service_keyring_store::Store::new()?),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Run `op` on the entry `service`/`user` of the real Secret Service.
|
||||||
|
fn with_keyring_entry<T>(
|
||||||
|
store: &KeyringStore,
|
||||||
|
user: &str,
|
||||||
|
op: impl Fn(&Entry) -> keyring_core::Result<T>,
|
||||||
|
) -> Result<T> {
|
||||||
|
Ok(store.with_entry(user, op)?)
|
||||||
|
}
|
||||||
|
|
||||||
static KEYRING: parking_lot::Mutex<()> = parking_lot::Mutex::new(());
|
static KEYRING: parking_lot::Mutex<()> = parking_lot::Mutex::new(());
|
||||||
|
|
||||||
/// The in-memory store a reconnect hands out, so it finds the same
|
/// The in-memory store a reconnect hands out, so it finds the same
|
||||||
@@ -1427,7 +1374,8 @@ mod tests {
|
|||||||
let _turn = KEYRING.lock();
|
let _turn = KEYRING.lock();
|
||||||
*MOCK_STORE.lock() = None;
|
*MOCK_STORE.lock() = None;
|
||||||
keyring_core::unset_default_store();
|
keyring_core::unset_default_store();
|
||||||
let (service, user) = ("pdfs-test", "restart");
|
let user = "restart";
|
||||||
|
let service = &KeyringStore::with_connector("pdfs-test", Arc::new(connect_keyring_store));
|
||||||
|
|
||||||
with_keyring_entry(service, user, |e| e.set_password("before")).unwrap();
|
with_keyring_entry(service, user, |e| e.set_password("before")).unwrap();
|
||||||
let status = std::process::Command::new("sh")
|
let status = std::process::Command::new("sh")
|
||||||
@@ -1468,6 +1416,7 @@ mod tests {
|
|||||||
let _turn = KEYRING.lock();
|
let _turn = KEYRING.lock();
|
||||||
*MOCK_STORE.lock() = None;
|
*MOCK_STORE.lock() = None;
|
||||||
keyring_core::unset_default_store();
|
keyring_core::unset_default_store();
|
||||||
|
keyring().disconnect();
|
||||||
|
|
||||||
for refresh in ["r1", "r2", "r3"] {
|
for refresh in ["r1", "r2", "r3"] {
|
||||||
write_stored(&stored_with(refresh)).unwrap();
|
write_stored(&stored_with(refresh)).unwrap();
|
||||||
|
|||||||
@@ -457,26 +457,7 @@ fn load_config_at(path: &Path) -> AppConfig {
|
|||||||
/// [`AppDirs::save_config`] for the file at `path`.
|
/// [`AppDirs::save_config`] for the file at `path`.
|
||||||
fn save_config_at(path: &Path, config: &AppConfig) -> Result<()> {
|
fn save_config_at(path: &Path, config: &AppConfig) -> Result<()> {
|
||||||
refuse_to_replace_unreadable(path)?;
|
refuse_to_replace_unreadable(path)?;
|
||||||
let parent = path
|
proton_base_rs::atomic::write(path, &serde_json::to_vec_pretty(config)?)?;
|
||||||
.parent()
|
|
||||||
.ok_or_else(|| Error::Other("configuration path has no parent".into()))?;
|
|
||||||
std::fs::create_dir_all(parent)?;
|
|
||||||
let nonce = std::time::SystemTime::now()
|
|
||||||
.duration_since(std::time::UNIX_EPOCH)
|
|
||||||
.map(|duration| duration.as_nanos())
|
|
||||||
.unwrap_or(0);
|
|
||||||
let tmp = path.with_extension(format!("json.tmp-{}-{nonce}", std::process::id()));
|
|
||||||
use std::os::unix::fs::OpenOptionsExt as _;
|
|
||||||
let mut file = std::fs::OpenOptions::new()
|
|
||||||
.write(true)
|
|
||||||
.create_new(true)
|
|
||||||
.mode(0o600)
|
|
||||||
.open(&tmp)?;
|
|
||||||
use std::io::Write as _;
|
|
||||||
file.write_all(&serde_json::to_vec_pretty(config)?)?;
|
|
||||||
file.sync_all()?;
|
|
||||||
std::fs::rename(&tmp, path)?;
|
|
||||||
std::fs::File::open(parent)?.sync_all()?;
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -621,15 +602,8 @@ impl AppDirs {
|
|||||||
use std::io::Read as _;
|
use std::io::Read as _;
|
||||||
std::fs::File::open("/dev/urandom")?.read_exact(&mut bytes)?;
|
std::fs::File::open("/dev/urandom")?.read_exact(&mut bytes)?;
|
||||||
let id: String = bytes.iter().map(|b| format!("{b:02x}")).collect();
|
let id: String = bytes.iter().map(|b| format!("{b:02x}")).collect();
|
||||||
let parent = path
|
// Not secret, and other tools may read it; keep it world-readable.
|
||||||
.parent()
|
proton_base_rs::atomic::write_with_mode(&path, format!("{id}\n").as_bytes(), 0o644)?;
|
||||||
.ok_or_else(|| Error::Other("machine id path has no parent".into()))?;
|
|
||||||
std::fs::create_dir_all(parent)?;
|
|
||||||
let tmp = path.with_extension(format!("tmp-{}", std::process::id()));
|
|
||||||
std::fs::write(&tmp, format!("{id}\n"))?;
|
|
||||||
std::fs::File::open(&tmp)?.sync_all()?;
|
|
||||||
std::fs::rename(&tmp, &path)?;
|
|
||||||
std::fs::File::open(parent)?.sync_all()?;
|
|
||||||
Ok(id)
|
Ok(id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1740,27 +1740,6 @@ pub enum PhotoKind {
|
|||||||
Raw,
|
Raw,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// File-name extensions that denote a video, matched case-insensitively.
|
|
||||||
const VIDEO_EXTS: &[&str] = &[
|
|
||||||
"mkv", "mp4", "mov", "avi", "webm", "m4v", "flv", "wmv", "mpg", "mpeg", "ts", "3gp", "m2ts",
|
|
||||||
"mts", "ogv",
|
|
||||||
];
|
|
||||||
|
|
||||||
/// File-name extensions that denote a camera raw. The server media type for
|
|
||||||
/// these is frequently a generic `application/octet-stream`, so the extension is
|
|
||||||
/// the authoritative signal.
|
|
||||||
const RAW_EXTS: &[&str] = &[
|
|
||||||
"cr2", "cr3", "nef", "nrw", "arw", "srf", "sr2", "dng", "raf", "orf", "rw2", "srw", "pef",
|
|
||||||
"raw", "rwl", "iiq", "3fr", "dcr", "kdc", "mrw", "x3f",
|
|
||||||
];
|
|
||||||
|
|
||||||
/// File-name extensions that denote a ready-to-view still photo. Listed so a
|
|
||||||
/// known image name classifies as a photo outright, without deferring to a media
|
|
||||||
/// type that might disagree.
|
|
||||||
const PHOTO_EXTS: &[&str] = &[
|
|
||||||
"jpg", "jpeg", "png", "gif", "webp", "heic", "heif", "avif", "bmp", "tif", "tiff",
|
|
||||||
];
|
|
||||||
|
|
||||||
impl PhotoKind {
|
impl PhotoKind {
|
||||||
/// Classify a photo from what the daemon knows about it. A recognised
|
/// Classify a photo from what the daemon knows about it. A recognised
|
||||||
/// file-name extension is authoritative — it is reliable even before the
|
/// file-name extension is authoritative — it is reliable even before the
|
||||||
@@ -1768,26 +1747,11 @@ impl PhotoKind {
|
|||||||
/// useless generic — so the media type is only consulted for names that carry
|
/// useless generic — so the media type is only consulted for names that carry
|
||||||
/// no extension we know. Anything still unresolved is a still photo.
|
/// no extension we know. Anything still unresolved is a still photo.
|
||||||
pub fn classify(name: Option<&str>, media_type: Option<&str>) -> PhotoKind {
|
pub fn classify(name: Option<&str>, media_type: Option<&str>) -> PhotoKind {
|
||||||
if let Some(ext) = name
|
match proton_gallery_rs::grouping::MediaClass::classify(name, media_type) {
|
||||||
.and_then(|n| n.rsplit_once('.'))
|
proton_gallery_rs::grouping::MediaClass::Photo => PhotoKind::Photo,
|
||||||
.map(|(_, e)| e.to_ascii_lowercase())
|
proton_gallery_rs::grouping::MediaClass::Video => PhotoKind::Video,
|
||||||
{
|
proton_gallery_rs::grouping::MediaClass::Raw => PhotoKind::Raw,
|
||||||
if RAW_EXTS.contains(&ext.as_str()) {
|
|
||||||
return PhotoKind::Raw;
|
|
||||||
}
|
|
||||||
if VIDEO_EXTS.contains(&ext.as_str()) {
|
|
||||||
return PhotoKind::Video;
|
|
||||||
}
|
|
||||||
if PHOTO_EXTS.contains(&ext.as_str()) {
|
|
||||||
return PhotoKind::Photo;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if let Some(mt) = media_type
|
|
||||||
&& mt.starts_with("video/")
|
|
||||||
{
|
|
||||||
return PhotoKind::Video;
|
|
||||||
}
|
|
||||||
PhotoKind::Photo
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The stable integer this kind is persisted as (see the `kind` column of the
|
/// The stable integer this kind is persisted as (see the `kind` column of the
|
||||||
@@ -3196,7 +3160,7 @@ mod tests {
|
|||||||
/// videos back to the expensive whole-file path.
|
/// videos back to the expensive whole-file path.
|
||||||
#[test]
|
#[test]
|
||||||
fn photo_kind_recognises_every_supported_video_extension() {
|
fn photo_kind_recognises_every_supported_video_extension() {
|
||||||
for ext in VIDEO_EXTS {
|
for ext in proton_gallery_rs::grouping::VIDEO_EXTENSIONS {
|
||||||
let lower = format!("movie.{ext}");
|
let lower = format!("movie.{ext}");
|
||||||
let upper = format!("MOVIE.{}", ext.to_ascii_uppercase());
|
let upper = format!("MOVIE.{}", ext.to_ascii_uppercase());
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ use rusqlite::{Connection, OptionalExtension, Transaction, params};
|
|||||||
|
|
||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::{HashMap, HashSet};
|
||||||
|
|
||||||
|
use proton_gallery_rs::grouping::{Grouped, group_photos, name_stem};
|
||||||
|
|
||||||
use super::Db;
|
use super::Db;
|
||||||
use crate::Result;
|
use crate::Result;
|
||||||
|
|
||||||
@@ -121,135 +123,6 @@ fn capture_day(conn: &rusqlite::Connection, capture_time: i64) -> Option<String>
|
|||||||
.flatten()
|
.flatten()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The file name without its extension, lowercased — `IMG_1234.CR2` and
|
|
||||||
/// `IMG_1234.JPG` share `img_1234` — with the camera's own part-of-a-shot
|
|
||||||
/// marker removed, so the two files a raw capture writes share a stem too.
|
|
||||||
fn name_stem(name: Option<&str>) -> Option<String> {
|
|
||||||
let name = name?;
|
|
||||||
let stem = match name.rsplit_once('.') {
|
|
||||||
Some((stem, _)) if !stem.is_empty() => stem,
|
|
||||||
_ => name,
|
|
||||||
};
|
|
||||||
let stem = stem.to_ascii_lowercase();
|
|
||||||
Some(strip_shot_marker(&stem).to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Drop a `.RAW-NN.ROLE` marker from a stem.
|
|
||||||
///
|
|
||||||
/// Pixel stores one raw capture as `PXL_20260919_000625670.RAW-01.COVER.jpg`
|
|
||||||
/// and `PXL_20260919_000625670.RAW-02.ORIGINAL.dng`: one shot, two files, two
|
|
||||||
/// stems that differ in exactly the part naming which file of the shot this is.
|
|
||||||
/// Cutting the marker off is what lets rule 2 see the pair. The check is narrow
|
|
||||||
/// on purpose — digits, then a single role word — so an ordinary name that
|
|
||||||
/// happens to contain `.raw-` keeps its stem.
|
|
||||||
fn strip_shot_marker(stem: &str) -> &str {
|
|
||||||
let Some(at) = stem.rfind(".raw-") else {
|
|
||||||
return stem;
|
|
||||||
};
|
|
||||||
let rest = &stem[at + ".raw-".len()..];
|
|
||||||
let Some((index, role)) = rest.split_once('.') else {
|
|
||||||
return stem;
|
|
||||||
};
|
|
||||||
let marked = !index.is_empty()
|
|
||||||
&& index.bytes().all(|b| b.is_ascii_digit())
|
|
||||||
&& !role.is_empty()
|
|
||||||
&& role.bytes().all(|b| b.is_ascii_alphabetic());
|
|
||||||
if marked { &stem[..at] } else { stem }
|
|
||||||
}
|
|
||||||
|
|
||||||
/// One entry of the grouping pass: what rule 2 needs, plus what choosing a
|
|
||||||
/// representative needs.
|
|
||||||
struct Grouped {
|
|
||||||
uid: String,
|
|
||||||
kind: crate::control::PhotoKind,
|
|
||||||
main_uid: Option<String>,
|
|
||||||
day: Option<String>,
|
|
||||||
stem: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Which group each photo belongs to, and which member of it the gallery shows.
|
|
||||||
///
|
|
||||||
/// Precedence, as agreed:
|
|
||||||
///
|
|
||||||
/// 1. The server's own relation — a photo with a `main_photo_uid` joins that
|
|
||||||
/// photo's group. The server knows about live photos and bursts; we do not
|
|
||||||
/// have to guess at them.
|
|
||||||
/// 2. Otherwise, same capture day **and** same file-name stem **and** one of the
|
|
||||||
/// two is a camera raw while the other is not. That is the RAW+JPEG pair a
|
|
||||||
/// camera writes, and the differing-kind clause keeps two JPEGs that happen
|
|
||||||
/// to share a name apart.
|
|
||||||
/// 3. Otherwise the photo is its own group.
|
|
||||||
///
|
|
||||||
/// The representative is the non-raw member when the group has one — a JPEG
|
|
||||||
/// decodes in milliseconds and is what the person expects to see — and the
|
|
||||||
/// earliest member in server order otherwise.
|
|
||||||
fn group_photos(entries: &[Grouped]) -> Vec<String> {
|
|
||||||
let mut parent: Vec<usize> = (0..entries.len()).collect();
|
|
||||||
fn find(parent: &mut [usize], mut i: usize) -> usize {
|
|
||||||
while parent[i] != i {
|
|
||||||
parent[i] = parent[parent[i]];
|
|
||||||
i = parent[i];
|
|
||||||
}
|
|
||||||
i
|
|
||||||
}
|
|
||||||
let union = |parent: &mut [usize], a: usize, b: usize| {
|
|
||||||
let (a, b) = (find(parent, a), find(parent, b));
|
|
||||||
if a != b {
|
|
||||||
parent[b] = a;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let index: HashMap<&str, usize> = entries
|
|
||||||
.iter()
|
|
||||||
.enumerate()
|
|
||||||
.map(|(i, e)| (e.uid.as_str(), i))
|
|
||||||
.collect();
|
|
||||||
for (i, entry) in entries.iter().enumerate() {
|
|
||||||
if let Some(main) = entry.main_uid.as_deref()
|
|
||||||
&& let Some(&j) = index.get(main)
|
|
||||||
{
|
|
||||||
union(&mut parent, j, i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Rule 2 needs only one pass: everything sharing a day and a stem lands in
|
|
||||||
// the same bucket, and the raw / non-raw split is checked pairwise there.
|
|
||||||
let mut by_name: HashMap<(&str, &str), Vec<usize>> = HashMap::new();
|
|
||||||
for (i, entry) in entries.iter().enumerate() {
|
|
||||||
if let (Some(day), Some(stem)) = (entry.day.as_deref(), entry.stem.as_deref()) {
|
|
||||||
by_name.entry((day, stem)).or_default().push(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let is_raw = |i: usize| entries[i].kind == crate::control::PhotoKind::Raw;
|
|
||||||
for bucket in by_name.values() {
|
|
||||||
for (n, &i) in bucket.iter().enumerate() {
|
|
||||||
for &j in &bucket[n + 1..] {
|
|
||||||
if is_raw(i) != is_raw(j) {
|
|
||||||
union(&mut parent, i, j);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Representative per root, then the key every member carries.
|
|
||||||
let mut representative: HashMap<usize, usize> = HashMap::new();
|
|
||||||
for i in 0..entries.len() {
|
|
||||||
let root = find(&mut parent, i);
|
|
||||||
match representative.get(&root).copied() {
|
|
||||||
Some(current) if !is_raw(current) || is_raw(i) => {}
|
|
||||||
_ => {
|
|
||||||
representative.insert(root, i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
(0..entries.len())
|
|
||||||
.map(|i| {
|
|
||||||
let root = find(&mut parent, i);
|
|
||||||
entries[representative[&root]].uid.clone()
|
|
||||||
})
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The columns every photo read selects, with the group aggregates joined in.
|
/// The columns every photo read selects, with the group aggregates joined in.
|
||||||
/// `g.n` is how many photos the group holds and `g.raw` whether any of them is a
|
/// `g.n` is how many photos the group holds and `g.raw` whether any of them is a
|
||||||
/// camera raw file — one query rather than a second lookup per tile.
|
/// camera raw file — one query rather than a second lookup per tile.
|
||||||
@@ -483,7 +356,8 @@ impl Db {
|
|||||||
Ok((
|
Ok((
|
||||||
Grouped {
|
Grouped {
|
||||||
uid: r.get(0)?,
|
uid: r.get(0)?,
|
||||||
kind: crate::control::PhotoKind::from_i64(r.get(1)?),
|
raw: crate::control::PhotoKind::from_i64(r.get(1)?)
|
||||||
|
== crate::control::PhotoKind::Raw,
|
||||||
main_uid: r.get(2)?,
|
main_uid: r.get(2)?,
|
||||||
day: r.get(3)?,
|
day: r.get(3)?,
|
||||||
stem: name_stem(name.as_deref()),
|
stem: name_stem(name.as_deref()),
|
||||||
@@ -640,7 +514,7 @@ impl Db {
|
|||||||
.iter()
|
.iter()
|
||||||
.map(|(row, carried, kind)| Grouped {
|
.map(|(row, carried, kind)| Grouped {
|
||||||
uid: row.uid.clone(),
|
uid: row.uid.clone(),
|
||||||
kind: *kind,
|
raw: *kind == crate::control::PhotoKind::Raw,
|
||||||
main_uid: carried.main_uid.clone(),
|
main_uid: carried.main_uid.clone(),
|
||||||
day: capture_day(&tx, row.capture_time),
|
day: capture_day(&tx, row.capture_time),
|
||||||
stem: name_stem(carried.name.as_deref()),
|
stem: name_stem(carried.name.as_deref()),
|
||||||
|
|||||||
@@ -347,6 +347,15 @@ pub fn sign_in_blocked(e: &proton_sdk::ProtonError) -> bool {
|
|||||||
/// The result every request-serving method in the daemon returns.
|
/// The result every request-serving method in the daemon returns.
|
||||||
pub type CoreResult<T> = std::result::Result<T, CoreError>;
|
pub type CoreResult<T> = std::result::Result<T, CoreError>;
|
||||||
|
|
||||||
|
impl From<proton_auth_rs::Error> for Error {
|
||||||
|
fn from(error: proton_auth_rs::Error) -> Self {
|
||||||
|
match error {
|
||||||
|
proton_auth_rs::Error::Keyring(error) => Self::Keyring(error),
|
||||||
|
other => Self::Other(other.to_string()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|||||||
@@ -1,133 +0,0 @@
|
|||||||
//! When a photo was taken, as its own EXIF tags say.
|
|
||||||
//!
|
|
||||||
//! The fallback for a photo nothing else dates: a Takeout photo without a
|
|
||||||
//! sidecar or a date in its name, and a photo uploaded from the app. Without
|
|
||||||
//! it the first was filed under the moment of the import and the second under
|
|
||||||
//! the file's modification time, which a copy resets.
|
|
||||||
|
|
||||||
use std::io::{BufRead, Seek};
|
|
||||||
use std::path::Path;
|
|
||||||
|
|
||||||
use crate::takeout::days_from_civil;
|
|
||||||
|
|
||||||
/// The capture time in the EXIF of the file at `path`, in epoch seconds.
|
|
||||||
pub fn capture_time_of(path: &Path) -> Option<i64> {
|
|
||||||
let file = std::fs::File::open(path).ok()?;
|
|
||||||
capture_time(&mut std::io::BufReader::new(file))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The capture time in the EXIF `reader` holds: `DateTimeOriginal`, then
|
|
||||||
/// `DateTimeDigitized`, each adjusted by its `OffsetTime…` tag when the camera
|
|
||||||
/// wrote one. Without an offset the time is read as UTC, as a date in a file
|
|
||||||
/// name is (`takeout::capture_time_from_name`).
|
|
||||||
pub fn capture_time(reader: &mut (impl BufRead + Seek)) -> Option<i64> {
|
|
||||||
let exif = exif::Reader::new().read_from_container(reader).ok()?;
|
|
||||||
let ascii = |tag: exif::Tag| -> Option<String> {
|
|
||||||
let field = exif.get_field(tag, exif::In::PRIMARY)?;
|
|
||||||
match &field.value {
|
|
||||||
exif::Value::Ascii(parts) => parts.first().map(|part| {
|
|
||||||
String::from_utf8_lossy(part)
|
|
||||||
.trim_matches('\0')
|
|
||||||
.trim()
|
|
||||||
.to_string()
|
|
||||||
}),
|
|
||||||
_ => None,
|
|
||||||
}
|
|
||||||
};
|
|
||||||
[
|
|
||||||
(exif::Tag::DateTimeOriginal, exif::Tag::OffsetTimeOriginal),
|
|
||||||
(exif::Tag::DateTimeDigitized, exif::Tag::OffsetTimeDigitized),
|
|
||||||
]
|
|
||||||
.into_iter()
|
|
||||||
.find_map(|(time, offset)| {
|
|
||||||
let local = parse_exif_time(&ascii(time)?)?;
|
|
||||||
let offset = ascii(offset).and_then(|o| parse_offset(&o)).unwrap_or(0);
|
|
||||||
Some(local - offset)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/// `YYYY:MM:DD HH:MM:SS` as epoch seconds, read as UTC. `None` for the
|
|
||||||
/// all-zero or blank value cameras write when they do not know.
|
|
||||||
fn parse_exif_time(text: &str) -> Option<i64> {
|
|
||||||
let bytes = text.as_bytes();
|
|
||||||
if bytes.len() < 19 || bytes[4] != b':' || bytes[7] != b':' || bytes[13] != b':' {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
let number = |range: std::ops::Range<usize>| text.get(range)?.parse::<i64>().ok();
|
|
||||||
let (year, month, day) = (number(0..4)?, number(5..7)?, number(8..10)?);
|
|
||||||
let (hour, minute, second) = (number(11..13)?, number(14..16)?, number(17..19)?);
|
|
||||||
if !(1800..=9999).contains(&year)
|
|
||||||
|| !(1..=12).contains(&month)
|
|
||||||
|| !(1..=31).contains(&day)
|
|
||||||
|| hour > 23
|
|
||||||
|| minute > 59
|
|
||||||
|| second > 60
|
|
||||||
{
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
Some(days_from_civil(year, month, day) * 86_400 + hour * 3600 + minute * 60 + second)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// `+HH:MM` or `-HH:MM` as seconds east of UTC.
|
|
||||||
fn parse_offset(text: &str) -> Option<i64> {
|
|
||||||
let sign = match text.as_bytes().first()? {
|
|
||||||
b'+' => 1,
|
|
||||||
b'-' => -1,
|
|
||||||
_ => return None,
|
|
||||||
};
|
|
||||||
let (hours, minutes) = text.get(1..)?.split_once(':')?;
|
|
||||||
let (hours, minutes) = (hours.parse::<i64>().ok()?, minutes.parse::<i64>().ok()?);
|
|
||||||
(hours <= 14 && minutes < 60).then_some(sign * (hours * 3600 + minutes * 60))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn an_exif_time_reads_as_utc_and_its_offset_moves_it() {
|
|
||||||
// 2023-06-01 12:00:00 UTC.
|
|
||||||
let noon = 1_685_620_800;
|
|
||||||
assert_eq!(parse_exif_time("2023:06:01 12:00:00"), Some(noon));
|
|
||||||
assert_eq!(parse_offset("+02:00"), Some(7200));
|
|
||||||
assert_eq!(parse_offset("-05:30"), Some(-19_800));
|
|
||||||
assert_eq!(
|
|
||||||
parse_exif_time("2023:06:01 14:00:00").map(|t| t - parse_offset("+02:00").unwrap()),
|
|
||||||
Some(noon)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn an_unknown_exif_time_is_no_time() {
|
|
||||||
assert_eq!(parse_exif_time("0000:00:00 00:00:00"), None);
|
|
||||||
assert_eq!(parse_exif_time(" : : : : "), None);
|
|
||||||
assert_eq!(parse_exif_time(""), None);
|
|
||||||
assert_eq!(parse_offset("02:00"), None);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn a_photo_is_dated_by_its_original_time_and_offset() {
|
|
||||||
let ascii = |tag, text: &str| exif::Field {
|
|
||||||
tag,
|
|
||||||
ifd_num: exif::In::PRIMARY,
|
|
||||||
value: exif::Value::Ascii(vec![text.as_bytes().to_vec()]),
|
|
||||||
};
|
|
||||||
let taken = ascii(exif::Tag::DateTimeOriginal, "2023:06:01 14:00:00");
|
|
||||||
let offset = ascii(exif::Tag::OffsetTimeOriginal, "+02:00");
|
|
||||||
let digitized = ascii(exif::Tag::DateTimeDigitized, "2024:01:01 00:00:00");
|
|
||||||
let mut writer = exif::experimental::Writer::new();
|
|
||||||
writer.push_field(&taken);
|
|
||||||
writer.push_field(&offset);
|
|
||||||
writer.push_field(&digitized);
|
|
||||||
let mut tiff = std::io::Cursor::new(Vec::new());
|
|
||||||
writer.write(&mut tiff, false).unwrap();
|
|
||||||
tiff.set_position(0);
|
|
||||||
assert_eq!(capture_time(&mut tiff), Some(1_685_620_800));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn a_file_without_exif_has_no_capture_time() {
|
|
||||||
let mut png = std::io::Cursor::new(b"\x89PNG\r\n\x1a\n".to_vec());
|
|
||||||
assert_eq!(capture_time(&mut png), None);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -10,7 +10,6 @@ pub mod config;
|
|||||||
pub mod control;
|
pub mod control;
|
||||||
pub mod db;
|
pub mod db;
|
||||||
pub mod error;
|
pub mod error;
|
||||||
pub mod exiftime;
|
|
||||||
pub mod kernelkey;
|
pub mod kernelkey;
|
||||||
pub mod keycheck;
|
pub mod keycheck;
|
||||||
pub mod localindex;
|
pub mod localindex;
|
||||||
@@ -19,21 +18,20 @@ pub mod mountfail;
|
|||||||
pub mod mountpoint;
|
pub mod mountpoint;
|
||||||
pub mod mounts;
|
pub mod mounts;
|
||||||
pub mod opener;
|
pub mod opener;
|
||||||
pub mod places;
|
|
||||||
pub mod profile;
|
pub mod profile;
|
||||||
pub mod sdkcache;
|
pub mod sdkcache;
|
||||||
pub mod search;
|
pub mod search;
|
||||||
mod secretservice;
|
|
||||||
pub mod service;
|
pub mod service;
|
||||||
pub mod shell;
|
pub mod shell;
|
||||||
pub mod similar;
|
|
||||||
pub mod syncignore;
|
pub mod syncignore;
|
||||||
pub mod syncroot;
|
pub mod syncroot;
|
||||||
pub mod takeout;
|
|
||||||
pub mod timestamp;
|
pub mod timestamp;
|
||||||
pub mod tray;
|
pub mod tray;
|
||||||
pub mod update;
|
pub mod update;
|
||||||
|
|
||||||
|
// Photo logic shared with Proton Gallery through the proton-rs crates.
|
||||||
|
pub use proton_gallery_rs::{exiftime, places, similar, takeout};
|
||||||
|
|
||||||
pub use access::{Access, access_for, perm_bits};
|
pub use access::{Access, access_for, perm_bits};
|
||||||
pub use error::{CoreError, CoreResult, Error, Result};
|
pub use error::{CoreError, CoreResult, Error, Result};
|
||||||
|
|
||||||
|
|||||||
@@ -40,9 +40,7 @@ pub fn path(state_dir: &Path) -> PathBuf {
|
|||||||
/// and renamed, so a reader never sees half of it.
|
/// and renamed, so a reader never sees half of it.
|
||||||
pub fn record(state_dir: &Path, failure: &MountFailure) -> std::io::Result<()> {
|
pub fn record(state_dir: &Path, failure: &MountFailure) -> std::io::Result<()> {
|
||||||
let json = serde_json::to_vec(failure).map_err(std::io::Error::other)?;
|
let json = serde_json::to_vec(failure).map_err(std::io::Error::other)?;
|
||||||
let tmp = state_dir.join(format!("{FILE_NAME}.tmp"));
|
proton_base_rs::atomic::write_with_mode(&path(state_dir), &json, 0o644)
|
||||||
std::fs::write(&tmp, json)?;
|
|
||||||
std::fs::rename(&tmp, path(state_dir))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Forget the failure: a mount is up, or a new daemon has started.
|
/// Forget the failure: a mount is up, or a new daemon has started.
|
||||||
|
|||||||
@@ -1,185 +0,0 @@
|
|||||||
//! Offline reverse geocoding: the town a photo was taken in, from its GPS
|
|
||||||
//! position, without asking any service.
|
|
||||||
//!
|
|
||||||
//! The towns are GeoNames' `cities15000` dump (every place with more than
|
|
||||||
//! 15,000 people), trimmed to id, name, position and country in
|
|
||||||
//! `data/cities15000.tsv` by `scripts/geonames-cities.py`. The script drops the
|
|
||||||
//! parts of a city, such as Kreuzberg or "Paris 15 Vaugirard", so that a photo
|
|
||||||
//! lands in the town people would name. GeoNames publishes the dump under
|
|
||||||
//! CC BY 4.0, which is why the About dialog credits it.
|
|
||||||
//!
|
|
||||||
//! `data/countries.tsv` maps each country code to its ISO 3166-1 English name,
|
|
||||||
//! as the `iso-codes` project spells it, so a front end can translate it
|
|
||||||
//! through that project's `iso_3166-1` gettext domain.
|
|
||||||
|
|
||||||
use std::collections::HashMap;
|
|
||||||
use std::sync::OnceLock;
|
|
||||||
|
|
||||||
/// How far from the nearest town a photo may be and still count as taken
|
|
||||||
/// there, in km. Farther out (at sea, in the wilderness) it has no place.
|
|
||||||
pub const MAX_DISTANCE_KM: f64 = 50.0;
|
|
||||||
|
|
||||||
/// Mean Earth radius in km, for the haversine distance.
|
|
||||||
const EARTH_RADIUS_KM: f64 = 6371.0;
|
|
||||||
|
|
||||||
const CITIES: &str = include_str!("../data/cities15000.tsv");
|
|
||||||
const COUNTRIES: &str = include_str!("../data/countries.tsv");
|
|
||||||
|
|
||||||
/// One town of the table.
|
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
|
||||||
pub struct City {
|
|
||||||
/// The GeoNames id, stable across dumps.
|
|
||||||
pub id: u32,
|
|
||||||
pub name: &'static str,
|
|
||||||
pub latitude: f64,
|
|
||||||
pub longitude: f64,
|
|
||||||
/// ISO 3166-1 alpha-2 country code.
|
|
||||||
pub country: &'static str,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The towns, and an index of them by whole-degree cell.
|
|
||||||
struct Table {
|
|
||||||
cities: Vec<City>,
|
|
||||||
cells: HashMap<(i32, i32), Vec<usize>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
fn table() -> &'static Table {
|
|
||||||
static TABLE: OnceLock<Table> = OnceLock::new();
|
|
||||||
TABLE.get_or_init(|| {
|
|
||||||
let cities: Vec<City> = CITIES.lines().filter_map(parse_city).collect();
|
|
||||||
let mut cells: HashMap<(i32, i32), Vec<usize>> = HashMap::new();
|
|
||||||
for (index, city) in cities.iter().enumerate() {
|
|
||||||
cells
|
|
||||||
.entry(cell(city.latitude, city.longitude))
|
|
||||||
.or_default()
|
|
||||||
.push(index);
|
|
||||||
}
|
|
||||||
Table { cities, cells }
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_city(line: &'static str) -> Option<City> {
|
|
||||||
let mut fields = line.split('\t');
|
|
||||||
Some(City {
|
|
||||||
id: fields.next()?.parse().ok()?,
|
|
||||||
name: fields.next()?,
|
|
||||||
latitude: fields.next()?.parse().ok()?,
|
|
||||||
longitude: fields.next()?.parse().ok()?,
|
|
||||||
country: fields.next()?,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fn cell(latitude: f64, longitude: f64) -> (i32, i32) {
|
|
||||||
(latitude.floor() as i32, longitude.floor() as i32)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Great-circle distance between two positions, in km.
|
|
||||||
pub fn distance_km(a: (f64, f64), b: (f64, f64)) -> f64 {
|
|
||||||
let (lat1, lat2) = (a.0.to_radians(), b.0.to_radians());
|
|
||||||
let dlat = lat2 - lat1;
|
|
||||||
let dlon = (b.1 - a.1).to_radians();
|
|
||||||
let h = (dlat / 2.0).sin().powi(2) + lat1.cos() * lat2.cos() * (dlon / 2.0).sin().powi(2);
|
|
||||||
2.0 * EARTH_RADIUS_KM * h.sqrt().min(1.0).asin()
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The town nearest to a position, if one lies within [`MAX_DISTANCE_KM`].
|
|
||||||
pub fn nearest(latitude: f64, longitude: f64) -> Option<&'static City> {
|
|
||||||
if !latitude.is_finite() || !longitude.is_finite() {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
let table = table();
|
|
||||||
// A degree of latitude is about 111 km everywhere; a degree of longitude
|
|
||||||
// shrinks towards the poles, so more cells are needed to cover the radius.
|
|
||||||
let lat_span = (MAX_DISTANCE_KM / 111.0).ceil() as i32;
|
|
||||||
let lon_span = {
|
|
||||||
let scale = latitude.to_radians().cos().abs().max(0.01);
|
|
||||||
((MAX_DISTANCE_KM / (111.0 * scale)).ceil() as i32).min(180)
|
|
||||||
};
|
|
||||||
let (row, column) = cell(latitude, longitude);
|
|
||||||
let mut best: Option<(f64, &City)> = None;
|
|
||||||
for dlat in -lat_span..=lat_span {
|
|
||||||
for dlon in -lon_span..=lon_span {
|
|
||||||
// Longitude wraps at the antimeridian: -181 is 179.
|
|
||||||
let lon_cell = (column + dlon + 180).rem_euclid(360) - 180;
|
|
||||||
let Some(indices) = table.cells.get(&(row + dlat, lon_cell)) else {
|
|
||||||
continue;
|
|
||||||
};
|
|
||||||
for &index in indices {
|
|
||||||
let city = &table.cities[index];
|
|
||||||
let d = distance_km((latitude, longitude), (city.latitude, city.longitude));
|
|
||||||
if d <= MAX_DISTANCE_KM && best.is_none_or(|(bd, _)| d < bd) {
|
|
||||||
best = Some((d, city));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
best.map(|(_, city)| city)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The town with this GeoNames id.
|
|
||||||
pub fn city(id: u32) -> Option<&'static City> {
|
|
||||||
let cities = &table().cities;
|
|
||||||
// The table is sorted by id.
|
|
||||||
cities
|
|
||||||
.binary_search_by_key(&id, |city| city.id)
|
|
||||||
.ok()
|
|
||||||
.map(|index| &cities[index])
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The English ISO 3166-1 name of a country code, such as "Germany" for "DE".
|
|
||||||
pub fn country_name(code: &str) -> Option<&'static str> {
|
|
||||||
COUNTRIES.lines().find_map(|line| {
|
|
||||||
let (c, name) = line.split_once('\t')?;
|
|
||||||
(c == code).then_some(name)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn a_position_in_a_town_resolves_to_that_town() {
|
|
||||||
let berlin = nearest(52.52, 13.405).expect("Berlin is a town");
|
|
||||||
assert_eq!(berlin.name, "Berlin");
|
|
||||||
assert_eq!(berlin.country, "DE");
|
|
||||||
assert_eq!(city(berlin.id), Some(berlin));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn the_open_sea_has_no_town() {
|
|
||||||
assert_eq!(nearest(0.0, -30.0), None);
|
|
||||||
assert_eq!(nearest(f64::NAN, 0.0), None);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn a_town_across_the_antimeridian_is_still_found() {
|
|
||||||
// Just east of 180°, the nearest towns in Fiji are west of it.
|
|
||||||
let town = nearest(-16.8, 179.99);
|
|
||||||
assert!(town.is_none_or(|t| t.country == "FJ"));
|
|
||||||
let suva = nearest(-18.14, 178.44).expect("Suva is a town");
|
|
||||||
assert_eq!(suva.country, "FJ");
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn every_town_has_a_named_country() {
|
|
||||||
for city in &table().cities {
|
|
||||||
assert!(
|
|
||||||
country_name(city.country).is_some(),
|
|
||||||
"{} has no country name for {}",
|
|
||||||
city.name,
|
|
||||||
city.country
|
|
||||||
);
|
|
||||||
}
|
|
||||||
assert_eq!(country_name("DE"), Some("Germany"));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn distances_are_great_circle_km() {
|
|
||||||
let d = distance_km((52.52, 13.405), (48.137, 11.575));
|
|
||||||
assert!(
|
|
||||||
(d - 504.0).abs() < 5.0,
|
|
||||||
"Berlin to Munich is about 504 km, got {d}"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,135 +0,0 @@
|
|||||||
//! Saving a new secret into an existing Secret Service item by replacing the
|
|
||||||
//! item, not by editing its secret (`docs/BUGS.md` B291).
|
|
||||||
//!
|
|
||||||
//! oo7-daemon before 0.7.0 applies `SetSecret` only in memory: the keyring
|
|
||||||
//! file keeps the old secret, and it comes back once the daemon restarts.
|
|
||||||
//! Fedora 45 ships such a build (`0.7.0~beta^1.e91b98a`). Every refreshed
|
|
||||||
//! sign-in pdfs saved there was gone after a reboot, and the next start found
|
|
||||||
//! a refresh token Proton had already spent.
|
|
||||||
//!
|
|
||||||
//! `CreateItem` with `replace` is written to the file there, and every
|
|
||||||
//! provider implements it. So a secret that changes is written as a new item
|
|
||||||
//! that replaces the old one: in the old one's collection, with its label and
|
|
||||||
//! all of its attributes, so the provider recognises it as the same entry.
|
|
||||||
|
|
||||||
use dbus_secret_service::{Collection, EncryptionType, Path, SecretService};
|
|
||||||
use std::collections::HashMap;
|
|
||||||
|
|
||||||
/// The content type the keyring store writes its secrets with.
|
|
||||||
const CONTENT_TYPE: &str = "application/octet-stream";
|
|
||||||
|
|
||||||
/// What [`replace`] did.
|
|
||||||
#[derive(Debug, PartialEq, Eq)]
|
|
||||||
pub(crate) enum Replaced {
|
|
||||||
/// The secret is saved.
|
|
||||||
Saved,
|
|
||||||
/// Nothing was changed; save it the usual way. Says why, for the log.
|
|
||||||
Skipped(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Save `secret` into the one item for `service`/`user` by replacing it.
|
|
||||||
///
|
|
||||||
/// Skips, changing nothing, when there is no such item yet (the store creates
|
|
||||||
/// it), when there is more than one, when it is locked, or when the Secret
|
|
||||||
/// Service fails before the new item exists. Never shows a prompt: one would
|
|
||||||
/// block the caller, so it is dismissed and the write is skipped.
|
|
||||||
pub(crate) fn replace(service: &str, user: &str, secret: &[u8]) -> Replaced {
|
|
||||||
match try_replace(service, user, secret) {
|
|
||||||
Ok(replaced) => replaced,
|
|
||||||
Err(e) => Replaced::Skipped(e.to_string()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn try_replace(
|
|
||||||
service: &str,
|
|
||||||
user: &str,
|
|
||||||
secret: &[u8],
|
|
||||||
) -> Result<Replaced, dbus_secret_service::Error> {
|
|
||||||
let ss = SecretService::connect_with_max_prompt_timeout(EncryptionType::Dh, 0)?;
|
|
||||||
let lookup = HashMap::from([("service", service), ("username", user)]);
|
|
||||||
let found = ss.search_items(lookup.clone())?;
|
|
||||||
if !found.locked.is_empty() {
|
|
||||||
return Ok(Replaced::Skipped("the item is locked".into()));
|
|
||||||
}
|
|
||||||
let [old] = found.unlocked.as_slice() else {
|
|
||||||
return Ok(Replaced::Skipped(format!(
|
|
||||||
"{} items match, not one",
|
|
||||||
found.unlocked.len()
|
|
||||||
)));
|
|
||||||
};
|
|
||||||
let Some(collection) = collection_of(&old.path) else {
|
|
||||||
return Ok(Replaced::Skipped(format!(
|
|
||||||
"no collection in the item path {}",
|
|
||||||
old.path
|
|
||||||
)));
|
|
||||||
};
|
|
||||||
let label = old.get_label()?;
|
|
||||||
let attributes = old.get_attributes()?;
|
|
||||||
let attributes: HashMap<&str, &str> = attributes
|
|
||||||
.iter()
|
|
||||||
.map(|(k, v)| (k.as_str(), v.as_str()))
|
|
||||||
.collect();
|
|
||||||
let collection = Collection::new(&ss, collection);
|
|
||||||
let new = collection.create_item(&label, attributes, secret, true, CONTENT_TYPE)?;
|
|
||||||
|
|
||||||
// A provider that did not match the old item leaves it next to the new
|
|
||||||
// one, and two items make every read ambiguous.
|
|
||||||
let after = ss.search_items(lookup)?;
|
|
||||||
for item in after.unlocked.iter().chain(&after.locked) {
|
|
||||||
if item.path == new.path {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if let Err(e) = item.delete() {
|
|
||||||
// The old item still holds the previous secret, so taking the new
|
|
||||||
// one out leaves things as they were, for the usual write.
|
|
||||||
if let Err(undo) = new.delete() {
|
|
||||||
tracing::error!(
|
|
||||||
error = %undo,
|
|
||||||
"could not remove a duplicate keyring item; remove one of the two \
|
|
||||||
`proton-drive-linux` entries in your keyring and sign in again"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return Ok(Replaced::Skipped(format!(
|
|
||||||
"could not remove the replaced item: {e}"
|
|
||||||
)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(Replaced::Saved)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The collection an item path belongs to: the path without its last part,
|
|
||||||
/// as long as it is a Secret Service object path.
|
|
||||||
fn collection_of(item: &Path<'_>) -> Option<Path<'static>> {
|
|
||||||
let (collection, _) = item.rsplit_once('/')?;
|
|
||||||
if !collection.starts_with("/org/freedesktop/secrets/") || collection.ends_with('/') {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
Path::new(collection.to_owned()).ok()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
fn collection(item: &str) -> Option<String> {
|
|
||||||
collection_of(&Path::new(item).unwrap()).map(|p| p.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn an_item_belongs_to_the_collection_its_path_names() {
|
|
||||||
assert_eq!(
|
|
||||||
collection("/org/freedesktop/secrets/collection/login/14").as_deref(),
|
|
||||||
Some("/org/freedesktop/secrets/collection/login")
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
collection("/org/freedesktop/secrets/aliases/default/3").as_deref(),
|
|
||||||
Some("/org/freedesktop/secrets/aliases/default")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn a_path_outside_the_secret_service_names_no_collection() {
|
|
||||||
assert_eq!(collection("/org/example/item/1"), None);
|
|
||||||
assert_eq!(collection("/item"), None);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,193 +0,0 @@
|
|||||||
//! Telling photos apart by what they show rather than by their bytes.
|
|
||||||
//!
|
|
||||||
//! The server's content hash only matches byte-identical files. A photo that
|
|
||||||
//! was resized, re-encoded or sent through a messenger is another file, so the
|
|
||||||
//! similar-photo finder hashes each thumbnail instead: a 64-bit difference
|
|
||||||
//! hash ("dHash"), which compares neighbouring brightness in a 9×8 grid. Two
|
|
||||||
//! copies of one picture land a few bits apart, and different pictures about
|
|
||||||
//! half of the bits apart.
|
|
||||||
|
|
||||||
/// Hashes this many bits apart or fewer show the same picture.
|
|
||||||
pub const SIMILAR_BITS: u32 = 6;
|
|
||||||
|
|
||||||
/// Stored for a photo whose thumbnail was looked at and gave no usable hash
|
|
||||||
/// (it couldn't be decoded, or is one flat colour), so it isn't looked at
|
|
||||||
/// again. A real hash is never 0: a picture that would hash to 0 has no
|
|
||||||
/// brightness changes, which [`difference_hash`] turns down as flat.
|
|
||||||
pub const NO_HASH: u64 = 0;
|
|
||||||
|
|
||||||
/// Samples of the grid that differ by less than this in brightness, all of
|
|
||||||
/// them, make a flat picture — a black frame, a blank page — whose hash is
|
|
||||||
/// noise and would match every other flat picture.
|
|
||||||
const FLAT: u8 = 8;
|
|
||||||
|
|
||||||
/// The difference hash of an 8-bit greyscale image `width` px wide, rows
|
|
||||||
/// stored one after another in `luma`. `None` for an empty or flat image.
|
|
||||||
pub fn difference_hash(width: usize, height: usize, luma: &[u8]) -> Option<u64> {
|
|
||||||
if width == 0 || height == 0 || luma.len() < width * height {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
// Box-average down to 9×8, so every source pixel counts once and the hash
|
|
||||||
// doesn't depend on which pixels a nearest-neighbour pick happens to hit.
|
|
||||||
let mut grid = [[0u8; 9]; 8];
|
|
||||||
for (gy, row) in grid.iter_mut().enumerate() {
|
|
||||||
let (y0, y1) = span(gy, 8, height);
|
|
||||||
for (gx, cell) in row.iter_mut().enumerate() {
|
|
||||||
let (x0, x1) = span(gx, 9, width);
|
|
||||||
let mut sum = 0u64;
|
|
||||||
for y in y0..y1 {
|
|
||||||
sum += luma[y * width + x0..y * width + x1]
|
|
||||||
.iter()
|
|
||||||
.map(|&v| u64::from(v))
|
|
||||||
.sum::<u64>();
|
|
||||||
}
|
|
||||||
*cell = (sum / ((y1 - y0) * (x1 - x0)) as u64) as u8;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let (min, max) = grid
|
|
||||||
.iter()
|
|
||||||
.flatten()
|
|
||||||
.fold((u8::MAX, 0), |(min, max), &v| (min.min(v), max.max(v)));
|
|
||||||
if max - min < FLAT {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
let mut hash = 0u64;
|
|
||||||
for row in &grid {
|
|
||||||
for pair in row.windows(2) {
|
|
||||||
hash = hash << 1 | u64::from(pair[0] < pair[1]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
(hash != NO_HASH).then_some(hash)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The source pixels `from..to` that cell `i` of `cells` covers along an edge
|
|
||||||
/// of `len` px; never empty, even for an edge shorter than the grid.
|
|
||||||
fn span(i: usize, cells: usize, len: usize) -> (usize, usize) {
|
|
||||||
let from = (i * len / cells).min(len - 1);
|
|
||||||
let to = ((i + 1) * len / cells).max(from + 1);
|
|
||||||
(from, to)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Whether two hashes show the same picture.
|
|
||||||
pub fn alike(a: u64, b: u64) -> bool {
|
|
||||||
(a ^ b).count_ones() <= SIMILAR_BITS
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Group `hashes` into sets of alike ones, by index, each set in index order
|
|
||||||
/// and the sets by their first index. A hash alike to none other is in no
|
|
||||||
/// set. Alike is taken as catching: a burst of shots each a little different
|
|
||||||
/// from the last is one set.
|
|
||||||
pub fn sets(hashes: &[u64]) -> Vec<Vec<usize>> {
|
|
||||||
// Two hashes at most SIMILAR_BITS apart agree on at least one of their
|
|
||||||
// eight bytes, as long as SIMILAR_BITS < 8. So only hashes sharing some
|
|
||||||
// byte are compared, not every pair of the library.
|
|
||||||
const _: () = assert!(SIMILAR_BITS < 8);
|
|
||||||
let mut parent: Vec<usize> = (0..hashes.len()).collect();
|
|
||||||
fn root(parent: &mut [usize], mut i: usize) -> usize {
|
|
||||||
while parent[i] != i {
|
|
||||||
parent[i] = parent[parent[i]];
|
|
||||||
i = parent[i];
|
|
||||||
}
|
|
||||||
i
|
|
||||||
}
|
|
||||||
for byte in 0..8 {
|
|
||||||
let mut buckets: Vec<Vec<usize>> = vec![Vec::new(); 256];
|
|
||||||
for (i, &hash) in hashes.iter().enumerate() {
|
|
||||||
buckets[(hash >> (byte * 8)) as u8 as usize].push(i);
|
|
||||||
}
|
|
||||||
for bucket in &buckets {
|
|
||||||
for (n, &a) in bucket.iter().enumerate() {
|
|
||||||
for &b in &bucket[n + 1..] {
|
|
||||||
if alike(hashes[a], hashes[b]) {
|
|
||||||
let (ra, rb) = (root(&mut parent, a), root(&mut parent, b));
|
|
||||||
if ra != rb {
|
|
||||||
parent[ra.max(rb)] = ra.min(rb);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let mut by_root: std::collections::BTreeMap<usize, Vec<usize>> = Default::default();
|
|
||||||
for i in 0..hashes.len() {
|
|
||||||
let r = root(&mut parent, i);
|
|
||||||
by_root.entry(r).or_default().push(i);
|
|
||||||
}
|
|
||||||
by_root.into_values().filter(|set| set.len() > 1).collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
/// A 90×80 picture: a bright disc on a gradient.
|
|
||||||
fn picture(width: usize, height: usize) -> Vec<u8> {
|
|
||||||
let mut luma = Vec::with_capacity(width * height);
|
|
||||||
for y in 0..height {
|
|
||||||
for x in 0..width {
|
|
||||||
let (fx, fy) = (x as f64 / width as f64, y as f64 / height as f64);
|
|
||||||
let disc = ((fx - 0.3).powi(2) + (fy - 0.6).powi(2)).sqrt() < 0.2;
|
|
||||||
let v = if disc { 240.0 } else { 40.0 + 120.0 * fx * fy };
|
|
||||||
luma.push(v as u8);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
luma
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn a_resized_copy_hashes_alike() {
|
|
||||||
let big = difference_hash(900, 800, &picture(900, 800)).unwrap();
|
|
||||||
let small = difference_hash(91, 79, &picture(91, 79)).unwrap();
|
|
||||||
assert!(
|
|
||||||
alike(big, small),
|
|
||||||
"{} bits apart",
|
|
||||||
(big ^ small).count_ones()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn a_different_picture_hashes_apart() {
|
|
||||||
let one = difference_hash(90, 80, &picture(90, 80)).unwrap();
|
|
||||||
let mirrored: Vec<u8> = picture(90, 80)
|
|
||||||
.chunks(90)
|
|
||||||
.flat_map(|row| row.iter().rev().copied().collect::<Vec<_>>())
|
|
||||||
.collect();
|
|
||||||
let other = difference_hash(90, 80, &mirrored).unwrap();
|
|
||||||
assert!(!alike(one, other));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn a_flat_picture_has_no_hash() {
|
|
||||||
assert_eq!(difference_hash(64, 64, &[17; 64 * 64]), None);
|
|
||||||
assert_eq!(difference_hash(0, 0, &[]), None);
|
|
||||||
assert_eq!(difference_hash(4, 4, &[0; 3]), None);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn a_picture_smaller_than_the_grid_still_hashes() {
|
|
||||||
let luma: Vec<u8> = (0..4 * 3).map(|i| (i * 20) as u8).collect();
|
|
||||||
assert!(difference_hash(4, 3, &luma).is_some());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn alike_hashes_form_sets_and_catch_on() {
|
|
||||||
let a = 0x0123_4567_89ab_cdef_u64;
|
|
||||||
let hashes = [
|
|
||||||
a,
|
|
||||||
!a,
|
|
||||||
a ^ 0b111,
|
|
||||||
a ^ 0b111 ^ (0b1111 << 40),
|
|
||||||
0x5555_0000_ffff_aaaa,
|
|
||||||
];
|
|
||||||
assert_eq!(sets(&hashes), vec![vec![0, 2, 3]]);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn hashes_apart_in_most_bytes_are_still_found() {
|
|
||||||
// One bit apart in each of six bytes: six bits in all, and only the
|
|
||||||
// top two bytes agree.
|
|
||||||
let a = 1u64 << 63;
|
|
||||||
let b = (0..6).fold(a, |h, byte| h | 1 << (byte * 8));
|
|
||||||
assert_eq!(sets(&[a, b]), vec![vec![0, 1]]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -14,8 +14,9 @@ pdfs-core.workspace = true
|
|||||||
zip.workspace = true
|
zip.workspace = true
|
||||||
sha1.workspace = true
|
sha1.workspace = true
|
||||||
proton-drive-rs.workspace = true
|
proton-drive-rs.workspace = true
|
||||||
pg-app.workspace = true
|
proton-gallery-app-rs.workspace = true
|
||||||
pg-core.workspace = true
|
proton-gallery-rs.workspace = true
|
||||||
|
proton-media-rs.workspace = true
|
||||||
hyper = { version = "1", features = ["http1", "server"] }
|
hyper = { version = "1", features = ["http1", "server"] }
|
||||||
hyper-util = { version = "0.1", features = ["tokio"] }
|
hyper-util = { version = "0.1", features = ["tokio"] }
|
||||||
http-body-util = "0.1"
|
http-body-util = "0.1"
|
||||||
|
|||||||
@@ -14,10 +14,10 @@ use pdfs_core::control::{
|
|||||||
GalleryAction, GalleryAlbum, GalleryFolder, GalleryPlace, PhotoItem, PhotoKind, Response,
|
GalleryAction, GalleryAlbum, GalleryFolder, GalleryPlace, PhotoItem, PhotoKind, Response,
|
||||||
};
|
};
|
||||||
use pdfs_core::{CoreError, CoreResult};
|
use pdfs_core::{CoreError, CoreResult};
|
||||||
use pg_app::{App, View};
|
|
||||||
use pg_core::CancellationToken;
|
|
||||||
use pg_core::model::{AssetKey, SourceId};
|
|
||||||
use proton_drive_rs::proton_sdk::session::ProtonApiSession;
|
use proton_drive_rs::proton_sdk::session::ProtonApiSession;
|
||||||
|
use proton_gallery_app_rs::{App, View};
|
||||||
|
use proton_gallery_rs::CancellationToken;
|
||||||
|
use proton_gallery_rs::model::{AssetKey, SourceId};
|
||||||
use tokio::sync::{Mutex, Notify, OnceCell};
|
use tokio::sync::{Mutex, Notify, OnceCell};
|
||||||
|
|
||||||
use super::{Core, NodeUid, parse_uid};
|
use super::{Core, NodeUid, parse_uid};
|
||||||
@@ -187,8 +187,9 @@ impl Gallery {
|
|||||||
Ok(Arc::new(visibility))
|
Ok(Arc::new(visibility))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn account(&self) -> CoreResult<pg_core::model::AccountId> {
|
fn account(&self) -> CoreResult<proton_gallery_rs::model::AccountId> {
|
||||||
pg_core::model::AccountId::new(self.session.user_id().as_str()).map_err(gallery_error)
|
proton_gallery_rs::model::AccountId::new(self.session.user_id().as_str())
|
||||||
|
.map_err(gallery_error)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn page(
|
async fn page(
|
||||||
@@ -345,13 +346,15 @@ impl Gallery {
|
|||||||
fn asset(&self, uid: &NodeUid) -> CoreResult<AssetKey> {
|
fn asset(&self, uid: &NodeUid) -> CoreResult<AssetKey> {
|
||||||
Ok(AssetKey {
|
Ok(AssetKey {
|
||||||
account: self.account()?,
|
account: self.account()?,
|
||||||
volume: pg_core::model::VolumeId::new(uid.volume_id.as_str()).map_err(gallery_error)?,
|
volume: proton_gallery_rs::model::VolumeId::new(uid.volume_id.as_str())
|
||||||
node: pg_core::model::NodeId::new(uid.link_id.as_str()).map_err(gallery_error)?,
|
.map_err(gallery_error)?,
|
||||||
|
node: proton_gallery_rs::model::NodeId::new(uid.link_id.as_str())
|
||||||
|
.map_err(gallery_error)?,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn gallery_album(entry: pg_core::library::Album, proton: bool) -> GalleryAlbum {
|
fn gallery_album(entry: proton_gallery_rs::library::Album, proton: bool) -> GalleryAlbum {
|
||||||
GalleryAlbum {
|
GalleryAlbum {
|
||||||
place: GalleryPlace {
|
place: GalleryPlace {
|
||||||
gallery: entry.gallery.to_string(),
|
gallery: entry.gallery.to_string(),
|
||||||
@@ -444,7 +447,7 @@ impl Core {
|
|||||||
"Use your Linux sign-in to unlock Hidden albums.",
|
"Use your Linux sign-in to unlock Hidden albums.",
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
let subject = pg_app::desktop_auth::Subject::new(
|
let subject = proton_gallery_app_rs::desktop_auth::Subject::new(
|
||||||
peer.pid.as_raw_nonzero().get() as u32,
|
peer.pid.as_raw_nonzero().get() as u32,
|
||||||
peer.uid.as_raw(),
|
peer.uid.as_raw(),
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ use hyper::{
|
|||||||
};
|
};
|
||||||
use hyper_util::rt::TokioIo;
|
use hyper_util::rt::TokioIo;
|
||||||
use pdfs_core::{CoreResult, control::Response as ControlResponse};
|
use pdfs_core::{CoreResult, control::Response as ControlResponse};
|
||||||
use pg_app::video::VideoStream;
|
use proton_gallery_app_rs::video::VideoStream;
|
||||||
use pg_core::CancellationToken;
|
use proton_gallery_rs::CancellationToken;
|
||||||
use tokio::net::TcpListener;
|
use tokio::net::TcpListener;
|
||||||
|
|
||||||
type Body = UnsyncBoxBody<Bytes, io::Error>;
|
type Body = UnsyncBoxBody<Bytes, io::Error>;
|
||||||
|
|||||||
@@ -212,15 +212,12 @@ impl BlockRing {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// The result of fetching one block, shared between everyone who wanted it.
|
/// The result of fetching one block, shared between everyone who wanted it.
|
||||||
type BlockResult = Result<Arc<Vec<u8>>, Errno>;
|
pub(super) type BlockResult = Result<Arc<Vec<u8>>, Errno>;
|
||||||
|
|
||||||
/// Identifies a block *of a revision*: node, validity tag, and the plaintext
|
/// Identifies a block *of a revision*: node, validity tag, and the plaintext
|
||||||
/// range the block covers — see [`RingKey`] for why it is the range and not the
|
/// range the block covers — see [`RingKey`] for why it is the range and not the
|
||||||
/// index.
|
/// index.
|
||||||
type BlockKey = (NodeUid, i64, u64, BlockSpan);
|
pub(super) type BlockKey = (NodeUid, i64, u64, BlockSpan);
|
||||||
|
|
||||||
/// A claim on a block key: who owns the fetch, and where its result is published.
|
|
||||||
type Claim = (u64, tokio::sync::watch::Receiver<Option<BlockResult>>);
|
|
||||||
|
|
||||||
/// Block fetches in flight, so a block is downloaded and decrypted once however
|
/// Block fetches in flight, so a block is downloaded and decrypted once however
|
||||||
/// many readers want it at that moment (audit T1).
|
/// many readers want it at that moment (audit T1).
|
||||||
@@ -231,34 +228,7 @@ type Claim = (u64, tokio::sync::watch::Receiver<Option<BlockResult>>);
|
|||||||
/// for. Without this each of them pays the full round-trip and decrypt and all
|
/// for. Without this each of them pays the full round-trip and decrypt and all
|
||||||
/// but one result is discarded — roughly double the bandwidth and CPU in steady
|
/// but one result is discarded — roughly double the bandwidth and CPU in steady
|
||||||
/// state. Same shape as [`ReaderSlot::Pending`] one level up.
|
/// state. Same shape as [`ReaderSlot::Pending`] one level up.
|
||||||
#[derive(Default)]
|
pub(super) type BlockFlight = proton_media_rs::SingleFlight<BlockKey, BlockResult>;
|
||||||
pub(super) struct BlockFlight {
|
|
||||||
inflight: Mutex<HashMap<BlockKey, Claim>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Distinguishes attempts at the same key, so a leader only retires its own.
|
|
||||||
static NEXT_FLIGHT_ID: AtomicU64 = AtomicU64::new(0);
|
|
||||||
|
|
||||||
/// The leader's claim on a key. Retires it on drop — including when the task is
|
|
||||||
/// cancelled mid-fetch, which is what keeps a dropped `JoinSet` from leaving a
|
|
||||||
/// key nobody will ever publish.
|
|
||||||
struct Flight {
|
|
||||||
flight: Arc<BlockFlight>,
|
|
||||||
key: BlockKey,
|
|
||||||
id: u64,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Drop for Flight {
|
|
||||||
fn drop(&mut self) {
|
|
||||||
let mut inflight = self.flight.inflight.lock();
|
|
||||||
if inflight
|
|
||||||
.get(&self.key)
|
|
||||||
.is_some_and(|(id, _)| *id == self.id)
|
|
||||||
{
|
|
||||||
inflight.remove(&self.key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Where each file's reader is expected to read next, so sequential reads can be
|
/// Where each file's reader is expected to read next, so sequential reads can be
|
||||||
/// told from random ones and only the former prefetched (audit T2).
|
/// told from random ones and only the former prefetched (audit T2).
|
||||||
@@ -581,49 +551,11 @@ impl Core {
|
|||||||
cache_blocks: bool,
|
cache_blocks: bool,
|
||||||
) -> BlockResult {
|
) -> BlockResult {
|
||||||
let key: BlockKey = (uid.clone(), mtime, fsize, span);
|
let key: BlockKey = (uid.clone(), mtime, fsize, span);
|
||||||
let claim = {
|
self.block_flight
|
||||||
let mut inflight = self.block_flight.inflight.lock();
|
.join(key, || {
|
||||||
match inflight.get(&key) {
|
self.read_block(reader, uid, mtime, fsize, span, cache_blocks)
|
||||||
Some((_, rx)) => Err(rx.clone()),
|
})
|
||||||
None => {
|
.await
|
||||||
let id = NEXT_FLIGHT_ID.fetch_add(1, Ordering::Relaxed);
|
|
||||||
let (tx, rx) = tokio::sync::watch::channel(None);
|
|
||||||
inflight.insert(key.clone(), (id, rx));
|
|
||||||
Ok((
|
|
||||||
tx,
|
|
||||||
Flight {
|
|
||||||
flight: self.block_flight.clone(),
|
|
||||||
key: key.clone(),
|
|
||||||
id,
|
|
||||||
},
|
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
let (tx, flight) = match claim {
|
|
||||||
Ok(lead) => lead,
|
|
||||||
Err(mut rx) => {
|
|
||||||
loop {
|
|
||||||
if let Some(result) = rx.borrow_and_update().clone() {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
if rx.changed().await.is_err() {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return self
|
|
||||||
.read_block(reader, uid, mtime, fsize, span, cache_blocks)
|
|
||||||
.await;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
let result = self
|
|
||||||
.read_block(reader, uid, mtime, fsize, span, cache_blocks)
|
|
||||||
.await;
|
|
||||||
// Retire the claim before publishing, so a racer that wakes and re-enters
|
|
||||||
// finds no stale entry to join.
|
|
||||||
drop(flight);
|
|
||||||
let _ = tx.send(Some(result.clone()));
|
|
||||||
result
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Download and decrypt one block, then put it where the next reader will
|
/// Download and decrypt one block, then put it where the next reader will
|
||||||
|
|||||||
@@ -527,7 +527,7 @@ impl Core {
|
|||||||
let scan = match scan_archives_until(archives, || self.import_should_stop(cancel)) {
|
let scan = match scan_archives_until(archives, || self.import_should_stop(cancel)) {
|
||||||
Ok(scan) => scan,
|
Ok(scan) => scan,
|
||||||
Err(_) if self.import_should_stop(cancel) => return Ok(true),
|
Err(_) if self.import_should_stop(cancel) => return Ok(true),
|
||||||
Err(e) => return Err(e),
|
Err(e) => return Err(CoreError::conflict(e.to_string())),
|
||||||
};
|
};
|
||||||
*planned = plan(&scan);
|
*planned = plan(&scan);
|
||||||
*albums = scan.albums.clone();
|
*albums = scan.albums.clone();
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ name = "pdfs-prompt"
|
|||||||
path = "src/prompt.rs"
|
path = "src/prompt.rs"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
pg-core.workspace = true
|
proton-gallery-rs.workspace = true
|
||||||
base64.workspace = true
|
base64.workspace = true
|
||||||
pdfs-core.workspace = true
|
pdfs-core.workspace = true
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
|
|||||||
@@ -2360,7 +2360,7 @@ const TILE_RATIO_MAX: f64 = 2.5;
|
|||||||
/// The shape a photo's tile takes: its own, clamped, or square while the
|
/// The shape a photo's tile takes: its own, clamped, or square while the
|
||||||
/// daemon has not seen a thumbnail of it yet.
|
/// daemon has not seen a thumbnail of it yet.
|
||||||
pub(crate) fn tile_ratio(ratio: Option<f64>) -> f64 {
|
pub(crate) fn tile_ratio(ratio: Option<f64>) -> f64 {
|
||||||
pg_core::grid::tile_ratio(ratio.unwrap_or(1.0))
|
proton_gallery_rs::grid::tile_ratio(ratio.unwrap_or(1.0))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The justified layout math: tiles of the given shapes, in order, broken into
|
/// The justified layout math: tiles of the given shapes, in order, broken into
|
||||||
@@ -2373,7 +2373,7 @@ pub(crate) fn tile_ratio(ratio: Option<f64>) -> f64 {
|
|||||||
/// two photos from one day stay two photos at the target height, not two
|
/// two photos from one day stay two photos at the target height, not two
|
||||||
/// photos as tall as the window.
|
/// photos as tall as the window.
|
||||||
pub(crate) fn plan_justified(ratios: &[f64], width: i32, target: i32) -> Vec<Vec<(i32, i32)>> {
|
pub(crate) fn plan_justified(ratios: &[f64], width: i32, target: i32) -> Vec<Vec<(i32, i32)>> {
|
||||||
let Ok(grid) = pg_core::grid::plan_sections(
|
let Ok(grid) = proton_gallery_rs::grid::plan_sections(
|
||||||
ratios,
|
ratios,
|
||||||
&[],
|
&[],
|
||||||
width.clamp(1, 32_768) as u32,
|
width.clamp(1, 32_768) as u32,
|
||||||
|
|||||||
+1
-1
@@ -432,7 +432,7 @@ the build Fedora 45 and 46 ship as stable, from before oo7's
|
|||||||
[7fb11dd](https://github.com/linux-credentials/oo7/commit/7fb11dd111c4be8fec01996e3caa31c44fa962b3)
|
[7fb11dd](https://github.com/linux-credentials/oo7/commit/7fb11dd111c4be8fec01996e3caa31c44fa962b3)
|
||||||
("server: Write item changes to the keyring file"). See
|
("server: Write item changes to the keyring file"). See
|
||||||
[the investigation](ISSUE-78.md#setsecret-is-kept-only-in-memory-in-fedoras-oo7).
|
[the investigation](ISSUE-78.md#setsecret-is-kept-only-in-memory-in-fedoras-oo7).
|
||||||
**Where:** `crates/pdfs-core/src/auth.rs`, `write_stored`; `crates/pdfs-core/src/secretservice.rs`
|
**Where:** `crates/pdfs-core/src/auth.rs`, `write_stored`; `proton-auth-rs` (`secret_service.rs`, moved from `crates/pdfs-core/src/secretservice.rs`)
|
||||||
|
|
||||||
**Repro:** With oo7-daemon at e91b98a, save the session blob, save it again with a new refresh
|
**Repro:** With oo7-daemon at e91b98a, save the session blob, save it again with a new refresh
|
||||||
token, and restart oo7-daemon. The read after the restart returns the first blob. The keyring
|
token, and restart oo7-daemon. The read after the restart returns the first blob. The keyring
|
||||||
|
|||||||
@@ -11,6 +11,25 @@ scratch (user data in `staging/` and `recovery/` is never touched by this).
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Block fetches shared by concurrent readers now use `SingleFlight` from
|
||||||
|
`proton-media-rs`, the same code Proton Stream uses. Same behaviour: one
|
||||||
|
download per block, every reader gets its result, and a reader whose fetch was
|
||||||
|
cancelled downloads the block itself.
|
||||||
|
- The shared Gallery engine now comes from the `proton-gallery-rs` and
|
||||||
|
`proton-gallery-app-rs` crates on crates.io instead of a pinned Git revision of
|
||||||
|
Proton Gallery. Builds, vendoring and the Nix package no longer fetch from Git.
|
||||||
|
- RAW+JPEG grouping, Google Takeout reading, EXIF capture times, look-alike
|
||||||
|
detection and the offline town lookup now come from `proton-gallery-rs`,
|
||||||
|
shared with Proton Gallery. No behaviour change.
|
||||||
|
- The keyring code (one Secret Service connection that reconnects after the provider
|
||||||
|
restarts, B285, and replacing the session item instead of editing it, B291) now comes
|
||||||
|
from `proton-auth-rs`, shared with Proton Gallery and Proton Stream. No behaviour change.
|
||||||
|
- Config, machine-id and mount-failure files are written through `proton-base-rs`'s
|
||||||
|
atomic writer (temporary file, sync, rename, directory sync). The mount-failure file
|
||||||
|
is now synced before the rename too, so a crash cannot leave it empty.
|
||||||
|
|
||||||
## [3.9.0] — 2026-11-19
|
## [3.9.0] — 2026-11-19
|
||||||
|
|
||||||
Schema: **46**. Photos adds a local database migration for incremental metadata sync.
|
Schema: **46**. Photos adds a local database migration for incremental metadata sync.
|
||||||
|
|||||||
@@ -46,10 +46,7 @@ rustPlatform.buildRustPackage {
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoLock = {
|
cargoLock.lockFile = ../../Cargo.lock;
|
||||||
lockFile = ../../Cargo.lock;
|
|
||||||
allowBuiltinFetchGit = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
cargoBuildFlags = [
|
cargoBuildFlags = [
|
||||||
"--bin"
|
"--bin"
|
||||||
|
|||||||
+587
-460
File diff suppressed because it is too large.
Load diff
+577
-451
File diff suppressed because it is too large.
Load diff
+582
-455
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user