Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
89 changes: 87 additions & 2 deletions Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -70006,6 +70006,91 @@
}
}
},
"settings.browser.searchEngine.custom": {
"extractionState": "manual",
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Custom"
}
},
"ja": {
"stringUnit": {
"state": "translated",
"value": "カスタム"
}
}
}
},
"settings.browser.customSearchEngineName": {
"extractionState": "manual",
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Custom Search Engine Name"
}
},
"ja": {
"stringUnit": {
"state": "translated",
"value": "カスタム検索エンジン名"
}
}
}
},
"settings.browser.customSearchEngineName.subtitle": {
"extractionState": "manual",
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Shown in browser address bar search suggestions."
}
},
"ja": {
"stringUnit": {
"state": "translated",
"value": "ブラウザのアドレスバーの検索候補に表示されます。"
}
}
}
},
"settings.browser.customSearchEngineURLTemplate": {
"extractionState": "manual",
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Custom Search URL"
}
},
"ja": {
"stringUnit": {
"state": "translated",
"value": "カスタム検索URL"
}
}
}
},
"settings.browser.customSearchEngineURLTemplate.subtitle": {
"extractionState": "manual",
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Use {query} or %s for the search terms. Without a placeholder, cmux appends q=."
}
},
"ja": {
"stringUnit": {
"state": "translated",
"value": "検索語には {query} または %s を使います。プレースホルダーがない場合、cmux は q= を追加します。"
}
}
}
},
"settings.browser.searchSuggestions": {
"extractionState": "manual",
"localizations": {
Expand Down Expand Up @@ -82545,13 +82630,13 @@
"en": {
"stringUnit": {
"state": "translated",
"value": "browser.defaultSearchEngine omnibar address bar google duckduckgo bing search provider"
"value": "browser.defaultSearchEngine browser.customSearchEngineName browser.customSearchEngineURLTemplate omnibar address bar google duckduckgo bing kagi brave startpage perplexity yahoo ecosia qwant mojeek wikipedia github baidu yandex custom search provider"
}
},
"ja": {
"stringUnit": {
"state": "translated",
"value": "browser.defaultSearchEngine omnibar address bar google duckduckgo bing search provider オムニバー アドレスバー google duckduckgo bing 検索エンジン 検索プロバイダ"
"value": "browser.defaultSearchEngine browser.customSearchEngineName browser.customSearchEngineURLTemplate omnibar address bar google duckduckgo bing kagi brave startpage perplexity yahoo ecosia qwant mojeek wikipedia github baidu yandex custom search provider オムニバー アドレスバー kagi brave startpage perplexity yahoo ecosia qwant mojeek wikipedia github baidu yandex カスタム 検索エンジン 検索プロバイダ"
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
}
},
"ar": {
Expand Down
2 changes: 2 additions & 0 deletions Sources/CmuxSettingsJSONPathSupport.swift
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ extension CmuxSettingsFileStore {
"automation.portBase",
"automation.portRange",
"browser.defaultSearchEngine",
"browser.customSearchEngineName",
"browser.customSearchEngineURLTemplate",
"browser.showSearchSuggestions",
"browser.theme",
"browser.discardHiddenWebViews",
Expand Down
2 changes: 2 additions & 0 deletions Sources/KeyboardShortcutSettingsFileStore+Template.swift
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ extension CmuxSettingsFileStore {
[
"browser": [
"defaultSearchEngine": BrowserSearchSettings.defaultSearchEngine.rawValue,
"customSearchEngineName": BrowserSearchSettings.defaultCustomSearchEngineName,
"customSearchEngineURLTemplate": BrowserSearchSettings.defaultCustomSearchEngineURLTemplate,
"showSearchSuggestions": BrowserSearchSettings.defaultSearchSuggestionsEnabled,
"theme": BrowserThemeSettings.defaultMode.rawValue,
"discardHiddenWebViews": BrowserHiddenWebViewDiscardPolicy.defaultEnabled,
Expand Down
14 changes: 14 additions & 0 deletions Sources/KeyboardShortcutSettingsFileStore.swift
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,20 @@ final class CmuxSettingsFileStore {
}
snapshot.managedUserDefaults[BrowserSearchSettings.searchEngineKey] = .string(engine.rawValue)
}
if let raw = jsonString(section["customSearchEngineName"]) {
guard let normalized = BrowserSearchSettings.normalizedCustomSearchEngineName(raw) else {
logInvalid("browser.customSearchEngineName", sourcePath: sourcePath)
return
}
snapshot.managedUserDefaults[BrowserSearchSettings.customSearchEngineNameKey] = .string(normalized)
}
if let raw = jsonString(section["customSearchEngineURLTemplate"]) {
guard BrowserSearchSettings.isValidSearchURLTemplate(raw) else {
logInvalid("browser.customSearchEngineURLTemplate", sourcePath: sourcePath)
return
}
snapshot.managedUserDefaults[BrowserSearchSettings.customSearchEngineURLTemplateKey] = .string(raw)
Comment thread
cursor[bot] marked this conversation as resolved.
Resolved
}
if let value = jsonBool(section["showSearchSuggestions"]) {
snapshot.managedUserDefaults[BrowserSearchSettings.searchSuggestionsEnabledKey] = .bool(value)
}
Expand Down
191 changes: 172 additions & 19 deletions Sources/Panels/BrowserPanel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -94,48 +94,130 @@ enum BrowserSearchEngine: String, CaseIterable, Identifiable {
case bing
case kagi
case startpage
case brave
case perplexity
case yahoo
case ecosia
case qwant
case mojeek
case wikipedia
case github
case baidu
case yandex
case custom

var id: String { rawValue }

static var presetCases: [BrowserSearchEngine] {
allCases.filter { $0 != .custom }
}
Comment thread
cursor[bot] marked this conversation as resolved.
Resolved

var displayName: String {
switch self {
case .google: return "Google"
case .duckduckgo: return "DuckDuckGo"
case .bing: return "Bing"
case .kagi: return "Kagi"
case .startpage: return "Startpage"
}
}

func searchURL(query: String) -> URL? {
let trimmed = query.trimmingCharacters(in: .whitespacesAndNewlines)
guard !trimmed.isEmpty else { return nil }

var components: URLComponents?
case .brave: return "Brave Search"
case .perplexity: return "Perplexity"
case .yahoo: return "Yahoo"
case .ecosia: return "Ecosia"
case .qwant: return "Qwant"
case .mojeek: return "Mojeek"
case .wikipedia: return "Wikipedia"
case .github: return "GitHub"
case .baidu: return "Baidu"
case .yandex: return "Yandex"
case .custom:
return String(localized: "settings.browser.searchEngine.custom", defaultValue: "Custom")
}
}

var searchURLTemplate: String? {
switch self {
case .google:
components = URLComponents(string: "https://www.google.com/search")
return "https://www.google.com/search?q={query}"
case .duckduckgo:
components = URLComponents(string: "https://duckduckgo.com/")
return "https://duckduckgo.com/?q={query}"
case .bing:
components = URLComponents(string: "https://www.bing.com/search")
return "https://www.bing.com/search?q={query}"
case .kagi:
components = URLComponents(string: "https://kagi.com/search")
return "https://kagi.com/search?q={query}"
case .startpage:
components = URLComponents(string: "https://www.startpage.com/do/dsearch")
return "https://www.startpage.com/do/dsearch?q={query}"
case .brave:
return "https://search.brave.com/search?q={query}"
case .perplexity:
return "https://www.perplexity.ai/search?q={query}"
case .yahoo:
return "https://search.yahoo.com/search?p={query}"
case .ecosia:
return "https://www.ecosia.org/search?q={query}"
case .qwant:
return "https://www.qwant.com/?q={query}"
case .mojeek:
return "https://www.mojeek.com/search?q={query}"
case .wikipedia:
return "https://en.wikipedia.org/w/index.php?search={query}"
case .github:
return "https://github.com/search?q={query}"
case .baidu:
return "https://www.baidu.com/s?wd={query}"
case .yandex:
return "https://yandex.com/search/?text={query}"
case .custom:
return nil
}
}

components?.queryItems = [
URLQueryItem(name: "q", value: trimmed),
]
return components?.url
var supportsRemoteSuggestions: Bool {
switch self {
case .google, .duckduckgo, .bing, .kagi, .startpage:
return true
case .brave, .perplexity, .yahoo, .ecosia, .qwant, .mojeek, .wikipedia, .github, .baidu, .yandex, .custom:
return false
}
}

func searchURL(query: String) -> URL? {
guard let template = searchURLTemplate else { return nil }
return BrowserSearchSettings.searchURL(fromTemplate: template, query: query)
}
}

struct BrowserSearchConfiguration: Equatable {
let engine: BrowserSearchEngine
let customName: String
let customURLTemplate: String

var displayName: String {
guard engine == .custom else { return engine.displayName }
return BrowserSearchSettings.normalizedCustomSearchEngineName(customName)
?? BrowserSearchSettings.defaultCustomSearchEngineName
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

var remoteSuggestionsEngine: BrowserSearchEngine? {
guard engine.supportsRemoteSuggestions else { return nil }
return engine
}

func searchURL(query: String) -> URL? {
if engine == .custom {
return BrowserSearchSettings.searchURL(fromTemplate: customURLTemplate, query: query)
}
return engine.searchURL(query: query)
}
}

enum BrowserSearchSettings {
static let searchEngineKey = "browserSearchEngine"
static let customSearchEngineNameKey = "browserCustomSearchEngineName"
static let customSearchEngineURLTemplateKey = "browserCustomSearchEngineURLTemplate"
static let searchSuggestionsEnabledKey = "browserSearchSuggestionsEnabled"
static let defaultSearchEngine: BrowserSearchEngine = .google
static let defaultCustomSearchEngineName = "Custom"
static let defaultCustomSearchEngineURLTemplate = "https://www.google.com/search?q={query}"
static let defaultSearchSuggestionsEnabled: Bool = true

static func currentSearchEngine(defaults: UserDefaults = .standard) -> BrowserSearchEngine {
Expand All @@ -146,6 +228,73 @@ enum BrowserSearchSettings {
return engine
}

static func currentConfiguration(defaults: UserDefaults = .standard) -> BrowserSearchConfiguration {
configuration(
engineRaw: defaults.string(forKey: searchEngineKey),
customName: defaults.string(forKey: customSearchEngineNameKey),
customURLTemplate: defaults.string(forKey: customSearchEngineURLTemplateKey)
)
}

static func configuration(
engineRaw: String?,
customName: String?,
customURLTemplate: String?
) -> BrowserSearchConfiguration {
let engine = engineRaw.flatMap(BrowserSearchEngine.init(rawValue:)) ?? defaultSearchEngine
return BrowserSearchConfiguration(
engine: engine,
customName: customName ?? defaultCustomSearchEngineName,
customURLTemplate: customURLTemplate ?? defaultCustomSearchEngineURLTemplate
)
Comment thread
cursor[bot] marked this conversation as resolved.
Resolved
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
}

static func normalizedCustomSearchEngineName(_ raw: String) -> String? {
let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
return trimmed.isEmpty ? nil : trimmed
}

static func isValidSearchURLTemplate(_ raw: String) -> Bool {
searchURL(fromTemplate: raw, query: "cmux search") != nil
}

static func searchURL(fromTemplate rawTemplate: String, query rawQuery: String) -> URL? {
let template = rawTemplate.trimmingCharacters(in: .whitespacesAndNewlines)
let query = rawQuery.trimmingCharacters(in: .whitespacesAndNewlines)
guard !template.isEmpty, !query.isEmpty else { return nil }

if template.contains("{query}") || template.contains("%s") {
let encodedQuery = percentEncodedSearchQuery(query)
let rendered = template
.replacingOccurrences(of: "{query}", with: encodedQuery)
.replacingOccurrences(of: "%s", with: encodedQuery)
guard let url = URL(string: rendered), isAllowedSearchURL(url) else { return nil }
return url
}

guard var components = URLComponents(string: template) else { return nil }
var queryItems = components.queryItems ?? []
queryItems.append(URLQueryItem(name: "q", value: query))
components.queryItems = queryItems
guard let url = components.url, isAllowedSearchURL(url) else { return nil }
return url
}

private static func percentEncodedSearchQuery(_ query: String) -> String {
var allowed = CharacterSet.alphanumerics
allowed.insert(charactersIn: "-._~")
return query.addingPercentEncoding(withAllowedCharacters: allowed) ?? query
}

private static func isAllowedSearchURL(_ url: URL) -> Bool {
guard let scheme = url.scheme?.lowercased(),
scheme == "https" || scheme == "http",
url.host?.isEmpty == false else {
return false
}
return true
}

static func currentSearchSuggestionsEnabled(defaults: UserDefaults = .standard) -> Bool {
// Mirror @AppStorage behavior: bool(forKey:) returns false if key doesn't exist.
// Default to enabled unless user explicitly set a value.
Expand Down Expand Up @@ -2220,6 +2369,8 @@ actor BrowserSearchSuggestionService {
URLQueryItem(name: "q", value: query),
]
url = c?.url
case .brave, .perplexity, .yahoo, .ecosia, .qwant, .mojeek, .wikipedia, .github, .baidu, .yandex, .custom:
url = nil
}

guard let url else { return [] }
Expand Down Expand Up @@ -2248,6 +2399,8 @@ actor BrowserSearchSuggestionService {
return parseOSJSON(data: data)
case .duckduckgo:
return parseDuckDuckGo(data: data)
case .brave, .perplexity, .yahoo, .ecosia, .qwant, .mojeek, .wikipedia, .github, .baidu, .yandex, .custom:
return []
}
}

Expand Down Expand Up @@ -5038,8 +5191,8 @@ final class BrowserPanel: Panel, ObservableObject {
return
}

let engine = BrowserSearchSettings.currentSearchEngine()
guard let searchURL = engine.searchURL(query: trimmed) else { return }
let searchConfiguration = BrowserSearchSettings.currentConfiguration()
guard let searchURL = searchConfiguration.searchURL(query: trimmed) else { return }
navigate(to: searchURL)
}

Expand Down
Loading
Loading