Skip to content

fix: further reduces memory usage #901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ACTCD merged 1 commit into from
Jan 10, 2026
Merged

fix: further reduces memory usage #901

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions xcode/Ext-Safari/Functions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,20 @@ func isEncoded(_ str: String) -> Bool {
return false
}

// parser REs - force try b/c pattern is known to be valid regex
let re0 = try! NSRegularExpression(pattern: #"(?:(\/\/ ==UserScript==[ \t]*?\r?\n([\S\s]*?)\r?\n\/\/ ==\/UserScript==)([\S\s]*)|(\/\* ==UserStyle==[ \t]*?\r?\n([\S\s]*?)\r?\n==\/UserStyle== \*\/)([\S\s]*))"#, options: [])
// RE for meta line
let re1 = try! NSRegularExpression(pattern: #"^(?:[ \t]*(?:\/\/)?[ \t]*@)([\w-]+)[ \t]+([^\s]+[^\r\n\t\v\f]*)"#, options: [])
// this pattern checks for specific keys that won't have values
let re2 = try! NSRegularExpression(pattern: #"^(?:[ \t]*(?:\/\/)?[ \t]*@)(noframes)[ \t]*$"#, options: [])

// parser
func parse(_ content: String) -> [String: Any]? {
// returns structured data from content of file
// will fail to parse if metablock or required @name key missing
let pattern = #"(?:(\/\/ ==UserScript==[ \t]*?\r?\n([\S\s]*?)\r?\n\/\/ ==\/UserScript==)([\S\s]*)|(\/\* ==UserStyle==[ \t]*?\r?\n([\S\s]*?)\r?\n==\/UserStyle== \*\/)([\S\s]*))"#
// force try b/c pattern is known to be valid regex
let regex = try! NSRegularExpression(pattern: pattern, options: [])
let range = NSRange(location: 0, length: content.utf16.count)
// return nil/fail if metablock missing
guard let match = regex.firstMatch(in: content, options: [], range: range) else {
guard let match = re0.firstMatch(in: content, options: [], range: range) else {
logger?.debug("\(#function, privacy: .public) - Non matched content: \(content, privacy: .public)")
return nil
}
Expand Down Expand Up @@ -134,12 +138,6 @@ func parse(_ content: String) -> [String: Any]? {
var metadata = [:] as [String: [String]]
// iterate through the possible metadata keys in file
if let metas = Range(match.range(at: g2), in: content) {
let p = #"^(?:[ \t]*(?:\/\/)?[ \t]*@)([\w-]+)[ \t]+([^\s]+[^\r\n\t\v\f]*)"#
// this pattern checks for specific keys that won't have values
let p2 = #"^(?:[ \t]*(?:\/\/)?[ \t]*@)(noframes)[ \t]*$"#
// force try b/c pattern is known to be valid regex
let re = try! NSRegularExpression(pattern: p, options: [])
let re2 = try! NSRegularExpression(pattern: p2, options: [])
// split metadatas by new line
let metaArray = content[metas].split(whereSeparator: \.isNewline)
// loop through metadata lines and populate metadata dictionary
Expand All @@ -148,7 +146,7 @@ func parse(_ content: String) -> [String: Any]? {
let metaString = String(meta).trimmingCharacters(in: .whitespaces)
let range = NSRange(location: 0, length: metaString.utf16.count)
// key lines not properly prefixed & without values will be skipped
if let m = re.firstMatch(in: metaString, options: [], range: range) {
if let m = re1.firstMatch(in: metaString, options: [], range: range) {
// force unwrap key & value since matches regex above
let key = metaString[Range(m.range(at: 1), in: metaString)!]
let value = metaString[Range(m.range(at: 2), in: metaString)!]
Expand Down Expand Up @@ -1003,6 +1001,9 @@ func stringToRegex(_ stringPattern: String) -> NSRegularExpression? {
return regex
}

// RE for parse matchPattern
let re3 = try! NSRegularExpression(pattern: #"^(http:|https:|\*:)\/\/((?:\*\.)?(?:[a-z0-9-]+\.)+(?:[a-z0-9]+)|\*\.[a-z]+|\*|[a-z0-9]+)(\/[^\s]*)$"#, options: .caseInsensitive)

func match(_ url: String, _ matchPattern: String) -> Bool {
guard
let parts = jsLikeURL(url),
Expand All @@ -1028,10 +1029,8 @@ func match(_ url: String, _ matchPattern: String) -> Bool {
if (ptcl != "http:" && ptcl != "https:") {
return false
}
let partsPattern = #"^(http:|https:|\*:)\/\/((?:\*\.)?(?:[a-z0-9-]+\.)+(?:[a-z0-9]+)|\*\.[a-z]+|\*|[a-z0-9]+)(\/[^\s]*)$"#
let partsPatternReg = try! NSRegularExpression(pattern: partsPattern, options: .caseInsensitive)
let range = NSMakeRange(0, matchPattern.utf16.count)
guard let parts = partsPatternReg.firstMatch(in: matchPattern, options: [], range: range) else {
guard let parts = re3.firstMatch(in: matchPattern, options: [], range: range) else {
logger?.error("\(#function, privacy: .public) - malformed regex match pattern - \(matchPattern, privacy: .public)")
return false
}
Expand Down