Implement Reverso Context #19

- Support languages in GTranslator
filimo · Oct 12, 2019 · 6bd9db8 · 6bd9db8
1 parent 97bb099
commit 6bd9db8
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 20 deletions.
diff --git a/ReaderTranslator/Components/GTranslator.swift b/ReaderTranslator/Components/GTranslator.swift
@@ -16,7 +16,7 @@ struct GTranslator : ViewRepresentable, WKScriptsSetup {
     static var pageView: WKPageView?
 
     @ObservedObject private var store = Store.shared
-    private let defaultUrl = "https://translate.google.com?sl=auto&tl=ru"
+    private let defaultUrl = "https://translate.google.com?op=translate&sl=auto&tl=ru"
 
     class Coordinator: WKCoordinator {
         @Published var selectedText = TranslateAction.translator(text: "")
@@ -57,29 +57,19 @@ struct GTranslator : ViewRepresentable, WKScriptsSetup {
 
     func updateView(_ view: WKPageView, context: Context) {
         print("Translator_updateView")
-        let lastUrl = view.url?.absoluteString.replacingOccurrences(of: "#view=home", with: "")
-        let url = lastUrl ?? defaultUrl
-
-        guard var urlComponent = URLComponents(string: url) else { return }
-        guard let queryItems = urlComponent.queryItems else { return }
-
-        let oldText = queryItems.first(where: { $0.name == "text" })?.value ?? ""
-
         if case let .translator(text, noReversoContext) = selectedText,
-            text != "",
-            text != oldText {
-
-            let sl = queryItems.first(where: { $0.name == "sl" })?.value
-            let tl = queryItems.first(where: { $0.name == "tl" })?.value
-
+            text != "" {
+            let (sl, tl) = getParams(url: view.url)
+            guard var urlComponent = URLComponents(string: defaultUrl) else { return }
             urlComponent.queryItems = [
+                .init(name: "op", value: "translate"),
                 .init(name: "sl", value: sl),
                 .init(name: "tl", value: tl),
                 .init(name: "text", value: text)
             ]
 
             if let url = urlComponent.url {
-                print("Translator_updateView_reload")
+                print("Translator_updateView_reload", url)
                 view.load(URLRequest(url: url))
             }
 
@@ -88,6 +78,21 @@ struct GTranslator : ViewRepresentable, WKScriptsSetup {
             }
         }
     }
+
+    private func getParams(url: URL?) -> (String?, String?) {
+        let lastUrl = url?.absoluteString.replacingOccurrences(of: "#view=home", with: "")
+        let url = lastUrl ?? defaultUrl
+
+        guard let urlComponent = URLComponents(string: url) else { return (nil, nil) }
+        let queryItems = urlComponent.queryItems
+
+        selectedText = .none
+
+        let sl = queryItems?.last(where: { $0.name == "sl" })?.value
+        let tl = queryItems?.last(where: { $0.name == "tl" })?.value
+
+        return (sl, tl)
+    }
 }
 
 extension GTranslator.Coordinator: WKScriptMessageHandler {

diff --git a/ReaderTranslator/Components/ReversoContext.swift b/ReaderTranslator/Components/ReversoContext.swift
@@ -45,6 +45,8 @@ struct ReversoContext : ViewRepresentable, WKScriptsSetup {
 
         guard case let .reversoContext(text) = selectedText else { return }
 
+        selectedText = .none
+
         let search = text.replacingOccurrences(of: " ", with: "+")
         let urlString = "\(host)\(search)"
 

diff --git a/ReaderTranslator/Stores/Store.swift b/ReaderTranslator/Stores/Store.swift
@@ -16,15 +16,15 @@ enum ViewMode: String, Codable {
 }
 
 enum TranslateAction: Equatable {
+    case none
     case reversoContext(text: String)
     case translator(text: String, noReversoContext: Bool = false)
 
     func getText() -> String {
         switch self {
-        case .reversoContext(let text):
-            return text
-        case .translator(let text, _):
-            return text
+        case .none: return ""
+        case .reversoContext(let text): return text
+        case .translator(let text, _): return text
         }
     }
 }