Localized FetchError and CollectionError (#1130)

* Localized FetchError and CollectionError

* Remove an unused variable

* Generate LocalizedError implementation for wp_mobile types

* Include SQL error in the error message

Author: crazytonyli

Cargo.lock

@@ -20,11 +20,14 @@ cargo run --release --quiet --bin wp_uniffi_bindgen generate \
     --no-format \
     --language swift
 
-function patch_wp_api {
-    error_types=$(grep -r "impl WpSupportsLocalization for" wp_api/src | grep -o "for [A-Za-z0-9]*" | cut -d' ' -f2)
+function generate_localized_error_extension {
+    local package_name=$1
+    local swift_binding=$2
+
+    error_types=$(grep -r "impl WpSupportsLocalization for" "${package_name}/src" | grep -o "for [A-Za-z0-9]*" | cut -d' ' -f2)
 
     for error_type in $error_types; do
-        cat <<EOF >> "$1"
+        cat <<EOF >> "$swift_binding"
 
 extension $error_type: LocalizedError {
     public var errorDescription: String? {
@@ -34,19 +37,23 @@ extension $error_type: LocalizedError {
 }
 EOF
     done
+}
+
+function patch_wp_api {
+    local swift_binding=$1
+    generate_localized_error_extension wp_api "$swift_binding"
 
     # Use sed to replace `import SQLite3` with the wrapped version
   sed -i.bak 's/^import SQLite3$/#if canImport(SQLite3)\
 import SQLite3\
-#endif/' $swift_binding
+#endif/' "$swift_binding"
 }
 
-for swift_binding in "$output_dir"/*.swift; do
-    options=("-i")
-    if [[ $(uname) == "Darwin" ]]; then
-        options+=("")
-    fi
+function patch_wp_mobile {
+    generate_localized_error_extension wp_mobile "$1"
+}
 
+for swift_binding in "$output_dir"/*.swift; do
     basename=$(basename "$swift_binding" .swift)
     if [ "$(type -t "patch_$basename")" = "function" ]; then
         "patch_$basename" "$swift_binding"

scripts/swift-bindings.sh

@@ -72,3 +72,5 @@ parse_api_root_failure_reason_server_fatal_error = Your server encountered an un
 parse_api_root_failure_reason_wordfence_blocking_access = Wordfence is blocking access to the site's API. Please check your Wordfence configuration.
 
 already_logged_in = You are already logged in as {$username}.
+
+database_generic_message = There was a problem loading your data: {$reason}.

wp_localization/localization/en-US/main.ftl

@@ -19,6 +19,8 @@ thiserror = { workspace = true }
 uniffi = { workspace = true }
 url = { workspace = true }
 wp_api = { path = "../wp_api" }
+wp_localization = { path = "../wp_localization" }
+wp_localization_macro = { path = "../wp_localization_macro" }
 wp_mobile_cache = { path = "../wp_mobile_cache" }
 
 [dev-dependencies]

wp_mobile/Cargo.toml

@@ -1,7 +1,9 @@
+use wp_localization::{MessageBundle, WpMessages, WpSupportsLocalization};
+use wp_localization_macro::WpDeriveLocalizable;
+
 /// Errors that can occur during collection operations
-#[derive(Debug, thiserror::Error, uniffi::Error)]
+#[derive(Debug, thiserror::Error, uniffi::Error, WpDeriveLocalizable)]
 pub enum CollectionError {
-    #[error("Database error: {err_message}")]
     DatabaseError { err_message: String },
 }
 
@@ -12,3 +14,13 @@ impl From<wp_mobile_cache::SqliteDbError> for CollectionError {
         }
     }
 }
+
+impl WpSupportsLocalization for CollectionError {
+    fn message_bundle(&self) -> MessageBundle<'_> {
+        match self {
+            CollectionError::DatabaseError { err_message } => {
+                WpMessages::database_generic_message(err_message)
+            }
+        }
+    }
+}

wp_mobile/src/collection/collection_error.rs

@@ -1,18 +1,18 @@
 use wp_api::prelude::WpApiError;
+use wp_localization::{MessageBundle, WpMessages, WpSupportsLocalization};
+use wp_localization_macro::WpDeriveLocalizable;
 use wp_mobile_cache::SqliteDbError;
 
 /// Errors that can occur during network fetch operations
 ///
 /// This combines API/network errors from wp_api with database errors
 /// from cache operations.
-#[derive(Debug, thiserror::Error, uniffi::Error)]
+#[derive(Debug, thiserror::Error, uniffi::Error, WpDeriveLocalizable)]
 pub enum FetchError {
     /// API or network error from wp_api
-    #[error(transparent)]
     Api(WpApiError),
 
     /// Database error during cache upsert
-    #[error("Database error: {err_message}")]
     Database { err_message: String },
 }
 
@@ -37,3 +37,14 @@ impl From<crate::service::WpServiceError> for FetchError {
         }
     }
 }
+
+impl WpSupportsLocalization for FetchError {
+    fn message_bundle(&self) -> MessageBundle<'_> {
+        match self {
+            FetchError::Api(api_err) => api_err.message_bundle(),
+            FetchError::Database { err_message } => {
+                WpMessages::database_generic_message(err_message)
+            }
+        }
+    }
+}