mirror/advplyr.audiobookshelf-app
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf-app.git synced 2025-07-13 23:44:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove blocking realmQueue

Browse source
This commit is contained in:
ronaldheft 2022-08-07 17:46:13 -04:00
parent 849b6303e8
commit ad802c16ea
4 changed files with 102 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ios/App/Shared/models/DeviceSettings.swift
View file

@ -21,12 +21,10 @@ func getDefaultDeviceSettings() -> DeviceSettings {
}
func deviceSettingsToJSON(settings: DeviceSettings) -> Dictionary<String, Any> {
return Database.realmQueue.sync {
return [
"disableAutoRewind": settings.disableAutoRewind,
"enableAltView": settings.enableAltView,
"jumpBackwardsTime": settings.jumpBackwardsTime,
"jumpForwardTime": settings.jumpForwardTime
]
}
}

2
ios/App/Shared/models/ServerConnectionConfig.swift
View file

@ -37,7 +37,6 @@ struct ServerConnectionConfigActiveIndex: Realmable {
}
func convertServerConnectionConfigToJSON(config: ServerConnectionConfig) -> Dictionary<String, Any> {
return Database.realmQueue.sync {
return [
"id": config.id,
"name": config.name,
@ -47,5 +46,4 @@ func convertServerConnectionConfigToJSON(config: ServerConnectionConfig) -> Dict
"username": config.username,
"token": config.token,
]
}
}

151
ios/App/Shared/util/Database.swift
View file

@ -9,26 +9,19 @@ import Foundation
import RealmSwift
class Database {
// All DB releated actions must be executed on "realm-queue"
public static let realmQueue: DispatchQueue = DispatchQueue(label: "realm-queue")
public static var shared = {
realmQueue.sync {
return Database()
}
}()
private var instance: Realm
private init() {
self.instance = try! Realm(queue: Database.realmQueue)
}
private init() {}
public func setServerConnectionConfig(config: ServerConnectionConfig) {
var config = config
Database.realmQueue.sync {
var existing: ServerConnectionConfig? = instance.object(ofType: ServerConnectionConfig.self, forPrimaryKey: config.id)
let realm = try! Realm()
let existing: ServerConnectionConfig? = realm.object(ofType: ServerConnectionConfig.self, forPrimaryKey: config.id)
if config.index == 0 {
var lastConfig: ServerConnectionConfig? = instance.objects(ServerConnectionConfig.self).last
let lastConfig: ServerConnectionConfig? = realm.objects(ServerConnectionConfig.self).last
if lastConfig != nil {
config.index = lastConfig!.index + 1
@ -38,11 +31,11 @@ class Database {
}
do {
try instance.write {
try realm.write {
if existing != nil {
instance.delete(existing!)
realm.delete(existing!)
}
instance.add(config)
realm.add(config)
}
} catch(let exception) {
NSLog("failed to save server config")
@ -51,16 +44,15 @@ class Database {
setLastActiveConfigIndex(index: config.index)
}
}
public func deleteServerConnectionConfig(id: String) {
Database.realmQueue.sync {
let config = instance.object(ofType: ServerConnectionConfig.self, forPrimaryKey: id)
let realm = try! Realm()
let config = realm.object(ofType: ServerConnectionConfig.self, forPrimaryKey: id)
do {
try instance.write {
try realm.write {
if config != nil {
instance.delete(config!)
realm.delete(config!)
}
}
} catch(let exception) {
@ -68,26 +60,23 @@ class Database {
debugPrint(exception)
}
}
}
public func getServerConnectionConfigs() -> [ServerConnectionConfig] {
Database.realmQueue.sync {
return Array(instance.objects(ServerConnectionConfig.self))
}
let realm = try! Realm()
return Array(realm.objects(ServerConnectionConfig.self))
}
public func setLastActiveConfigIndexToNil() {
Database.realmQueue.sync {
setLastActiveConfigIndex(index: nil)
}
}
private func setLastActiveConfigIndex(index: Int?) {
let realm = try! Realm()
do {
try instance.write {
var existing = instance.objects(ServerConnectionConfigActiveIndex.self).last ?? ServerConnectionConfigActiveIndex(index: index)
try realm.write {
var existing = realm.objects(ServerConnectionConfigActiveIndex.self).last ?? ServerConnectionConfigActiveIndex(index: index)
existing.index = index
instance.add(existing, update: .modified)
realm.add(existing, update: .modified)
}
} catch(let exception) {
NSLog("failed to save server config active index")
@ -96,127 +85,103 @@ class Database {
}
public func getLastActiveConfigIndex() -> Int? {
return Database.realmQueue.sync {
return instance.objects(ServerConnectionConfigActiveIndex.self).first?.index ?? nil
}
let realm = try! Realm()
return realm.objects(ServerConnectionConfigActiveIndex.self).first?.index ?? nil
}
public func setDeviceSettings(deviceSettings: DeviceSettings) {
Database.realmQueue.sync {
let existing = instance.objects(DeviceSettings.self)
let realm = try! Realm()
let existing = realm.objects(DeviceSettings.self)
do {
try instance.write {
instance.delete(existing)
instance.add(deviceSettings)
try realm.write {
realm.delete(existing)
realm.add(deviceSettings)
}
} catch(let exception) {
} catch {
NSLog("failed to save device settings")
}
}
}
public func getLocalLibraryItems(mediaType: MediaType? = nil) -> [LocalLibraryItem] {
Database.realmQueue.sync {
Array(instance.objects(LocalLibraryItem.self))
}
let realm = try! Realm()
return Array(realm.objects(LocalLibraryItem.self))
}
public func getLocalLibraryItemByLLId(libraryItem: String) -> LocalLibraryItem? {
let items = getLocalLibraryItems()
for item in items {
if (item.libraryItemId == libraryItem) {
return item
}
}
NSLog("Local library item with id \(libraryItem) not found")
return nil
let realm = try! Realm()
return realm.objects(LocalLibraryItem.self).first(where: { $0.libraryItemId == libraryItem })
}
public func getLocalLibraryItem(localLibraryItem: String) -> LocalLibraryItem? {
Database.realmQueue.sync {
instance.object(ofType: LocalLibraryItem.self, forPrimaryKey: localLibraryItem)
}
let realm = try! Realm()
return realm.object(ofType: LocalLibraryItem.self, forPrimaryKey: localLibraryItem)
}
public func saveLocalLibraryItem(localLibraryItem: LocalLibraryItem) {
Database.realmQueue.sync {
try! instance.write { instance.add(localLibraryItem) }
}
let realm = try! Realm()
try! realm.write { realm.add(localLibraryItem) }
}
public func getDownloadItem(downloadItemId: String) -> DownloadItem? {
Database.realmQueue.sync {
instance.object(ofType: DownloadItem.self, forPrimaryKey: downloadItemId)
}
let realm = try! Realm()
return realm.object(ofType: DownloadItem.self, forPrimaryKey: downloadItemId)
}
public func getDownloadItem(libraryItemId: String) -> DownloadItem? {
Database.realmQueue.sync {
instance.objects(DownloadItem.self).filter("libraryItemId == %@", libraryItemId).first
}
let realm = try! Realm()
return realm.objects(DownloadItem.self).filter("libraryItemId == %@", libraryItemId).first
}
public func getDownloadItem(downloadItemPartId: String) -> DownloadItem? {
Database.realmQueue.sync {
instance.objects(DownloadItem.self).filter("SUBQUERY(downloadItemParts, $part, $part.id == %@) .@count > 0", downloadItemPartId).first
}
let realm = try! Realm()
return realm.objects(DownloadItem.self).filter("SUBQUERY(downloadItemParts, $part, $part.id == %@) .@count > 0", downloadItemPartId).first
}
public func saveDownloadItem(_ downloadItem: DownloadItem) {
Database.realmQueue.sync {
try! instance.write { instance.add(downloadItem) }
}
let realm = try! Realm()
return try! realm.write { realm.add(downloadItem) }
}
public func updateDownloadItemPart(_ part: DownloadItemPart) {
Database.realmQueue.sync {
try! instance.write {
instance.add(part, update: .modified)
}
}
let realm = try! Realm()
return try! realm.write { realm.add(part, update: .modified) }
}
public func removeDownloadItem(_ downloadItem: DownloadItem) {
Database.realmQueue.sync {
try! instance.write { instance.delete(downloadItem) }
}
let realm = try! Realm()
return try! realm.write { realm.delete(downloadItem) }
}
public func getDeviceSettings() -> DeviceSettings {
return Database.realmQueue.sync {
return instance.objects(DeviceSettings.self).first ?? getDefaultDeviceSettings()
}
let realm = try! Realm()
return realm.objects(DeviceSettings.self).first ?? getDefaultDeviceSettings()
}
public func removeLocalLibraryItem(localLibraryItemId: String) {
Database.realmQueue.sync {
try! instance.write {
let realm = try! Realm()
try! realm.write {
let item = getLocalLibraryItemByLLId(libraryItem: localLibraryItemId)
instance.delete(item!)
}
realm.delete(item!)
}
}
public func saveLocalMediaProgress(_ mediaProgress: LocalMediaProgress) {
Database.realmQueue.sync {
try! instance.write { instance.add(mediaProgress) }
}
let realm = try! Realm()
try! realm.write { realm.add(mediaProgress) }
}
// For books this will just be the localLibraryItemId for podcast episodes this will be "{localLibraryItemId}-{episodeId}"
public func getLocalMediaProgress(localMediaProgressId: String) -> LocalMediaProgress? {
Database.realmQueue.sync {
instance.object(ofType: LocalMediaProgress.self, forPrimaryKey: localMediaProgressId)
}
let realm = try! Realm()
return realm.object(ofType: LocalMediaProgress.self, forPrimaryKey: localMediaProgressId)
}
public func removeLocalMediaProgress(localMediaProgressId: String) {
Database.realmQueue.sync {
try! instance.write {
let progress = instance.object(ofType: LocalMediaProgress.self, forPrimaryKey: localMediaProgressId)
instance.delete(progress!)
}
let realm = try! Realm()
try! realm.write {
let progress = realm.object(ofType: LocalMediaProgress.self, forPrimaryKey: localMediaProgressId)
realm.delete(progress!)
}
}
}

2
ios/App/Shared/util/Store.swift
View file

@ -21,9 +21,7 @@ class Store {
Database.shared.setLastActiveConfigIndexToNil()
}
Database.realmQueue.sync {
_serverConfig = updated
}
}
}
}