Compare commits
No commits in common. "13462d2307ba9b50725913c488fa414432a11d1c" and "3055cc339fccad99ab064f2daccdb65efa8024c0" have entirely different histories.
13462d2307
...
3055cc339f
|
|
@ -1,10 +1,5 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
# 2021.1 (10)
|
|
||||||
Bugfixes:
|
|
||||||
- Fix not being able to access domains that use UTF-8 punycode
|
|
||||||
- Fix not parsing link lines which use unescaped characters in the link
|
|
||||||
|
|
||||||
# 2021.1 (8)
|
# 2021.1 (8)
|
||||||
Features/Improvements:
|
Features/Improvements:
|
||||||
- Add input response handling
|
- Add input response handling
|
||||||
|
|
|
||||||
|
|
@ -80,8 +80,11 @@ class NavigationBarView: UIView {
|
||||||
textField.resignFirstResponder()
|
textField.resignFirstResponder()
|
||||||
if let text = textField.text,
|
if let text = textField.text,
|
||||||
!text.isEmpty,
|
!text.isEmpty,
|
||||||
let url = URIFixup.getURL(text) {
|
var components = URLComponents(string: text) {
|
||||||
navigator.changeURL(url)
|
if components.scheme == nil {
|
||||||
|
components.scheme = "gemini"
|
||||||
|
}
|
||||||
|
navigator.changeURL(components.url!)
|
||||||
} else {
|
} else {
|
||||||
textField.text = navigator.displayURL
|
textField.text = navigator.displayURL
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,225 +0,0 @@
|
||||||
//
|
|
||||||
// URIFixup.swift
|
|
||||||
// Gemini
|
|
||||||
//
|
|
||||||
// Created by Shadowfacts on 8/30/21.
|
|
||||||
//
|
|
||||||
// This file is based on URIFixup & co. from the firefox-ios project, licensed under MPLv2.
|
|
||||||
// https://github.com/mozilla-mobile/firefox-ios/blob/8e796aa8ed70395f104ed83ac72c32fc2aba54ea/Client/Frontend/Browser/URIFixup.swift
|
|
||||||
|
|
||||||
import Foundation
|
|
||||||
|
|
||||||
class URIFixup {
|
|
||||||
static func getURL(_ entry: String) -> URL? {
|
|
||||||
|
|
||||||
let trimmed = entry.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
||||||
guard var escaped = trimmed.addingPercentEncoding(withAllowedCharacters: .URLAllowed) else {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
escaped = replaceBrackets(url: escaped)
|
|
||||||
|
|
||||||
// Then check if the URL includes a scheme. This will handle
|
|
||||||
// all valid requests starting with "http://", "about:", etc.
|
|
||||||
// However, we ensure that the scheme is one that is listed in
|
|
||||||
// the official URI scheme list, so that other such search phrases
|
|
||||||
// like "filetype:" are recognised as searches rather than URLs.
|
|
||||||
if let url = punycodedURL(escaped), url.schemeIsValid {
|
|
||||||
return url
|
|
||||||
}
|
|
||||||
|
|
||||||
// If there's no scheme, we're going to prepend "gemini://". First,
|
|
||||||
// make sure there's at least one "." in the host. This means
|
|
||||||
// we'll allow single-word searches (e.g., "foo") at the expense
|
|
||||||
// of breaking single-word hosts without a scheme (e.g., "localhost").
|
|
||||||
if trimmed.range(of: ".") == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
if trimmed.range(of: " ") != nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// If there is a ".", prepend "gemini://" and try again. Since this
|
|
||||||
// is strictly an "gemini://" URL, we also require a host.
|
|
||||||
if let url = punycodedURL("gemini://\(escaped)"), url.host != nil {
|
|
||||||
return url
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
static func punycodedURL(_ string: String) -> URL? {
|
|
||||||
var string = string
|
|
||||||
if string.filter({ $0 == "#" }).count > 1 {
|
|
||||||
string = replaceHashMarks(url: string)
|
|
||||||
}
|
|
||||||
|
|
||||||
guard let url = URL(string: string) else { return nil }
|
|
||||||
|
|
||||||
var components = URLComponents(url: url, resolvingAgainstBaseURL: false)
|
|
||||||
let host = components?.host?.utf8HostToAscii()
|
|
||||||
components?.host = host
|
|
||||||
return components?.url
|
|
||||||
}
|
|
||||||
|
|
||||||
static func replaceBrackets(url: String) -> String {
|
|
||||||
return url.replacingOccurrences(of: "[", with: "%5B").replacingOccurrences(of: "]", with: "%5D")
|
|
||||||
}
|
|
||||||
|
|
||||||
static func replaceHashMarks(url: String) -> String {
|
|
||||||
guard let firstIndex = url.firstIndex(of: "#") else { return String() }
|
|
||||||
let start = url.index(firstIndex, offsetBy: 1)
|
|
||||||
return url.replacingOccurrences(of: "#", with: "%23", range: start..<url.endIndex)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private extension CharacterSet {
|
|
||||||
static let URLAllowed = CharacterSet(charactersIn: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&'()*+,;=%")
|
|
||||||
}
|
|
||||||
|
|
||||||
// The list of permanent URI schemes has been taken from http://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
|
|
||||||
private let permanentURISchemes = ["aaa", "aaas", "about", "acap", "acct", "cap", "cid", "coap", "coaps", "crid", "data", "dav", "dict", "dns", "example", "file", "ftp", "geo", "go", "gopher", "h323", "http", "https", "iax", "icap", "im", "imap", "info", "ipp", "ipps", "iris", "iris.beep", "iris.lwz", "iris.xpc", "iris.xpcs", "jabber", "javascript", "ldap", "mailto", "mid", "msrp", "msrps", "mtqp", "mupdate", "news", "nfs", "ni", "nih", "nntp", "opaquelocktoken", "pkcs11", "pop", "pres", "reload", "rtsp", "rtsps", "rtspu", "service", "session", "shttp", "sieve", "sip", "sips", "sms", "snmp", "soap.beep", "soap.beeps", "stun", "stuns", "tag", "tel", "telnet", "tftp", "thismessage", "tip", "tn3270", "turn", "turns", "tv", "urn", "vemmi", "vnc", "ws", "wss", "xcon", "xcon-userid", "xmlrpc.beep", "xmlrpc.beeps", "xmpp", "z39.50r", "z39.50s"]
|
|
||||||
|
|
||||||
private extension URL {
|
|
||||||
var schemeIsValid: Bool {
|
|
||||||
guard let scheme = scheme else { return false }
|
|
||||||
let lowercasedScheme = scheme.lowercased()
|
|
||||||
// we care about gemini, unlike firefox
|
|
||||||
let schemeMatches = lowercasedScheme == "gemini" || permanentURISchemes.contains(lowercasedScheme)
|
|
||||||
return schemeMatches && self.absoluteURL.absoluteString.lowercased() != scheme + ":"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private let base = 36
|
|
||||||
private let tMin = 1
|
|
||||||
private let tMax = 26
|
|
||||||
private let initialBias = 72
|
|
||||||
private let initialN: Int = 128 // 0x80
|
|
||||||
private let delimiter: Character = "-"; // '\x2D'
|
|
||||||
private let prefixPunycode = "xn--"
|
|
||||||
private let asciiPunycode = Array("abcdefghijklmnopqrstuvwxyz0123456789")
|
|
||||||
|
|
||||||
private extension String {
|
|
||||||
func toValue(_ index: Int) -> Character {
|
|
||||||
return asciiPunycode[index]
|
|
||||||
}
|
|
||||||
|
|
||||||
func adapt(_ delta: Int, numPoints: Int, firstTime: Bool) -> Int {
|
|
||||||
let skew = 38
|
|
||||||
let damp = firstTime ? 700 : 2
|
|
||||||
var delta = delta
|
|
||||||
delta = delta / damp
|
|
||||||
delta += delta / numPoints
|
|
||||||
var k = 0
|
|
||||||
while delta > ((base - tMin) * tMax) / 2 {
|
|
||||||
delta /= (base - tMin)
|
|
||||||
k += base
|
|
||||||
}
|
|
||||||
return k + ((base - tMin + 1) * delta) / (delta + skew)
|
|
||||||
}
|
|
||||||
|
|
||||||
func encode(_ input: String) -> String {
|
|
||||||
var output = ""
|
|
||||||
var d: Int = 0
|
|
||||||
var extendedChars = [Int]()
|
|
||||||
for c in input.unicodeScalars {
|
|
||||||
if Int(c.value) < initialN {
|
|
||||||
d += 1
|
|
||||||
output.append(String(c))
|
|
||||||
} else {
|
|
||||||
extendedChars.append(Int(c.value))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if extendedChars.count == 0 {
|
|
||||||
return output
|
|
||||||
}
|
|
||||||
if d > 0 {
|
|
||||||
output.append(delimiter)
|
|
||||||
}
|
|
||||||
|
|
||||||
var n = initialN
|
|
||||||
var delta = 0
|
|
||||||
var bias = initialBias
|
|
||||||
var h: Int = 0
|
|
||||||
var b: Int = 0
|
|
||||||
|
|
||||||
if d > 0 {
|
|
||||||
h = output.unicodeScalars.count - 1
|
|
||||||
b = output.unicodeScalars.count - 1
|
|
||||||
} else {
|
|
||||||
h = output.unicodeScalars.count
|
|
||||||
b = output.unicodeScalars.count
|
|
||||||
}
|
|
||||||
|
|
||||||
while h < input.unicodeScalars.count {
|
|
||||||
var char = Int(0x7fffffff)
|
|
||||||
for c in input.unicodeScalars {
|
|
||||||
let ci = Int(c.value)
|
|
||||||
if char > ci && ci >= n {
|
|
||||||
char = ci
|
|
||||||
}
|
|
||||||
}
|
|
||||||
delta = delta + (char - n) * (h + 1)
|
|
||||||
if delta < 0 {
|
|
||||||
print("error: invalid char:")
|
|
||||||
output = ""
|
|
||||||
return output
|
|
||||||
}
|
|
||||||
n = char
|
|
||||||
for c in input.unicodeScalars {
|
|
||||||
let ci = Int(c.value)
|
|
||||||
if ci < n || ci < initialN {
|
|
||||||
delta += 1
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if ci > n {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
var q = delta
|
|
||||||
var k = base
|
|
||||||
while true {
|
|
||||||
let t = max(min(k - bias, tMax), tMin)
|
|
||||||
if q < t {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
let code = t + ((q - t) % (base - t))
|
|
||||||
output.append(toValue(code))
|
|
||||||
q = (q - t) / (base - t)
|
|
||||||
k += base
|
|
||||||
}
|
|
||||||
output.append(toValue(q))
|
|
||||||
bias = self.adapt(delta, numPoints: h + 1, firstTime: h == b)
|
|
||||||
delta = 0
|
|
||||||
h += 1
|
|
||||||
}
|
|
||||||
delta += 1
|
|
||||||
n += 1
|
|
||||||
}
|
|
||||||
return output
|
|
||||||
}
|
|
||||||
|
|
||||||
func isValidUnicodeScala(_ s: String) -> Bool {
|
|
||||||
for c in s.unicodeScalars {
|
|
||||||
let ci = Int(c.value)
|
|
||||||
if ci >= initialN {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
func utf8HostToAscii() -> String {
|
|
||||||
if isValidUnicodeScala(self) {
|
|
||||||
return self
|
|
||||||
}
|
|
||||||
var labels = self.components(separatedBy: ".")
|
|
||||||
for (i, part) in labels.enumerated() {
|
|
||||||
if !isValidUnicodeScala(part) {
|
|
||||||
let a = encode(part)
|
|
||||||
labels[i] = prefixPunycode + a
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let resultString = labels.joined(separator: ".")
|
|
||||||
return resultString
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -36,7 +36,6 @@
|
||||||
D62664EE24BC0BCE00DF9B88 /* MaybeLazyVStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62664ED24BC0BCE00DF9B88 /* MaybeLazyVStack.swift */; };
|
D62664EE24BC0BCE00DF9B88 /* MaybeLazyVStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62664ED24BC0BCE00DF9B88 /* MaybeLazyVStack.swift */; };
|
||||||
D62664F024BC0D7700DF9B88 /* GeminiFormat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D62664A824BBF26A00DF9B88 /* GeminiFormat.framework */; };
|
D62664F024BC0D7700DF9B88 /* GeminiFormat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D62664A824BBF26A00DF9B88 /* GeminiFormat.framework */; };
|
||||||
D62664FA24BC12BC00DF9B88 /* DocumentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62664F924BC12BC00DF9B88 /* DocumentTests.swift */; };
|
D62664FA24BC12BC00DF9B88 /* DocumentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62664F924BC12BC00DF9B88 /* DocumentTests.swift */; };
|
||||||
D6376A7026DDAF65005AD89C /* URIFixup.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6376A6F26DDAF65005AD89C /* URIFixup.swift */; };
|
|
||||||
D653F40B267996FF004E32B1 /* ActivityItemSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D653F40A267996FF004E32B1 /* ActivityItemSource.swift */; };
|
D653F40B267996FF004E32B1 /* ActivityItemSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D653F40A267996FF004E32B1 /* ActivityItemSource.swift */; };
|
||||||
D653F40D26799F2F004E32B1 /* HomepagePrefView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D653F40C26799F2F004E32B1 /* HomepagePrefView.swift */; };
|
D653F40D26799F2F004E32B1 /* HomepagePrefView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D653F40C26799F2F004E32B1 /* HomepagePrefView.swift */; };
|
||||||
D653F40F2679A0AB004E32B1 /* SetHomepageActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D653F40E2679A0AB004E32B1 /* SetHomepageActivity.swift */; };
|
D653F40F2679A0AB004E32B1 /* SetHomepageActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D653F40E2679A0AB004E32B1 /* SetHomepageActivity.swift */; };
|
||||||
|
|
@ -307,7 +306,6 @@
|
||||||
D62664EB24BC0B4D00DF9B88 /* DocumentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentView.swift; sourceTree = "<group>"; };
|
D62664EB24BC0B4D00DF9B88 /* DocumentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentView.swift; sourceTree = "<group>"; };
|
||||||
D62664ED24BC0BCE00DF9B88 /* MaybeLazyVStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MaybeLazyVStack.swift; sourceTree = "<group>"; };
|
D62664ED24BC0BCE00DF9B88 /* MaybeLazyVStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MaybeLazyVStack.swift; sourceTree = "<group>"; };
|
||||||
D62664F924BC12BC00DF9B88 /* DocumentTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentTests.swift; sourceTree = "<group>"; };
|
D62664F924BC12BC00DF9B88 /* DocumentTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentTests.swift; sourceTree = "<group>"; };
|
||||||
D6376A6F26DDAF65005AD89C /* URIFixup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URIFixup.swift; sourceTree = "<group>"; };
|
|
||||||
D653F40A267996FF004E32B1 /* ActivityItemSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityItemSource.swift; sourceTree = "<group>"; };
|
D653F40A267996FF004E32B1 /* ActivityItemSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityItemSource.swift; sourceTree = "<group>"; };
|
||||||
D653F40C26799F2F004E32B1 /* HomepagePrefView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomepagePrefView.swift; sourceTree = "<group>"; };
|
D653F40C26799F2F004E32B1 /* HomepagePrefView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomepagePrefView.swift; sourceTree = "<group>"; };
|
||||||
D653F40E2679A0AB004E32B1 /* SetHomepageActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetHomepageActivity.swift; sourceTree = "<group>"; };
|
D653F40E2679A0AB004E32B1 /* SetHomepageActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetHomepageActivity.swift; sourceTree = "<group>"; };
|
||||||
|
|
@ -578,14 +576,6 @@
|
||||||
name = Frameworks;
|
name = Frameworks;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
D6376A6E26DDAF57005AD89C /* Vendor */ = {
|
|
||||||
isa = PBXGroup;
|
|
||||||
children = (
|
|
||||||
D6376A6F26DDAF65005AD89C /* URIFixup.swift */,
|
|
||||||
);
|
|
||||||
path = Vendor;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
D688F618258AD231003A0A73 /* Resources */ = {
|
D688F618258AD231003A0A73 /* Resources */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
|
|
@ -613,7 +603,6 @@
|
||||||
D653F40A267996FF004E32B1 /* ActivityItemSource.swift */,
|
D653F40A267996FF004E32B1 /* ActivityItemSource.swift */,
|
||||||
D653F40E2679A0AB004E32B1 /* SetHomepageActivity.swift */,
|
D653F40E2679A0AB004E32B1 /* SetHomepageActivity.swift */,
|
||||||
D688F618258AD231003A0A73 /* Resources */,
|
D688F618258AD231003A0A73 /* Resources */,
|
||||||
D6376A6E26DDAF57005AD89C /* Vendor */,
|
|
||||||
D6E152AA24BFFDF600FDF9D3 /* Assets.xcassets */,
|
D6E152AA24BFFDF600FDF9D3 /* Assets.xcassets */,
|
||||||
D6E152AF24BFFDF600FDF9D3 /* LaunchScreen.storyboard */,
|
D6E152AF24BFFDF600FDF9D3 /* LaunchScreen.storyboard */,
|
||||||
D6E152B224BFFDF600FDF9D3 /* Info.plist */,
|
D6E152B224BFFDF600FDF9D3 /* Info.plist */,
|
||||||
|
|
@ -1131,7 +1120,6 @@
|
||||||
D688F633258B09BB003A0A73 /* TrackpadScrollGestureRecognizer.swift in Sources */,
|
D688F633258B09BB003A0A73 /* TrackpadScrollGestureRecognizer.swift in Sources */,
|
||||||
D6E152A524BFFDF500FDF9D3 /* AppDelegate.swift in Sources */,
|
D6E152A524BFFDF500FDF9D3 /* AppDelegate.swift in Sources */,
|
||||||
D6E152A724BFFDF500FDF9D3 /* SceneDelegate.swift in Sources */,
|
D6E152A724BFFDF500FDF9D3 /* SceneDelegate.swift in Sources */,
|
||||||
D6376A7026DDAF65005AD89C /* URIFixup.swift in Sources */,
|
|
||||||
D653F40B267996FF004E32B1 /* ActivityItemSource.swift in Sources */,
|
D653F40B267996FF004E32B1 /* ActivityItemSource.swift in Sources */,
|
||||||
D6BC9AB3258E8E13008652BC /* ToolbarView.swift in Sources */,
|
D6BC9AB3258E8E13008652BC /* ToolbarView.swift in Sources */,
|
||||||
D688F64A258C17F3003A0A73 /* SymbolCache.swift in Sources */,
|
D688F64A258C17F3003A0A73 /* SymbolCache.swift in Sources */,
|
||||||
|
|
@ -1768,7 +1756,7 @@
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 10;
|
CURRENT_PROJECT_VERSION = 8;
|
||||||
DEVELOPMENT_ASSET_PATHS = "\"Gemini-iOS/Preview Content\"";
|
DEVELOPMENT_ASSET_PATHS = "\"Gemini-iOS/Preview Content\"";
|
||||||
DEVELOPMENT_TEAM = V4WK9KR9U2;
|
DEVELOPMENT_TEAM = V4WK9KR9U2;
|
||||||
ENABLE_PREVIEWS = YES;
|
ENABLE_PREVIEWS = YES;
|
||||||
|
|
@ -1794,7 +1782,7 @@
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 10;
|
CURRENT_PROJECT_VERSION = 8;
|
||||||
DEVELOPMENT_ASSET_PATHS = "\"Gemini-iOS/Preview Content\"";
|
DEVELOPMENT_ASSET_PATHS = "\"Gemini-iOS/Preview Content\"";
|
||||||
DEVELOPMENT_TEAM = V4WK9KR9U2;
|
DEVELOPMENT_TEAM = V4WK9KR9U2;
|
||||||
ENABLE_PREVIEWS = YES;
|
ENABLE_PREVIEWS = YES;
|
||||||
|
|
|
||||||
|
|
@ -54,11 +54,6 @@ public struct GeminiParser {
|
||||||
|
|
||||||
if let url = URL(string: urlString, relativeTo: baseURL)?.absoluteURL {
|
if let url = URL(string: urlString, relativeTo: baseURL)?.absoluteURL {
|
||||||
doc.lines.append(.link(url, text: text))
|
doc.lines.append(.link(url, text: text))
|
||||||
} else if let escaped = urlString.addingPercentEncoding(withAllowedCharacters: .URLAllowed),
|
|
||||||
let url = URL(string: escaped, relativeTo: baseURL)?.absoluteURL {
|
|
||||||
// if URL initialization fails because there are unescaped chars in the doc, escape everything and try again.
|
|
||||||
// I'm not certain, but it feels unsafe to always do this escaping
|
|
||||||
doc.lines.append(.link(url, text: text))
|
|
||||||
} else {
|
} else {
|
||||||
let str: String
|
let str: String
|
||||||
if let text = text {
|
if let text = text {
|
||||||
|
|
@ -118,7 +113,3 @@ fileprivate extension String {
|
||||||
return index
|
return index
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private extension CharacterSet {
|
|
||||||
static let URLAllowed = CharacterSet(charactersIn: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&'()*+,;=%")
|
|
||||||
}
|
|
||||||
|
|
|
||||||
165
LICENSE
165
LICENSE
|
|
@ -1,165 +0,0 @@
|
||||||
GNU LESSER GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
|
|
||||||
This version of the GNU Lesser General Public License incorporates
|
|
||||||
the terms and conditions of version 3 of the GNU General Public
|
|
||||||
License, supplemented by the additional permissions listed below.
|
|
||||||
|
|
||||||
0. Additional Definitions.
|
|
||||||
|
|
||||||
As used herein, "this License" refers to version 3 of the GNU Lesser
|
|
||||||
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
|
||||||
General Public License.
|
|
||||||
|
|
||||||
"The Library" refers to a covered work governed by this License,
|
|
||||||
other than an Application or a Combined Work as defined below.
|
|
||||||
|
|
||||||
An "Application" is any work that makes use of an interface provided
|
|
||||||
by the Library, but which is not otherwise based on the Library.
|
|
||||||
Defining a subclass of a class defined by the Library is deemed a mode
|
|
||||||
of using an interface provided by the Library.
|
|
||||||
|
|
||||||
A "Combined Work" is a work produced by combining or linking an
|
|
||||||
Application with the Library. The particular version of the Library
|
|
||||||
with which the Combined Work was made is also called the "Linked
|
|
||||||
Version".
|
|
||||||
|
|
||||||
The "Minimal Corresponding Source" for a Combined Work means the
|
|
||||||
Corresponding Source for the Combined Work, excluding any source code
|
|
||||||
for portions of the Combined Work that, considered in isolation, are
|
|
||||||
based on the Application, and not on the Linked Version.
|
|
||||||
|
|
||||||
The "Corresponding Application Code" for a Combined Work means the
|
|
||||||
object code and/or source code for the Application, including any data
|
|
||||||
and utility programs needed for reproducing the Combined Work from the
|
|
||||||
Application, but excluding the System Libraries of the Combined Work.
|
|
||||||
|
|
||||||
1. Exception to Section 3 of the GNU GPL.
|
|
||||||
|
|
||||||
You may convey a covered work under sections 3 and 4 of this License
|
|
||||||
without being bound by section 3 of the GNU GPL.
|
|
||||||
|
|
||||||
2. Conveying Modified Versions.
|
|
||||||
|
|
||||||
If you modify a copy of the Library, and, in your modifications, a
|
|
||||||
facility refers to a function or data to be supplied by an Application
|
|
||||||
that uses the facility (other than as an argument passed when the
|
|
||||||
facility is invoked), then you may convey a copy of the modified
|
|
||||||
version:
|
|
||||||
|
|
||||||
a) under this License, provided that you make a good faith effort to
|
|
||||||
ensure that, in the event an Application does not supply the
|
|
||||||
function or data, the facility still operates, and performs
|
|
||||||
whatever part of its purpose remains meaningful, or
|
|
||||||
|
|
||||||
b) under the GNU GPL, with none of the additional permissions of
|
|
||||||
this License applicable to that copy.
|
|
||||||
|
|
||||||
3. Object Code Incorporating Material from Library Header Files.
|
|
||||||
|
|
||||||
The object code form of an Application may incorporate material from
|
|
||||||
a header file that is part of the Library. You may convey such object
|
|
||||||
code under terms of your choice, provided that, if the incorporated
|
|
||||||
material is not limited to numerical parameters, data structure
|
|
||||||
layouts and accessors, or small macros, inline functions and templates
|
|
||||||
(ten or fewer lines in length), you do both of the following:
|
|
||||||
|
|
||||||
a) Give prominent notice with each copy of the object code that the
|
|
||||||
Library is used in it and that the Library and its use are
|
|
||||||
covered by this License.
|
|
||||||
|
|
||||||
b) Accompany the object code with a copy of the GNU GPL and this license
|
|
||||||
document.
|
|
||||||
|
|
||||||
4. Combined Works.
|
|
||||||
|
|
||||||
You may convey a Combined Work under terms of your choice that,
|
|
||||||
taken together, effectively do not restrict modification of the
|
|
||||||
portions of the Library contained in the Combined Work and reverse
|
|
||||||
engineering for debugging such modifications, if you also do each of
|
|
||||||
the following:
|
|
||||||
|
|
||||||
a) Give prominent notice with each copy of the Combined Work that
|
|
||||||
the Library is used in it and that the Library and its use are
|
|
||||||
covered by this License.
|
|
||||||
|
|
||||||
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
|
||||||
document.
|
|
||||||
|
|
||||||
c) For a Combined Work that displays copyright notices during
|
|
||||||
execution, include the copyright notice for the Library among
|
|
||||||
these notices, as well as a reference directing the user to the
|
|
||||||
copies of the GNU GPL and this license document.
|
|
||||||
|
|
||||||
d) Do one of the following:
|
|
||||||
|
|
||||||
0) Convey the Minimal Corresponding Source under the terms of this
|
|
||||||
License, and the Corresponding Application Code in a form
|
|
||||||
suitable for, and under terms that permit, the user to
|
|
||||||
recombine or relink the Application with a modified version of
|
|
||||||
the Linked Version to produce a modified Combined Work, in the
|
|
||||||
manner specified by section 6 of the GNU GPL for conveying
|
|
||||||
Corresponding Source.
|
|
||||||
|
|
||||||
1) Use a suitable shared library mechanism for linking with the
|
|
||||||
Library. A suitable mechanism is one that (a) uses at run time
|
|
||||||
a copy of the Library already present on the user's computer
|
|
||||||
system, and (b) will operate properly with a modified version
|
|
||||||
of the Library that is interface-compatible with the Linked
|
|
||||||
Version.
|
|
||||||
|
|
||||||
e) Provide Installation Information, but only if you would otherwise
|
|
||||||
be required to provide such information under section 6 of the
|
|
||||||
GNU GPL, and only to the extent that such information is
|
|
||||||
necessary to install and execute a modified version of the
|
|
||||||
Combined Work produced by recombining or relinking the
|
|
||||||
Application with a modified version of the Linked Version. (If
|
|
||||||
you use option 4d0, the Installation Information must accompany
|
|
||||||
the Minimal Corresponding Source and Corresponding Application
|
|
||||||
Code. If you use option 4d1, you must provide the Installation
|
|
||||||
Information in the manner specified by section 6 of the GNU GPL
|
|
||||||
for conveying Corresponding Source.)
|
|
||||||
|
|
||||||
5. Combined Libraries.
|
|
||||||
|
|
||||||
You may place library facilities that are a work based on the
|
|
||||||
Library side by side in a single library together with other library
|
|
||||||
facilities that are not Applications and are not covered by this
|
|
||||||
License, and convey such a combined library under terms of your
|
|
||||||
choice, if you do both of the following:
|
|
||||||
|
|
||||||
a) Accompany the combined library with a copy of the same work based
|
|
||||||
on the Library, uncombined with any other library facilities,
|
|
||||||
conveyed under the terms of this License.
|
|
||||||
|
|
||||||
b) Give prominent notice with the combined library that part of it
|
|
||||||
is a work based on the Library, and explaining where to find the
|
|
||||||
accompanying uncombined form of the same work.
|
|
||||||
|
|
||||||
6. Revised Versions of the GNU Lesser General Public License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions
|
|
||||||
of the GNU Lesser General Public License from time to time. Such new
|
|
||||||
versions will be similar in spirit to the present version, but may
|
|
||||||
differ in detail to address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Library as you received it specifies that a certain numbered version
|
|
||||||
of the GNU Lesser General Public License "or any later version"
|
|
||||||
applies to it, you have the option of following the terms and
|
|
||||||
conditions either of that published version or of any later version
|
|
||||||
published by the Free Software Foundation. If the Library as you
|
|
||||||
received it does not specify a version number of the GNU Lesser
|
|
||||||
General Public License, you may choose any version of the GNU Lesser
|
|
||||||
General Public License ever published by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Library as you received it specifies that a proxy can decide
|
|
||||||
whether future versions of the GNU Lesser General Public License shall
|
|
||||||
apply, that proxy's public statement of acceptance of any version is
|
|
||||||
permanent authorization for you to choose that version for the
|
|
||||||
Library.
|
|
||||||
Loading…
Reference in New Issue