Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix DeepL query items #277

Merged
merged 3 commits into from
Apr 20, 2023
Merged

Fix DeepL query items #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5583f56
using queryItems instead of self build strings
NickAtGit Apr 20, 2023
e0ec154
change DeepL translate handling using URLQueryItem instead of self bu…
NickAtGit Apr 20, 2023
4acb357
fix test
NickAtGit Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions Sources/BartyCrouchTranslator/DeeplApi/DeepLApi.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,24 @@ extension DeepLApi: Endpoint {
var method: HttpMethod {
switch self {
case .translate(let texts, let sourceLanguage, let targetLanguage, let authKey):
let textEntries = texts.map { "text=\($0.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)!)" }
.joined(separator: "&")
let authKeyEntry = "auth_key=\(authKey)"
let sourceLanguageEntry = "source_lang=\(sourceLanguage.deepLParameterValue)"
let targetLanguageEntry = "target_lang=\(targetLanguage.deepLParameterValue)"
let bodyString = [authKeyEntry, sourceLanguageEntry, targetLanguageEntry, textEntries].joined(separator: "&")
return .post(body: bodyString.data(using: .utf8)!)

let authKeyItem = URLQueryItem(name: "auth_key", value: authKey)
let textItems = texts.map { URLQueryItem(name: "text", value: $0) }
let targetLangItem = URLQueryItem(name: "target_lang", value: targetLanguage.deepLParameterValue)
let sourceLangItem = URLQueryItem(name: "source_lang", value: sourceLanguage.deepLParameterValue)

var components = URLComponents()
components.queryItems = ([authKeyItem, targetLangItem, sourceLangItem] + textItems).compactMap { $0 }

guard var queryItemsString = components.string else {
fatalError("Invalid arguments.")
}
// queryItemsString starts with a ? but post API expects the query string without leading ?
if queryItemsString.hasPrefix("?") {
queryItemsString.removeFirst()
}

return .post(body: queryItemsString.data(using: .utf8)!)
}
}

Expand Down
1 change: 1 addition & 0 deletions Tests/BartyCrouchTranslatorTests/DeepLTranslatorApiTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class DeepLTranslatorApiTests: XCTestCase {
switch apiProvider.performRequestAndWait(on: endpoint, decodeBodyTo: DeepLTranslateResponse.self) {
case let .success(translateResponses):
XCTAssertEqual(translateResponses.translations[0].text, "Wie alt sind Sie?")
XCTAssertEqual(translateResponses.translations[1].text, "Liebe")

case let .failure(failure):
XCTFail(failure.localizedDescription)
Expand Down