From 7a8155f58f4cd4080f8f74bbb344535544aa2298 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 1 Dec 2019 17:16:52 -0600 Subject: [PATCH] Add suspend and resume to managed files --- Frameworks/Account/Account.swift | 9 +++++++++ Frameworks/Account/AccountMetadataFile.swift | 8 ++++++++ Frameworks/Account/OPMLFile.swift | 8 ++++++++ Frameworks/Account/WebFeedMetadataFile.swift | 8 ++++++++ submodules/RSCore | 2 +- 5 files changed, 34 insertions(+), 1 deletion(-) diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift index 8f52a0d13..bc7808a75 100644 --- a/Frameworks/Account/Account.swift +++ b/Frameworks/Account/Account.swift @@ -410,11 +410,20 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, delegate.suspend() database.suspend() save() + metadataFile.suspend() + webFeedMetadataFile.suspend() + opmlFile.suspend() } public func resume() { database.resume() delegate.resume() + metadataFile.resume() + webFeedMetadataFile.resume() + opmlFile.resume() + metadataFile.load() + webFeedMetadataFile.load() + opmlFile.load() } public func save() { diff --git a/Frameworks/Account/AccountMetadataFile.swift b/Frameworks/Account/AccountMetadataFile.swift index 0c78f09da..0ec91eee8 100644 --- a/Frameworks/Account/AccountMetadataFile.swift +++ b/Frameworks/Account/AccountMetadataFile.swift @@ -35,6 +35,14 @@ final class AccountMetadataFile { managedFile.saveIfNecessary() } + func suspend() { + managedFile.suspend() + } + + func resume() { + managedFile.resume() + } + } private extension AccountMetadataFile { diff --git a/Frameworks/Account/OPMLFile.swift b/Frameworks/Account/OPMLFile.swift index ef4b85e03..799e138d4 100644 --- a/Frameworks/Account/OPMLFile.swift +++ b/Frameworks/Account/OPMLFile.swift @@ -36,6 +36,14 @@ final class OPMLFile { managedFile.saveIfNecessary() } + func suspend() { + managedFile.suspend() + } + + func resume() { + managedFile.resume() + } + } private extension OPMLFile { diff --git a/Frameworks/Account/WebFeedMetadataFile.swift b/Frameworks/Account/WebFeedMetadataFile.swift index 3dfe594a3..e47c54582 100644 --- a/Frameworks/Account/WebFeedMetadataFile.swift +++ b/Frameworks/Account/WebFeedMetadataFile.swift @@ -35,6 +35,14 @@ final class WebFeedMetadataFile { managedFile.saveIfNecessary() } + func suspend() { + managedFile.suspend() + } + + func resume() { + managedFile.resume() + } + } private extension WebFeedMetadataFile { diff --git a/submodules/RSCore b/submodules/RSCore index 4a909600c..ee0e60d1a 160000 --- a/submodules/RSCore +++ b/submodules/RSCore @@ -1 +1 @@ -Subproject commit 4a909600c568b1773785bd9e18075da92d916c69 +Subproject commit ee0e60d1ab27bb57a6893d19dbff7783d7a485e6