swiftbar/SwiftBar
1
1
Fork 0
mirror of https://github.com/swiftbar/SwiftBar.git synced 2024-09-17 19:27:32 +03:00
Code Issues Projects Releases Wiki Activity

Add percent encoding to local URLs #261

Browse Source
This commit is contained in:
Alex Mazanov 2022-04-16 14:10:58 -04:00
parent e84e498c41
commit b4ef58244b
No known key found for this signature in database
GPG Key ID: FD35C3C7C1D34AB4
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SwiftBar/MenuBar/MenuBarItem.swift
View File

@ -683,7 +683,7 @@ extension MenubarItem {
}
}
if let href = params.href, case let url = URL(string: href) ?? URL(fileURLWithPath: href), url.absoluteString != "." {
if let url = params.href?.getURL(), url.absoluteString != "." {
if params.webView {
showWebPopover(url: url, widht: params.webViewWidth, height: params.webViewHeight)
} else {

16
SwiftBar/Utility/String+Escaped.swift
View File

@ -6,3 +6,19 @@ extension String {
return "'\(self)'"
}
}
extension String {
func getURL() -> URL? {
if let url = URL(string: self) {
return url
}
var characterSet = CharacterSet.urlHostAllowed
characterSet.formUnion(.urlPathAllowed)
if let str = addingPercentEncoding(withAllowedCharacters: characterSet) {
return URL(string: str)
}
return nil
}
}