Skip to content

Change the search behaviour #10039

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

Open
mojganii wants to merge 1 commit into
base: main
Choose a base branch
from
+364 −181
Open

Change the search behaviour #10039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 78 additions & 0 deletions ios/MullvadMockData/MullvadREST/ServerRelaysResponse+Stubs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,24 @@ public enum ServerRelaysResponseStubs {
latitude: 40.6963302,
longitude: -74.6034843
),
"hr-zag": REST.ServerLocation(
country: "Croatia",
city: "Zagreb",
latitude: 45.821,
longitude: 15.973
),
"bg-sof": REST.ServerLocation(
country: "Bulgaria",
city: "Sofia",
latitude: 42.683333,
longitude: 23.316667
),
"gr-ath": REST.ServerLocation(
country: "Greece",
city: "Athens",
latitude: 37.98381,
longitude: 23.727539
),
],
wireguard: REST.ServerWireguardTunnels(
ipv4Gateway: .loopback,
Expand Down Expand Up @@ -289,6 +307,66 @@ public enum ServerRelaysResponseStubs {
shadowsocksExtraAddrIn: nil,
features: .init(daita: .init(), quic: nil, lwo: nil)
),
REST.ServerRelay(
hostname: "hr-zag-wg-001",
active: true,
owned: false,
location: "hr-zag",
provider: "DataPacket",
weight: 100,
ipv4AddrIn: .loopback,
ipv6AddrIn: .loopback,
publicKey: PrivateKey().publicKey.rawValue,
includeInCountry: true,
daita: false,
shadowsocksExtraAddrIn: nil,
features: .init(daita: .init(), quic: nil, lwo: nil)
),
REST.ServerRelay(
hostname: "bg-sof-wg-001",
active: true,
owned: false,
location: "bg-sof",
provider: "M247",
weight: 100,
ipv4AddrIn: .loopback,
ipv6AddrIn: .loopback,
publicKey: PrivateKey().publicKey.rawValue,
includeInCountry: true,
daita: false,
shadowsocksExtraAddrIn: nil,
features: .init(daita: .init(), quic: nil, lwo: nil)
),
REST.ServerRelay(
hostname: "gr-ath-wg-101",
active: true,
owned: false,
location: "gr-ath",
provider: "DataPacket",
weight: 100,
ipv4AddrIn: .loopback,
ipv6AddrIn: .loopback,
publicKey: PrivateKey().publicKey.rawValue,
includeInCountry: true,
daita: false,
shadowsocksExtraAddrIn: nil,
features: .init(daita: .init(), quic: nil, lwo: nil)
),
REST.ServerRelay(
hostname: "us-nyc-wg-101",
active: true,
owned: false,
location: "us-nyc",
provider: "DataPacket",
weight: 100,
ipv4AddrIn: .loopback,
ipv6AddrIn: .loopback,
publicKey: PrivateKey().publicKey.rawValue,
includeInCountry: true,
daita: true,
shadowsocksExtraAddrIn: nil,
features: .init(daita: .init(), quic: nil, lwo: nil)
),
],
shadowsocksPortRanges: shadowsocksPortRanges
),
Expand Down
12 changes: 6 additions & 6 deletions ios/MullvadVPN.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@
58FF9FEA2B07653800E4C97D /* ButtonCellContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FF9FE92B07653800E4C97D /* ButtonCellContentView.swift */; };
58FF9FF02B07C4D300E4C97D /* PersistentAccessMethod+ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FF9FEF2B07C4D300E4C97D /* PersistentAccessMethod+ViewModel.swift */; };
58FF9FF42B07C61B00E4C97D /* AccessMethodValidationError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58FF9FF32B07C61B00E4C97D /* AccessMethodValidationError.swift */; };
7A09C98129D99215000C2CAC /* String+FuzzyMatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A09C98029D99215000C2CAC /* String+FuzzyMatch.swift */; };
7A09C98129D99215000C2CAC /* String+Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A09C98029D99215000C2CAC /* String+Search.swift */; };
7A0B311E2B303A0D004B12E0 /* AccessbilityIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A0B311D2B303A0D004B12E0 /* AccessbilityIdentifier.swift */; };
7A0C0F632A979C4A0058EFCE /* Coordinator+Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A0C0F622A979C4A0058EFCE /* Coordinator+Router.swift */; };
7A0EAE9A2D01B41500D3EB8B /* MainButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A0EAE992D01B41500D3EB8B /* MainButtonStyle.swift */; };
Expand Down Expand Up @@ -826,7 +826,7 @@
A9A5F9ED2ACB05160083449F /* NSRegularExpression+IPAddress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5871FB9F254C26BF0051A0A4 /* NSRegularExpression+IPAddress.swift */; };
A9A5F9EE2ACB05160083449F /* StorePaymentOutcome.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06FAE67828F83CA50033DD93 /* StorePaymentOutcome.swift */; };
A9A5F9EF2ACB05160083449F /* String+AccountFormatting.swift in Sources */ = {isa = PBXBuildFile; fileRef = E158B35F285381C60002F069 /* String+AccountFormatting.swift */; };
A9A5F9F02ACB05160083449F /* String+FuzzyMatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A09C98029D99215000C2CAC /* String+FuzzyMatch.swift */; };
A9A5F9F02ACB05160083449F /* String+Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A09C98029D99215000C2CAC /* String+Search.swift */; };
A9A5F9F12ACB05160083449F /* String+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5807E2BF2432038B00F5FF30 /* String+Helpers.swift */; };
A9A5F9F22ACB05160083449F /* NotificationConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58C8191729FAA2C400DEB1B4 /* NotificationConfiguration.swift */; };
A9A5F9F32ACB05160083449F /* AccountExpirySystemNotificationProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B75402668FD7700DEF7E9 /* AccountExpirySystemNotificationProvider.swift */; };
Expand Down Expand Up @@ -2138,7 +2138,7 @@
58FF9FEF2B07C4D300E4C97D /* PersistentAccessMethod+ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PersistentAccessMethod+ViewModel.swift"; sourceTree = "<group>"; };
58FF9FF32B07C61B00E4C97D /* AccessMethodValidationError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessMethodValidationError.swift; sourceTree = "<group>"; };
7A02D4EA2A9CEC7A00C19E31 /* MullvadVPNScreenshots.xctestplan */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MullvadVPNScreenshots.xctestplan; sourceTree = "<group>"; };
7A09C98029D99215000C2CAC /* String+FuzzyMatch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+FuzzyMatch.swift"; sourceTree = "<group>"; };
7A09C98029D99215000C2CAC /* String+Search.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Search.swift"; sourceTree = "<group>"; };
7A0B311D2B303A0D004B12E0 /* AccessbilityIdentifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccessbilityIdentifier.swift; sourceTree = "<group>"; };
7A0C0F622A979C4A0058EFCE /* Coordinator+Router.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Coordinator+Router.swift"; sourceTree = "<group>"; };
7A0EAE992D01B41500D3EB8B /* MainButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainButtonStyle.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3579,7 +3579,7 @@
58B9EB142489139B00095626 /* RESTError+Display.swift */,
E158B35F285381C60002F069 /* String+AccountFormatting.swift */,
7AA564472F2B680D001D1FB9 /* String+Assets.swift */,
7A09C98029D99215000C2CAC /* String+FuzzyMatch.swift */,
7A09C98029D99215000C2CAC /* String+Search.swift */,
5807E2BF2432038B00F5FF30 /* String+Helpers.swift */,
58CEB2F82AFD136E00E6E088 /* UIBackgroundConfiguration+Extensions.swift */,
5891BF5025E66B1E006D6FB0 /* UIBarButtonItem+KeyboardNavigation.swift */,
Expand Down Expand Up @@ -6158,7 +6158,7 @@
7A9BE5A72B907EEC00E2A7D0 /* AllLocationDataSource.swift in Sources */,
A9A5F9EF2ACB05160083449F /* String+AccountFormatting.swift in Sources */,
F9EDB26C2EC4C0480015DE36 /* CustomListInteractorTests.swift in Sources */,
A9A5F9F02ACB05160083449F /* String+FuzzyMatch.swift in Sources */,
A9A5F9F02ACB05160083449F /* String+Search.swift in Sources */,
F09D04C12AF39EA2003D4F89 /* OutgoingConnectionService.swift in Sources */,
7A460FA02F35D05A005A265D /* NewAppVersionInAppNotificationProvider.swift in Sources */,
F0FA16152D7F3E16007E2546 /* Collection+Sorting.swift in Sources */,
Expand Down Expand Up @@ -6880,7 +6880,7 @@
7A5869B72B56B41500640D27 /* IPOverrideTextViewController.swift in Sources */,
58ACF64B26553C3F00ACE4B7 /* SettingsSwitchCell.swift in Sources */,
F96D04E92EC317B9004A4D48 /* ExitLocationView.swift in Sources */,
7A09C98129D99215000C2CAC /* String+FuzzyMatch.swift in Sources */,
7A09C98129D99215000C2CAC /* String+Search.swift in Sources */,
F02F41A12B9723AF00625A4F /* AddLocationsDataSource.swift in Sources */,
58EFC76E2AFB3BDA00E9F4CB /* ListAccessMethodCoordinator.swift in Sources */,
5827B0B92B14A1C700CCBBA1 /* MethodTestingStatusCellContentConfiguration.swift in Sources */,
Expand Down
36 changes: 0 additions & 36 deletions ios/MullvadVPN/Extensions/String+FuzzyMatch.swift
View file
Open in desktop

This file was deleted.

72 changes: 72 additions & 0 deletions ios/MullvadVPN/Extensions/String+Search.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
//
// String+Search.swift
// MullvadVPN
//
// Created by Jon Petersson on 2023-04-02.
// Copyright © 2026 Mullvad VPN AB. All rights reserved.
//

import Foundation

enum SearchScore: Comparable {
case none
case score(Int)

static func < (lhs: SearchScore, rhs: SearchScore) -> Bool {
switch (lhs, rhs) {
case (.none, .none): return false
case (.none, _): return true
case (_, .none): return false
case (.score(let l), .score(let r)): return l < r
}
}
}

extension String {
func search(_ query: String) -> SearchScore {
guard !query.isEmpty else { return .none }

let text = self.lowercased()
let query = query.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()

// Substring match
if let range = text.range(of: query) {
let index = text.distance(from: text.startIndex, to: range.lowerBound)

// Starts with
if index == 0 {
return .score(1000)
}

var currentIndex = 0
let words = text.split(separator: " ")
for word in words {
if word.hasPrefix(query) {
// earlier word = higher score
return .score(800 - currentIndex)
}
currentIndex += word.count + 1
}

// Contains match
return .score(500 - index)
} else if fuzzyMatch(text, query: query) {
return .score(300)
}
return .none
}

private func fuzzyMatch(_ text: String, query: String) -> Bool {
var tIndex = text.startIndex

for char in query {
if let found = text[tIndex...].firstIndex(of: char) {
tIndex = text.index(after: found)
} else {
return false
}
}

return true
}
}
Loading
Loading