Update to latest RSCore
This commit is contained in:
parent
685e569387
commit
e94985e7f2
|
@ -389,7 +389,7 @@ private struct AccountSpecifier {
|
|||
|
||||
|
||||
init?(folderPath: String) {
|
||||
if !FileManager.default.rs_fileIsFolder(folderPath) {
|
||||
if !FileManager.default.isFolder(atPath: folderPath) {
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ struct ArticleStyle: Equatable {
|
|||
|
||||
self.path = path
|
||||
|
||||
let isFolder = FileManager.default.rs_fileIsFolder(path)
|
||||
let isFolder = FileManager.default.isFolder(atPath: path)
|
||||
|
||||
if isFolder {
|
||||
|
||||
|
|
|
@ -133,8 +133,8 @@ final class ArticleStylesManager {
|
|||
|
||||
private func allStylePaths(_ folder: String) -> [String] {
|
||||
|
||||
let filepaths = FileManager.default.rs_filepaths(inFolder: folder)
|
||||
return filepaths.filter { fileAtPathIsStyle($0) }
|
||||
let filepaths = FileManager.default.filePaths(inFolder: folder)
|
||||
return filepaths?.filter { fileAtPathIsStyle($0) } ?? []
|
||||
}
|
||||
|
||||
private func fileAtPathIsStyle(_ f: String) -> Bool {
|
||||
|
@ -174,7 +174,6 @@ private func pathIsPathForStyleName(_ styleName: String, path: String) -> Bool {
|
|||
}
|
||||
|
||||
private func pathForStyleName(_ styleName: String, folder: String) -> String? {
|
||||
|
||||
for onePath in allStylePaths(folder) {
|
||||
if pathIsPathForStyleName(styleName, path: onePath) {
|
||||
return onePath
|
||||
|
|
|
@ -100,7 +100,7 @@ struct ArticleStringFormatter {
|
|||
}
|
||||
|
||||
static func dateString(_ date: Date) -> String {
|
||||
if NSCalendar.rs_dateIsToday(date) {
|
||||
if Calendar.dateIsToday(date) {
|
||||
return timeFormatter.string(from: date)
|
||||
}
|
||||
return dateFormatter.string(from: date)
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 806d1fdc16511a9469bf2a18348caf9f20ff8cdc
|
||||
Subproject commit 070f40e9b39ac428d09eafeb8b47ce8dde78ced8
|
Loading…
Reference in New Issue