Skip to content

fix: restore @require resources injection in ios #539

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
merged 1 commit into from
Sep 11, 2023
Merged

fix: restore @require resources injection in ios #539

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
13 changes: 9 additions & 4 deletions xcode/Safari-Extension/Functions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,8 @@ func getRequiredCode(_ filename: String, _ resources: [String], _ fileType: Stri
if resourceUrlPath.hasSuffix(fileType) {
let resourceFilename = sanitize(resourceUrlString)
let fileURL = directory.appendingPathComponent(resourceFilename)
resourceUrls.insert(fileURL)
// insert url to resolve symlink into set
resourceUrls.insert(fileURL.resolvingSymlinksInPath())
// only attempt to get resource if it does not yet exist
if FileManager.default.fileExists(atPath: fileURL.path) {continue}
// get the remote file contents
Expand All @@ -870,14 +871,18 @@ func getRequiredCode(_ filename: String, _ resources: [String], _ fileType: Stri
}
// cleanup downloaded files that are no longer required
do {
var downloadedUrls = Set<URL>()
// get all downloaded resources url
let downloadedUrls = try FileManager.default.contentsOfDirectory(at: directory, includingPropertiesForKeys: [])
let fileUrls = try FileManager.default.contentsOfDirectory(at: directory, includingPropertiesForKeys: [])
// insert url to resolve symlink into set
for url in fileUrls { downloadedUrls.insert(url.resolvingSymlinksInPath()) }
// exclude currently required resources
let abandonedUrls = Set(downloadedUrls).subtracting(resourceUrls)
// loop through abandoned urls and attempt to remove it
for abandonFlieUrl in abandonedUrls {
for abandonFileUrl in abandonedUrls {
do {
try FileManager.default.removeItem(at: abandonFlieUrl)
try FileManager.default.removeItem(at: abandonFileUrl)
logText("cleanup abandoned resource: \(unsanitize(abandonFileUrl.lastPathComponent))")
} catch {
err("failed to remove abandoned resource in getRequiredCode \(error.localizedDescription)")
}
Expand Down