perf: open url when query easydict url scheme

tisfeng · Dec 7, 2023 · d1da868 · d1da868
1 parent 403c7da
commit d1da868
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/Easydict/App/AppDelegate+EZURLScheme.m b/Easydict/App/AppDelegate+EZURLScheme.m
@@ -88,7 +88,7 @@ - (void)handleURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEv
     NSURL *URL = [NSURL URLWithString:[[event paramDescriptorForKeyword:keyDirectObject] stringValue]];
 
     // easydict://query?text=good
-    if ([URL.scheme isEqualToString:EZEasydictScheme]) {
+    if ([URL.scheme containsString:EZEasydictScheme]) {
         NSLog(@"handle URL: %@", URL);
     }
 

diff --git a/Easydict/Feature/Utility/EZLinkParser/EZSchemeParser.h b/Easydict/Feature/Utility/EZLinkParser/EZSchemeParser.h
@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 /// Easydict Scheme: easydict://
 static NSString *const EZEasydictScheme = @"easydict";
+static NSString *const EZEasydictDebugScheme = @"easydictd";
 
 static NSString *const EZWriteKeyValueKey = @"writeKeyValue";
 static NSString *const EZReadValueOfKeyKey = @"readValueOfKey";

diff --git a/Easydict/Feature/Utility/EZLinkParser/EZSchemeParser.m b/Easydict/Feature/Utility/EZLinkParser/EZSchemeParser.m
@@ -37,7 +37,13 @@ - (void)openURLScheme:(NSString *)URLScheme completion:(void (^)(BOOL isSuccess,
     NSArray *allowedActions = actionDict.allKeys;
 
     if (![allowedActions containsObject:action]) {
-        completion(NO, @"Invalid Easydict Action", nil);
+        if ([action isEqualToString:EZQueryKey]) {
+            [NSWorkspace.sharedWorkspace openURL:[NSURL URLWithString:URLScheme]];
+            completion(YES, nil, nil);
+        } else {
+            completion(NO, @"Invalid Easydict Action", nil);
+        }
+
         return;
     }
 
@@ -72,7 +78,8 @@ - (BOOL)isEasydictScheme:(NSString *)text {
     NSString *urlString = [text trim];
     NSURLComponents *urlComponents = [NSURLComponents componentsWithString:urlString];
     NSString *scheme = urlComponents.scheme;
-    return [scheme isEqualToString:EZEasydictScheme];
+    NSArray *schemes = @[EZEasydictScheme, EZEasydictDebugScheme];
+    return [schemes containsObject:scheme];
 }
 
 - (BOOL)isWriteActionKey:(NSString *)actionKey {

diff --git a/Easydict/Feature/ViewController/Window/BaseQueryWindow/EZBaseQueryViewController.m b/Easydict/Feature/ViewController/Window/BaseQueryWindow/EZBaseQueryViewController.m
@@ -407,7 +407,7 @@ - (BOOL)handleEasydictScheme:(NSString *)text {
         [self clearInput];
 
         // If write, need to update.
-        if ([self.schemeParser isWriteActionKey:actionKey]) {
+        if (actionKey && [self.schemeParser isWriteActionKey:actionKey]) {
             // Besides current window, other pages need to be notified, such as the settings service page.
             [self postUpdateServiceNotification];
         }