Code Style.

rohitbatra1 · May 26, 2020 · ea75be3 · ea75be3
1 parent c0d4b25
commit ea75be3
Showing 1 changed file with 18 additions and 20 deletions.
diff --git a/Safari Reverse Image Search Extension/SafariExtensionHandler.swift b/Safari Reverse Image Search Extension/SafariExtensionHandler.swift
@@ -21,9 +21,8 @@ class SafariExtensionHandler: SFSafariExtensionHandler {
 
 //        show menu option if image is selected and image is not embedded
         if (userInfo!["isImage"] as! String == "IMG"){
-            let x = userInfo!["url"] as! String
 
-            if (!x.contains("data:image")){
+            if (!(userInfo!["url"] as! String).contains("data:image")){
                 validationHandler(false, nil)
             }
             else{
@@ -37,6 +36,15 @@ class SafariExtensionHandler: SFSafariExtensionHandler {
 
     }
 
+    func openTab(newTabURL: URL){
+        // This grabs the active window.
+        SFSafariApplication.getActiveWindow { (activeWindow) in
+            // Request a new tab on the active window, with the URL we want.
+            activeWindow?.openTab(with: newTabURL, makeActiveIfPossible: true, completionHandler: {_ in
+            })
+        }
+    }
+
     override func contextMenuItemSelected(withCommand command: String, in page: SFSafariPage, userInfo: [String : Any]? = nil) {
 
 //        Handling when context menu option is selected.
@@ -49,16 +57,11 @@ class SafariExtensionHandler: SFSafariExtensionHandler {
             imageLink = imageLink.addingPercentEncoding(withAllowedCharacters: .alphanumerics)!
 
             imageSearch += imageLink
-            let myUrl = URL(string: imageSearch)!
-
+            let myURL = URL(string: imageSearch)!
+
+            //open the search results in a new tab
+            openTab(newTabURL: myURL)
 
-            // This grabs the active window.
-            SFSafariApplication.getActiveWindow { (activeWindow) in
-
-                    // Request a new tab on the active window, with the URL we want.
-                    activeWindow?.openTab(with: myUrl, makeActiveIfPossible: true, completionHandler: {_ in
-                    })
-                }
         }
         if (command == "TinEye"){
 
@@ -69,16 +72,11 @@ class SafariExtensionHandler: SFSafariExtensionHandler {
             imageLink = imageLink.addingPercentEncoding(withAllowedCharacters: .alphanumerics)!
 
             imageSearch += imageLink
-            let myUrl = URL(string: imageSearch)!
+            let myURL = URL(string: imageSearch)!
+
+            //open the search results in a new tab
+            openTab(newTabURL: myURL)
 
-
-            // This grabs the active window.
-            SFSafariApplication.getActiveWindow { (activeWindow) in
-
-                    // Request a new tab on the active window, with the URL we want.
-                    activeWindow?.openTab(with: myUrl, makeActiveIfPossible: true, completionHandler: {_ in
-                    })
-                }
         }
 
     }