neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-19 19:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[AltStore] Allows multiple simultaneous calls to DatabaseManager.start

Browse Source
This commit is contained in:
Riley Testut
2019-07-31 13:24:59 -07:00
parent 95f269402c
commit 7385d109cd
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
AltStore/Model/DatabaseManager.swift
View File

@@ -19,6 +19,8 @@ public class DatabaseManager
public private(set) var isStarted = false public private(set) var isStarted = false
private var startCompletionHandlers = [(Error?) -> Void]()
private init() private init()
{ {
self.persistentContainer = RSTPersistentContainer(name: "AltStore") self.persistentContainer = RSTPersistentContainer(name: "AltStore")
@@ -30,18 +32,30 @@ public extension DatabaseManager
{ {
func start(completionHandler: @escaping (Error?) -> Void) func start(completionHandler: @escaping (Error?) -> Void)
{ {
guard !self.isStarted else { return completionHandler(nil) } self.startCompletionHandlers.append(completionHandler)
guard self.startCompletionHandlers.count == 1 else { return }
func finish(_ error: Error?)
{
self.startCompletionHandlers.forEach { $0(error) }
self.startCompletionHandlers.removeAll()
}
guard !self.isStarted else { return finish(nil) }
self.persistentContainer.loadPersistentStores { (description, error) in self.persistentContainer.loadPersistentStores { (description, error) in
guard error == nil else { return completionHandler(error!) } guard error == nil else { return finish(error!) }
self.prepareDatabase() { (result) in self.prepareDatabase() { (result) in
switch result switch result
{ {
case .failure(let error): completionHandler(error) case .failure(let error):
finish(error)
case .success: case .success:
self.isStarted = true self.isStarted = true
completionHandler(nil) finish(nil)
} }
} }
} }
@@ -107,7 +121,8 @@ private extension DatabaseManager
{ {
func prepareDatabase(completionHandler: @escaping (Result<Void, Error>) -> Void) func prepareDatabase(completionHandler: @escaping (Result<Void, Error>) -> Void)
{ {
self.persistentContainer.performBackgroundTask { (context) in let context = self.persistentContainer.newBackgroundContext()
context.performAndWait {
guard let localApp = ALTApplication(fileURL: Bundle.main.bundleURL) else { return } guard let localApp = ALTApplication(fileURL: Bundle.main.bundleURL) else { return }
let storeApp: App let storeApp: App