renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4511 from stuartbreckenridge/fix/4509

Browse Source 
🩹 Fixes memory leaks caused by NSString usage
This commit is contained in:
Brent Simmons
2025-02-02 10:18:28 -08:00
committed by GitHub
parent 05c27b188c f7b6fbc9e5
commit 40ac9c70e8
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Shared/ArticleRendering/ArticleRenderer.swift
View File

@@ -31,7 +31,7 @@ struct ArticleRenderer {
init(name: String) {
url = Bundle.main.url(forResource: name, withExtension: "html")!
baseURL = url.deletingLastPathComponent()
html = try! NSString(contentsOfFile: url.path, encoding: String.Encoding.utf8.rawValue) as String
html = try! String(contentsOfFile: url.path, encoding: .utf8)
}
}
@@ -185,13 +185,13 @@ private extension ArticleRenderer {
static var defaultStyleSheet: String = {
let path = Bundle.main.path(forResource: "styleSheet", ofType: "css")!
let s = try! NSString(contentsOfFile: path, encoding: String.Encoding.utf8.rawValue)
let s = try! String(contentsOfFile: path, encoding: .utf8)
return "\n\(s)\n"
}()
static let defaultTemplate: String = {
let path = Bundle.main.path(forResource: "template", ofType: "html")!
let s = try! NSString(contentsOfFile: path, encoding: String.Encoding.utf8.rawValue)
let s = try! String(contentsOfFile: path, encoding: .utf8)
return s as String
}()

3
Shared/ArticleStyles/ArticleTheme.swift
View File

@@ -86,7 +86,8 @@ struct ArticleTheme: Equatable {
return nil
}
if let s = try? NSString(contentsOfFile: f, usedEncoding: nil) as String {
var encoding = String.Encoding.utf8
if let s = try? String(contentsOfFile: f, usedEncoding: &encoding) {
return s
}
return nil