mirror of
https://github.com/zhom/donutbrowser.git
synced 2026-10-12 02:37:16 +02:00
chore: fix linting and formatting
This commit is contained in:
1 parent
001a292185
commit
880014d4c4
2 files changed
+19
-11
No files matched your search
@@ -21,7 +21,7 @@ pub enum SyncMode {
|
|||||||
Encrypted,
|
Encrypted,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
#[derive(Debug, Serialize, Deserialize, Clone, Default)]
|
||||||
pub struct BrowserProfile {
|
pub struct BrowserProfile {
|
||||||
pub id: uuid::Uuid,
|
pub id: uuid::Uuid,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ use std::io::{BufReader, Read};
|
|||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
use std::time::SystemTime;
|
use std::time::SystemTime;
|
||||||
|
|
||||||
use crate::profile::types::BrowserProfile;
|
|
||||||
use super::types::{SyncError, SyncResult};
|
use super::types::{SyncError, SyncResult};
|
||||||
|
use crate::profile::types::BrowserProfile;
|
||||||
|
|
||||||
/// Default exclude patterns for volatile browser profile files.
|
/// Default exclude patterns for volatile browser profile files.
|
||||||
/// Patterns use `**/` prefix to match at any directory depth, since the sync
|
/// Patterns use `**/` prefix to match at any directory depth, since the sync
|
||||||
@@ -638,7 +638,12 @@ mod tests {
|
|||||||
fs::write(profile_dir.join("profile/Crashpad/report"), "exclude").unwrap();
|
fs::write(profile_dir.join("profile/Crashpad/report"), "exclude").unwrap();
|
||||||
|
|
||||||
// metadata.json at root
|
// metadata.json at root
|
||||||
fs::write(profile_dir.join("metadata.json"), "keep").unwrap();
|
let profile = BrowserProfile::default();
|
||||||
|
fs::write(
|
||||||
|
profile_dir.join("metadata.json"),
|
||||||
|
serde_json::to_string(&profile).unwrap(),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
let mut cache = HashCache::default();
|
let mut cache = HashCache::default();
|
||||||
let manifest = generate_manifest("test-profile", &profile_dir, &mut cache).unwrap();
|
let manifest = generate_manifest("test-profile", &profile_dir, &mut cache).unwrap();
|
||||||
@@ -867,8 +872,7 @@ mod tests {
|
|||||||
fs::write(&metadata_path, serde_json::to_string(&profile).unwrap()).unwrap();
|
fs::write(&metadata_path, serde_json::to_string(&profile).unwrap()).unwrap();
|
||||||
|
|
||||||
let mut cache = HashCache::default();
|
let mut cache = HashCache::default();
|
||||||
let manifest1 =
|
let manifest1 = generate_manifest(&profile_id.to_string(), &profile_dir, &mut cache).unwrap();
|
||||||
generate_manifest(&profile_id.to_string(), &profile_dir, &mut cache).unwrap();
|
|
||||||
let hash1 = manifest1
|
let hash1 = manifest1
|
||||||
.files
|
.files
|
||||||
.iter()
|
.iter()
|
||||||
@@ -888,8 +892,7 @@ mod tests {
|
|||||||
|
|
||||||
fs::write(&metadata_path, serde_json::to_string(&profile2).unwrap()).unwrap();
|
fs::write(&metadata_path, serde_json::to_string(&profile2).unwrap()).unwrap();
|
||||||
|
|
||||||
let manifest2 =
|
let manifest2 = generate_manifest(&profile_id.to_string(), &profile_dir, &mut cache).unwrap();
|
||||||
generate_manifest(&profile_id.to_string(), &profile_dir, &mut cache).unwrap();
|
|
||||||
let hash2 = manifest2
|
let hash2 = manifest2
|
||||||
.files
|
.files
|
||||||
.iter()
|
.iter()
|
||||||
@@ -899,7 +902,10 @@ mod tests {
|
|||||||
.clone();
|
.clone();
|
||||||
|
|
||||||
// Hash should be identical because volatile fields are sanitized
|
// Hash should be identical because volatile fields are sanitized
|
||||||
assert_eq!(hash1, hash2, "Metadata hash should be stable across last_sync/process_id updates");
|
assert_eq!(
|
||||||
|
hash1, hash2,
|
||||||
|
"Metadata hash should be stable across last_sync/process_id updates"
|
||||||
|
);
|
||||||
|
|
||||||
// Change a non-volatile field
|
// Change a non-volatile field
|
||||||
let profile3 = BrowserProfile {
|
let profile3 = BrowserProfile {
|
||||||
@@ -911,8 +917,7 @@ mod tests {
|
|||||||
|
|
||||||
fs::write(&metadata_path, serde_json::to_string(&profile3).unwrap()).unwrap();
|
fs::write(&metadata_path, serde_json::to_string(&profile3).unwrap()).unwrap();
|
||||||
|
|
||||||
let manifest3 =
|
let manifest3 = generate_manifest(&profile_id.to_string(), &profile_dir, &mut cache).unwrap();
|
||||||
generate_manifest(&profile_id.to_string(), &profile_dir, &mut cache).unwrap();
|
|
||||||
let hash3 = manifest3
|
let hash3 = manifest3
|
||||||
.files
|
.files
|
||||||
.iter()
|
.iter()
|
||||||
@@ -922,6 +927,9 @@ mod tests {
|
|||||||
.clone();
|
.clone();
|
||||||
|
|
||||||
// Hash should be different because name changed
|
// Hash should be different because name changed
|
||||||
assert_ne!(hash1, hash3, "Metadata hash should change when non-volatile fields change");
|
assert_ne!(
|
||||||
|
hash1, hash3,
|
||||||
|
"Metadata hash should change when non-volatile fields change"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user