fix: resolve error type in EZBingService and EZYoudaoTranslate

tisfeng · Dec 14, 2023 · a2b9824 · a2b9824
1 parent f414edf
commit a2b9824
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 9 deletions.
diff --git a/Easydict/Feature/Service/Bing/EZBingService.m b/Easydict/Feature/Service/Bing/EZBingService.m
@@ -130,7 +130,7 @@ - (void)bingTranslate:(NSString *)text useDictQuery:(BOOL)useDictQuery from:(non
         mm_strongify(self)
         @try {
             if (translateError) {
-                self.result.error = translateError;
+                self.result.error = [EZError errorWithNSError:translateError];
                 NSLog(@"bing translate error %@", translateError);
             } else {
                 BOOL needRetry;
@@ -143,7 +143,7 @@ - (void)bingTranslate:(NSString *)text useDictQuery:(BOOL)useDictQuery from:(non
                 }
                 self.canRetry = YES;
                 if (error) {
-                    self.result.error = error;
+                    self.result.error = [EZError errorWithNSError:error];
                     completion(self.result, error);
                     return;
                 }

diff --git a/Easydict/Feature/Service/Model/EZError.h b/Easydict/Feature/Service/Model/EZError.h
@@ -28,6 +28,7 @@ typedef NS_ENUM(NSUInteger, EZErrorType) {
     EZErrorTypeUnsupportedLanguage, // 不支持的语言
     EZErrorTypeNoResultsFound, // 未查询到结果
     EZErrorTypeInsufficientQuota, // 内置 API key 额度不足
+    EZErrorTypeWarppedNSError, // warp NSError
 };
 
 /// 错误，不支持的语言
@@ -47,6 +48,8 @@ FOUNDATION_EXPORT NSError *EZQueryUnsupportedLanguageError(EZQueryService *servi
 
 + (instancetype)timeoutError;
 
++ (nullable EZError *)errorWithNSError:(nullable NSError *)error;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Easydict/Feature/Service/Model/EZError.m b/Easydict/Feature/Service/Model/EZError.m
@@ -21,7 +21,7 @@
     if (!to) {
         unsupportLanguage = service.queryModel.queryTargetLanguage;
     }
-    
+
     NSString *showUnsupportLanguage = [EZLanguageManager.shared showingLanguageName:unsupportLanguage];
     NSError *error = [EZError errorWithType:EZErrorTypeUnsupportedLanguage message:showUnsupportLanguage request:nil];
     return error;
@@ -35,6 +35,9 @@ + (instancetype)errorWithType:(EZErrorType)type
                       request:(id _Nullable)request {
     NSString *errorString = nil;
     switch (type) {
+        case EZErrorTypeNone:
+            errorString = @"";
+            break;
         case EZErrorTypeParam:
             errorString = NSLocalizedString(@"error_parameter", nil);
             break;
@@ -53,25 +56,35 @@ + (instancetype)errorWithType:(EZErrorType)type
         case EZErrorTypeInsufficientQuota:
             errorString = NSLocalizedString(@"error_insufficient_quota", nil);
             break;
+
         default:
             errorString = NSLocalizedString(@"error_unknown", nil);
             break;
     }
+
+    if (errorString.length) {
+        errorString = [NSString stringWithFormat:@"%@, %@", NSLocalizedString(@"query_failed", nil), errorString];
+    }
 
-    errorString = [NSString stringWithFormat:@"%@, %@", NSLocalizedString(@"query_failed", nil), errorString];
     if (message.length) {
         errorString = [NSString stringWithFormat:@"%@: %@", errorString, message];
     }
 
+    if (type == EZErrorTypeWarppedNSError) {
+        errorString = message;
+    }
+
     NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
-    [userInfo setObject:errorString forKey:NSLocalizedDescriptionKey];
+    if (errorString) {
+        [userInfo setObject:errorString forKey:NSLocalizedDescriptionKey];
+    }
     if (request) {
         [userInfo setObject:request forKey:EZTranslateErrorRequestKey];
     }
-    
+
     EZError *error = [EZError errorWithDomain:EZBundleId code:type userInfo:userInfo.copy];
     error.type = type;
-    
+
     return error;
 }
 
@@ -84,4 +97,17 @@ + (instancetype)timeoutError {
     return [self errorWithType:EZErrorTypeTimeout message:errorString request:nil];
 }
 
++ (nullable EZError *)errorWithNSError:(nullable NSError *)error {
+    if (!error) {
+        return nil;
+    }
+
+    if ([error isKindOfClass:EZError.class]) {
+        return (EZError *)error;
+    }
+
+    EZError *ezError = [EZError errorWithType:EZErrorTypeWarppedNSError message:error.localizedDescription request:nil];
+    return ezError;
+}
+
 @end
diff --git a/Easydict/Feature/Service/Youdao/EZYoudaoTranslate.m b/Easydict/Feature/Service/Youdao/EZYoudaoTranslate.m
@@ -466,7 +466,7 @@ - (void)queryYoudaoDictAndTranslation:(NSString *)text from:(EZLanguage)from to:
         [self webTranslate:text from:from to:to completion:^(EZQueryResult *_Nullable result, NSError *_Nullable error) {
             if (error) {
                 NSLog(@"translateYoudaoAPI error: %@", error);
-                self.result.error = error;
+                self.result.error = [EZError errorWithNSError:error];
             }
             dispatch_group_leave(group);
         }];

diff --git a/Easydict/Feature/ViewController/Window/BaseQueryWindow/EZBaseQueryViewController.m b/Easydict/Feature/ViewController/Window/BaseQueryWindow/EZBaseQueryViewController.m
@@ -682,7 +682,7 @@ - (void)queryWithModel:(EZQueryModel *)queryModel
         if (error) {
             NSLog(@"query error: %@", error);
         }
-        result.error = error;
+        result.error = [EZError errorWithNSError:error];
 
         // Auto convert to traditional Chinese if needed.
         if (service.autoConvertTraditionalChinese &&