Skip to content

Commit fe7435c

Browse files
committed
make fmt-rust
1 parent f915b8e commit fe7435c

File tree

6 files changed

+313
-103
lines changed

6 files changed

+313
-103
lines changed

wp_mobile/src/collection/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ mod stateless_collection;
88
pub use collection_error::CollectionError;
99
pub use fetch_error::FetchError;
1010
pub use fetch_result::FetchResult;
11-
pub use post_metadata_collection::{PostMetadataCollectionItem, PostMetadataCollectionWithEditContext};
11+
pub use post_metadata_collection::{
12+
PostMetadataCollectionItem, PostMetadataCollectionWithEditContext,
13+
};
1214
pub use stateless_collection::StatelessCollection;
1315

1416
/// Macro to create UniFFI-compatible post collection wrappers

wp_mobile/src/service/metadata.rs

Lines changed: 44 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use wp_mobile_cache::{
55
db_types::db_site::DbSite,
66
list_metadata::ListState,
77
repository::list_metadata::{
8-
FetchNextPageInfo, ListMetadataHeaderUpdate, ListMetadataItemInput,
9-
ListMetadataRepository, RefreshInfo,
8+
FetchNextPageInfo, ListMetadataHeaderUpdate, ListMetadataItemInput, ListMetadataRepository,
9+
RefreshInfo,
1010
},
1111
};
1212

@@ -101,10 +101,7 @@ impl MetadataService {
101101
/// Get pagination info for a list.
102102
///
103103
/// Returns None if the list doesn't exist.
104-
pub fn get_pagination(
105-
&self,
106-
key: &str,
107-
) -> Result<Option<ListPaginationInfo>, WpServiceError> {
104+
pub fn get_pagination(&self, key: &str) -> Result<Option<ListPaginationInfo>, WpServiceError> {
108105
self.cache.execute(|conn| {
109106
let header = self.repo.get_header(conn, &self.db_site, key)?;
110107
Ok(header.map(|h| ListPaginationInfo {
@@ -147,7 +144,10 @@ impl MetadataService {
147144
/// Check if the current version matches expected (for stale detection).
148145
pub fn check_version(&self, key: &str, expected_version: i64) -> Result<bool, WpServiceError> {
149146
self.cache
150-
.execute(|conn| self.repo.check_version(conn, &self.db_site, key, expected_version))
147+
.execute(|conn| {
148+
self.repo
149+
.check_version(conn, &self.db_site, key, expected_version)
150+
})
151151
.map_err(Into::into)
152152
}
153153

@@ -415,8 +415,7 @@ mod tests {
415415
use rstest::*;
416416
use rusqlite::Connection;
417417
use wp_mobile_cache::{
418-
MigrationManager, WpApiCache,
419-
db_types::self_hosted_site::SelfHostedSite,
418+
MigrationManager, WpApiCache, db_types::self_hosted_site::SelfHostedSite,
420419
repository::sites::SiteRepository,
421420
};
422421

@@ -485,12 +484,18 @@ mod tests {
485484

486485
test_ctx
487486
.service
488-
.set_items(key, &[EntityMetadata::new(1, None), EntityMetadata::new(2, None)])
487+
.set_items(
488+
key,
489+
&[EntityMetadata::new(1, None), EntityMetadata::new(2, None)],
490+
)
489491
.unwrap();
490492

491493
test_ctx
492494
.service
493-
.set_items(key, &[EntityMetadata::new(10, None), EntityMetadata::new(20, None)])
495+
.set_items(
496+
key,
497+
&[EntityMetadata::new(10, None), EntityMetadata::new(20, None)],
498+
)
494499
.unwrap();
495500

496501
let ids = test_ctx.service.get_entity_ids(key).unwrap();
@@ -508,7 +513,10 @@ mod tests {
508513

509514
test_ctx
510515
.service
511-
.append_items(key, &[EntityMetadata::new(2, None), EntityMetadata::new(3, None)])
516+
.append_items(
517+
key,
518+
&[EntityMetadata::new(2, None), EntityMetadata::new(3, None)],
519+
)
512520
.unwrap();
513521

514522
let ids = test_ctx.service.get_entity_ids(key).unwrap();
@@ -555,15 +563,24 @@ mod tests {
555563
let key = "edit:posts:publish";
556564

557565
// No pages loaded yet
558-
test_ctx.service.update_pagination(key, Some(3), None, 0, 20).unwrap();
566+
test_ctx
567+
.service
568+
.update_pagination(key, Some(3), None, 0, 20)
569+
.unwrap();
559570
assert!(test_ctx.service.has_more_pages(key).unwrap());
560571

561572
// Page 1 of 3 loaded
562-
test_ctx.service.update_pagination(key, Some(3), None, 1, 20).unwrap();
573+
test_ctx
574+
.service
575+
.update_pagination(key, Some(3), None, 1, 20)
576+
.unwrap();
563577
assert!(test_ctx.service.has_more_pages(key).unwrap());
564578

565579
// Page 3 of 3 loaded (no more)
566-
test_ctx.service.update_pagination(key, Some(3), None, 3, 20).unwrap();
580+
test_ctx
581+
.service
582+
.update_pagination(key, Some(3), None, 3, 20)
583+
.unwrap();
567584
assert!(!test_ctx.service.has_more_pages(key).unwrap());
568585
}
569586

@@ -598,7 +615,10 @@ mod tests {
598615

599616
// Set up: page 1 of 3 loaded
600617
test_ctx.service.begin_refresh(key).unwrap();
601-
test_ctx.service.update_pagination(key, Some(3), None, 1, 20).unwrap();
618+
test_ctx
619+
.service
620+
.update_pagination(key, Some(3), None, 1, 20)
621+
.unwrap();
602622
test_ctx.service.complete_sync(key).unwrap();
603623

604624
let result = test_ctx.service.begin_fetch_next_page(key).unwrap();
@@ -615,7 +635,10 @@ mod tests {
615635
.service
616636
.set_items(key, &[EntityMetadata::new(1, None)])
617637
.unwrap();
618-
test_ctx.service.update_pagination(key, Some(1), None, 1, 20).unwrap();
638+
test_ctx
639+
.service
640+
.update_pagination(key, Some(1), None, 1, 20)
641+
.unwrap();
619642

620643
test_ctx.service.delete_list(key).unwrap();
621644

@@ -626,7 +649,10 @@ mod tests {
626649
#[rstest]
627650
fn test_list_metadata_reader_trait(test_ctx: TestContext) {
628651
let key = "edit:posts:publish";
629-
let metadata = vec![EntityMetadata::new(100, None), EntityMetadata::new(200, None)];
652+
let metadata = vec![
653+
EntityMetadata::new(100, None),
654+
EntityMetadata::new(200, None),
655+
];
630656

631657
test_ctx.service.set_items(key, &metadata).unwrap();
632658

wp_mobile/src/service/posts.rs

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,11 @@ impl PostService {
225225

226226
// Helper to print log on early return
227227
let print_log = |log: &[String], status: &str| {
228-
println!("[PostService] fetch_metadata_persistent:\n {} | {}", log.join(" -> "), status);
228+
println!(
229+
"[PostService] fetch_metadata_persistent:\n {} | {}",
230+
log.join(" -> "),
231+
status
232+
);
229233
};
230234

231235
// Update state to fetching (this creates the list if needed)
@@ -421,7 +425,9 @@ impl PostService {
421425
self.metadata_service
422426
.set_state(key, state, None)
423427
.map_err(|e| match e {
424-
WpServiceError::DatabaseError { err_message } => FetchError::Database { err_message },
428+
WpServiceError::DatabaseError { err_message } => {
429+
FetchError::Database { err_message }
430+
}
425431
WpServiceError::SiteNotFound => FetchError::Database {
426432
err_message: "Site not found".to_string(),
427433
},
@@ -441,13 +447,17 @@ impl PostService {
441447

442448
// 3. Store metadata in database
443449
let store_result = if is_refresh {
444-
self.metadata_service.set_items(key, &metadata_result.metadata)
450+
self.metadata_service
451+
.set_items(key, &metadata_result.metadata)
445452
} else {
446-
self.metadata_service.append_items(key, &metadata_result.metadata)
453+
self.metadata_service
454+
.append_items(key, &metadata_result.metadata)
447455
};
448456

449457
if let Err(e) = store_result {
450-
let _ = self.metadata_service.complete_sync_with_error(key, &e.to_string());
458+
let _ = self
459+
.metadata_service
460+
.complete_sync_with_error(key, &e.to_string());
451461
return Err(FetchError::Database {
452462
err_message: e.to_string(),
453463
});
@@ -550,14 +560,17 @@ impl PostService {
550560

551561
// Convert to raw IDs and filter out already-fetching
552562
let raw_ids: Vec<i64> = ids.iter().map(|id| id.0).collect();
553-
let fetchable = self.state_store_with_edit_context.filter_fetchable(&raw_ids);
563+
let fetchable = self
564+
.state_store_with_edit_context
565+
.filter_fetchable(&raw_ids);
554566

555567
if fetchable.is_empty() {
556568
return Ok(Vec::new());
557569
}
558570

559571
// Mark as fetching
560-
self.state_store_with_edit_context.set_batch(&fetchable, EntityState::Fetching);
572+
self.state_store_with_edit_context
573+
.set_batch(&fetchable, EntityState::Fetching);
561574

562575
// Convert back to PostId for the API call
563576
let post_ids: Vec<PostId> = fetchable.iter().map(|&id| PostId(id)).collect();
@@ -593,10 +606,11 @@ impl PostService {
593606
.data
594607
.iter()
595608
.map(|post| {
596-
repo.upsert(conn, &self.db_site, post)
597-
.map_err(|e| FetchError::Database {
609+
repo.upsert(conn, &self.db_site, post).map_err(|e| {
610+
FetchError::Database {
598611
err_message: e.to_string(),
599-
})
612+
}
613+
})
600614
})
601615
.collect::<Result<Vec<_>, _>>()
602616
})?;

wp_mobile/src/sync/metadata_collection.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,9 @@ where
288288
.unwrap_or_else(|| "?".to_string());
289289
println!(
290290
"[MetadataCollection] Fetched metadata: page {} of {}, {} items",
291-
next_page, total_pages_str, result.metadata.len()
291+
next_page,
292+
total_pages_str,
293+
result.metadata.len()
292294
);
293295

294296
{

wp_mobile/src/sync/sync_result.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,12 @@ impl SyncResult {
4141
}
4242

4343
/// Create a result indicating no sync was needed.
44-
pub fn no_op(total_items: usize, has_more_pages: bool, current_page: u32, total_pages: Option<u32>) -> Self {
44+
pub fn no_op(
45+
total_items: usize,
46+
has_more_pages: bool,
47+
current_page: u32,
48+
total_pages: Option<u32>,
49+
) -> Self {
4550
Self {
4651
total_items: total_items as u64,
4752
fetched_count: 0,

0 commit comments

Comments
 (0)