Mirrors/mas
2
0
Fork 0
mirror of https://github.com/mas-cli/mas synced 2025-02-16 12:38:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

♻️ Extract scrapeVersionFromPage

Browse source
This commit is contained in:
Chris Araman 2021-04-21 15:29:03 -07:00
parent 03ec323652
commit 78c1541eb4
No known key found for this signature in database
GPG key ID: BB4499D9E11B61E0
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
MasKit/Controllers/MasStoreSearch.swift
View file

@ -62,8 +62,6 @@ public class MasStoreSearch: StoreSearch {
throw MASError.jsonParsing(error: error as NSError)
}
// The App Store often lists a newer version available in an app's page than in
// the search results. We attempt to scrape it here.
let group = DispatchGroup()
for index in results.results.indices {
let result = results.results[index]
@ -74,23 +72,8 @@ public class MasStoreSearch: StoreSearch {
}
group.enter()
networkManager.loadData(from: pageUrl) { result in
guard case let .success(pageData) = result else {
group.leave()
return
}
let html = String(decoding: pageData, as: UTF8.self)
let fullRange = NSRange(html.startIndex..<html.endIndex, in: html)
guard let match = MasStoreSearch.versionExpression?.firstMatch(in: html, range: fullRange),
let range = Range(match.range(at: 1), in: html),
let pageVersion = Version(tolerant: html[range])
else {
group.leave()
return
}
if pageVersion > searchVersion {
scrapeVersionFromPage(pageUrl) { pageVersion in
if let pageVersion = pageVersion, pageVersion > searchVersion {
results.results[index].version = pageVersion.description
}
@ -102,4 +85,27 @@ public class MasStoreSearch: StoreSearch {
return results
}
// The App Store often lists a newer version available in an app's page than in
// the search results. We attempt to scrape it here.
private func scrapeVersionFromPage(_ pageUrl: URL, _ completion: @escaping (Version?) -> Void) {
networkManager.loadData(from: pageUrl) { result in
guard case let .success(pageData) = result else {
completion(nil)
return
}
let html = String(decoding: pageData, as: UTF8.self)
let fullRange = NSRange(html.startIndex..<html.endIndex, in: html)
guard let match = MasStoreSearch.versionExpression?.firstMatch(in: html, range: fullRange),
let range = Range(match.range(at: 1), in: html),
let version = Version(tolerant: html[range])
else {
completion(nil)
return
}
completion(version)
}
}
}