@@ -15,52 +15,50 @@ class AllLocationDataSource: LocationDataSourceProtocol {
1515 private var locationList = [ RelayLocation] ( )
1616
1717 func search( by text: String ) -> [ RelayLocation ] {
18- if text. isEmpty {
18+ guard ! text. isEmpty else {
1919 return locationList
20- } else {
21- var filteredLocations : [ RelayLocation ] = [ ]
22- locationList. forEach { location in
23- guard let countryNode = nodeByLocation [ location] else { return }
24- countryNode. showsChildren = false
25-
26- if text. isEmpty || countryNode. displayName. fuzzyMatch ( text) {
27- filteredLocations. append ( countryNode. location)
28- }
20+ }
21+
22+ var filteredLocations : [ RelayLocation ] = [ ]
23+ locationList. forEach { location in
24+ guard let countryNode = nodeByLocation [ location] else { return }
25+ countryNode. showsChildren = false
26+
27+ if countryNode. displayName. fuzzyMatch ( text) {
28+ filteredLocations. append ( countryNode. location)
29+ }
2930
30- for cityNode in countryNode. children {
31- cityNode. showsChildren = false
31+ for cityNode in countryNode. children {
32+ cityNode. showsChildren = false
3233
33- let relaysContainSearchString = cityNode. children
34- . contains ( where: { $0. displayName. fuzzyMatch ( text) } )
34+ let relaysContainSearchString = cityNode. children
35+ . contains ( where: { $0. displayName. fuzzyMatch ( text) } )
3536
36- if cityNode. displayName. fuzzyMatch ( text) || relaysContainSearchString {
37- if !filteredLocations. contains ( where : { $0 == countryNode. location } ) {
38- filteredLocations. append ( countryNode. location)
39- }
37+ if cityNode. displayName. fuzzyMatch ( text) || relaysContainSearchString {
38+ if !filteredLocations. contains ( countryNode. location) {
39+ filteredLocations. append ( countryNode. location)
40+ }
4041
41- filteredLocations. append ( cityNode. location)
42- countryNode. showsChildren = true
42+ filteredLocations. append ( cityNode. location)
43+ countryNode. showsChildren = true
4344
44- if relaysContainSearchString {
45- cityNode. children. map { $0. location } . forEach {
46- filteredLocations. append ( $0)
47- }
48- cityNode. showsChildren = true
49- }
45+ if relaysContainSearchString {
46+ filteredLocations. append ( contentsOf: cityNode. children. map { $0. location } )
47+ cityNode. showsChildren = true
5048 }
5149 }
5250 }
53-
54- return filteredLocations
5551 }
52+
53+ return filteredLocations
5654 }
5755
5856 func reload(
59- _ response: MullvadREST . REST . ServerRelaysResponse ,
60- relays: [ MullvadREST . REST . ServerRelay ]
57+ _ response: REST . ServerRelaysResponse ,
58+ relays: [ REST . ServerRelay ]
6159 ) -> [ RelayLocation ] {
6260 nodeByLocation. removeAll ( )
63- let rootNode = self . makeRootNode ( name: SelectLocationGroup . allLocations. description)
61+ let rootNode = self . makeRootNode ( name: SelectLocationSection . allLocations. description)
6462
6563 for relay in relays {
6664 guard case let . city( countryCode, cityCode) = RelayLocation ( dashSeparatedString: relay. location) ,
0 commit comments