FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-09 08:39:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Delete no longer needed Scanner+Extensions.

Browse Source
This commit is contained in:
Brent Simmons 2024-06-07 22:32:58 -07:00
parent 3a992d4340
commit 971f49a67e
2 changed files with 12 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Web/Sources/Web/UTS46/Scanner+Extensions.swift
View File

@ -1,54 +0,0 @@
//
// Scanner+Extensions.swift
// PunyCocoa Swift
//
// Created by Nate Weaver on 2020-04-20.
//
import Foundation
// Wrapper functions for < 10.15 compatibility
// TODO: Remove when support for < 10.15 is dropped.
extension Scanner {
func shimScanUpToCharacters(from set: CharacterSet) -> String? {
if #available(macOS 10.15, iOS 13.0, *) {
return self.scanUpToCharacters(from: set)
} else {
var str: NSString?
self.scanUpToCharacters(from: set, into: &str)
return str as String?
}
}
func shimScanCharacters(from set: CharacterSet) -> String? {
if #available(macOS 10.15, iOS 13.0, *) {
return self.scanCharacters(from: set)
} else {
var str: NSString?
self.scanCharacters(from: set, into: &str)
return str as String?
}
}
func shimScanUpToString(_ substring: String) -> String? {
if #available(macOS 10.15, iOS 13.0, *) {
return self.scanUpToString(substring)
} else {
var str: NSString?
self.scanUpTo(substring, into: &str)
return str as String?
}
}
func shimScanString(_ searchString: String) -> String? {
if #available(macOS 10.15, iOS 13.0, *) {
return self.scanString(searchString)
} else {
var str: NSString?
self.scanString(searchString, into: &str)
return str as String?
}
}
}

24
Web/Sources/Web/UTS46/String+Punycode.swift
View File

@ -23,7 +23,7 @@ public extension String {
let dotAt = CharacterSet(charactersIn: ".@") let dotAt = CharacterSet(charactersIn: ".@")
while !s.isAtEnd { while !s.isAtEnd {
if let input = s.shimScanUpToCharacters(from: dotAt) { if let input = s.scanUpToCharacters(from: dotAt) {
if !input.isValidLabel { return nil } if !input.isValidLabel { return nil }
if input.rangeOfCharacter(from: nonASCII) != nil { if input.rangeOfCharacter(from: nonASCII) != nil {
@ -37,7 +37,7 @@ public extension String {
} }
} }
if let input = s.shimScanCharacters(from: dotAt) { if let input = s.scanCharacters(from: dotAt) {
result.append(input) result.append(input)
} }
} }
@ -55,7 +55,7 @@ public extension String {
let dotAt = CharacterSet(charactersIn: ".@") let dotAt = CharacterSet(charactersIn: ".@")
while !s.isAtEnd { while !s.isAtEnd {
if let input = s.shimScanUpToCharacters(from: dotAt) { if let input = s.scanUpToCharacters(from: dotAt) {
if input.lowercased().hasPrefix("xn--") { if input.lowercased().hasPrefix("xn--") {
let start = input.index(input.startIndex, offsetBy: 4) let start = input.index(input.startIndex, offsetBy: 4)
guard let substr = input[start...].punycodeDecoded else { return nil } guard let substr = input[start...].punycodeDecoded else { return nil }
@ -66,7 +66,7 @@ public extension String {
} }
} }
if let input = s.shimScanCharacters(from: dotAt) { if let input = s.scanCharacters(from: dotAt) {
result.append(input) result.append(input)
} }
} }
@ -388,29 +388,29 @@ private extension String {
var password: String? var password: String?
var fragment: String? var fragment: String?
if let hostOrScheme = s.shimScanUpToCharacters(from: colonSlash) { if let hostOrScheme = s.scanUpToCharacters(from: colonSlash) {
let maybeDelim = s.shimScanCharacters(from: colonSlash) ?? "" let maybeDelim = s.scanCharacters(from: colonSlash) ?? ""
if maybeDelim.hasPrefix(":") { if maybeDelim.hasPrefix(":") {
delim = maybeDelim delim = maybeDelim
scheme = hostOrScheme scheme = hostOrScheme
host = s.shimScanUpToCharacters(from: slashQuestion) ?? "" host = s.scanUpToCharacters(from: slashQuestion) ?? ""
} else { } else {
path.append(hostOrScheme) path.append(hostOrScheme)
path.append(maybeDelim) path.append(maybeDelim)
} }
} else if let maybeDelim = s.shimScanString("//") { } else if let maybeDelim = s.scanString("//") {
delim = maybeDelim delim = maybeDelim
if let maybeHost = s.shimScanUpToCharacters(from: slashQuestion) { if let maybeHost = s.scanUpToCharacters(from: slashQuestion) {
host = maybeHost host = maybeHost
} }
} }
path.append(s.shimScanUpToString("#") ?? "") path.append(s.scanUpToString("#") ?? "")
if s.shimScanString("#") != nil { if s.scanString("#") != nil {
fragment = s.shimScanUpToCharacters(from: .newlines) ?? "" fragment = s.scanUpToCharacters(from: .newlines) ?? ""
} }
let usernamePasswordHostPort = host.components(separatedBy: "@") let usernamePasswordHostPort = host.components(separatedBy: "@")