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

Fix server media progress JSON decoding

Browse source
This commit is contained in:
ronaldheft 2022-08-18 15:55:50 -04:00
parent add64249cd
commit a82474cf45
4 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ios/App/App/AppDelegate.swift
View file

@ -11,7 +11,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// Override point for customization after application launch. // Override point for customization after application launch.
let configuration = Realm.Configuration( let configuration = Realm.Configuration(
schemaVersion: 4, schemaVersion: 2,
migrationBlock: { migration, oldSchemaVersion in migrationBlock: { migration, oldSchemaVersion in
if (oldSchemaVersion < 1) { if (oldSchemaVersion < 1) {
NSLog("Realm schema version was \(oldSchemaVersion)") NSLog("Realm schema version was \(oldSchemaVersion)")

32
ios/App/Shared/models/local/LocalMediaProgress.swift
View file

@ -16,9 +16,9 @@ class LocalMediaProgress: Object, Codable {
@Persisted var progress: Double = 0 @Persisted var progress: Double = 0
@Persisted var currentTime: Double = 0 @Persisted var currentTime: Double = 0
@Persisted var isFinished: Bool = false @Persisted var isFinished: Bool = false
@Persisted var lastUpdate: Int = 0 @Persisted var lastUpdate: Double = 0
@Persisted var startedAt: Int = 0 @Persisted var startedAt: Double = 0
@Persisted var finishedAt: Int? @Persisted var finishedAt: Double?
// For local lib items from server to support server sync // For local lib items from server to support server sync
@Persisted var serverConnectionConfigId: String? @Persisted var serverConnectionConfigId: String?
@Persisted var serverAddress: String? @Persisted var serverAddress: String?
@ -42,19 +42,19 @@ class LocalMediaProgress: Object, Codable {
let values = try decoder.container(keyedBy: CodingKeys.self) let values = try decoder.container(keyedBy: CodingKeys.self)
id = try values.decode(String.self, forKey: .id) id = try values.decode(String.self, forKey: .id)
localLibraryItemId = try values.decode(String.self, forKey: .localLibraryItemId) localLibraryItemId = try values.decode(String.self, forKey: .localLibraryItemId)
localEpisodeId = try? values.decode(String.self, forKey: .localEpisodeId) localEpisodeId = try values.decodeIfPresent(String.self, forKey: .localEpisodeId)
duration = try values.decode(Double.self, forKey: .duration) duration = try values.decode(Double.self, forKey: .duration)
progress = try values.decode(Double.self, forKey: .progress) progress = try values.decode(Double.self, forKey: .progress)
currentTime = try values.decode(Double.self, forKey: .currentTime) currentTime = try values.decode(Double.self, forKey: .currentTime)
isFinished = try values.decode(Bool.self, forKey: .isFinished) isFinished = try values.decode(Bool.self, forKey: .isFinished)
lastUpdate = try values.decode(Int.self, forKey: .lastUpdate) lastUpdate = try values.decode(Double.self, forKey: .lastUpdate)
startedAt = try values.decode(Int.self, forKey: .startedAt) startedAt = try values.decode(Double.self, forKey: .startedAt)
finishedAt = try? values.decode(Int.self, forKey: .finishedAt) finishedAt = try values.decodeIfPresent(Double.self, forKey: .finishedAt)
serverConnectionConfigId = try? values.decode(String.self, forKey: .serverConnectionConfigId) serverConnectionConfigId = try values.decodeIfPresent(String.self, forKey: .serverConnectionConfigId)
serverAddress = try? values.decode(String.self, forKey: .serverAddress) serverAddress = try values.decodeIfPresent(String.self, forKey: .serverAddress)
serverUserId = try? values.decode(String.self, forKey: .serverUserId) serverUserId = try values.decodeIfPresent(String.self, forKey: .serverUserId)
libraryItemId = try? values.decode(String.self, forKey: .libraryItemId) libraryItemId = try values.decodeIfPresent(String.self, forKey: .libraryItemId)
episodeId = try? values.decode(String.self, forKey: .episodeId) episodeId = try values.decodeIfPresent(String.self, forKey: .episodeId)
} }
func encode(to encoder: Encoder) throws { func encode(to encoder: Encoder) throws {
@ -93,7 +93,7 @@ extension LocalMediaProgress {
self.progress = 0.0 self.progress = 0.0
self.currentTime = 0.0 self.currentTime = 0.0
self.isFinished = false self.isFinished = false
self.lastUpdate = Int(Date().timeIntervalSince1970) self.lastUpdate = Date().timeIntervalSince1970 * 1000
self.startedAt = 0 self.startedAt = 0
self.finishedAt = nil self.finishedAt = nil
@ -122,11 +122,11 @@ extension LocalMediaProgress {
} }
if self.startedAt == 0 && finished { if self.startedAt == 0 && finished {
self.startedAt = Int(Date().timeIntervalSince1970) self.startedAt = Date().timeIntervalSince1970 * 1000
} }
self.isFinished = finished self.isFinished = finished
self.lastUpdate = Int(Date().timeIntervalSince1970) self.lastUpdate = Date().timeIntervalSince1970 * 1000
self.finishedAt = finished ? lastUpdate : nil self.finishedAt = finished ? lastUpdate : nil
} }
} }
@ -135,7 +135,7 @@ extension LocalMediaProgress {
try! Realm().write { try! Realm().write {
self.currentTime = playbackSession.currentTime self.currentTime = playbackSession.currentTime
self.progress = playbackSession.progress self.progress = playbackSession.progress
self.lastUpdate = Int(Date().timeIntervalSince1970) self.lastUpdate = Date().timeIntervalSince1970 * 1000
self.isFinished = playbackSession.progress >= 100.0 self.isFinished = playbackSession.progress >= 100.0
self.finishedAt = self.isFinished ? self.lastUpdate : nil self.finishedAt = self.isFinished ? self.lastUpdate : nil
} }

12
ios/App/Shared/models/server/MediaProgress.swift
View file

@ -16,9 +16,9 @@ class MediaProgress: EmbeddedObject, Codable {
@Persisted var progress: Double = 0 @Persisted var progress: Double = 0
@Persisted var currentTime: Double = 0 @Persisted var currentTime: Double = 0
@Persisted var isFinished: Bool = false @Persisted var isFinished: Bool = false
@Persisted var lastUpdate: Int = 0 @Persisted var lastUpdate: Double = 0
@Persisted var startedAt: Int = 0 @Persisted var startedAt: Double = 0
@Persisted var finishedAt: Int? @Persisted var finishedAt: Double?
private enum CodingKeys : String, CodingKey { private enum CodingKeys : String, CodingKey {
case id, libraryItemId, episodeId, duration, progress, currentTime, isFinished, lastUpdate, startedAt, finishedAt case id, libraryItemId, episodeId, duration, progress, currentTime, isFinished, lastUpdate, startedAt, finishedAt
@ -37,9 +37,9 @@ class MediaProgress: EmbeddedObject, Codable {
progress = try values.doubleOrStringDecoder(key: .progress) progress = try values.doubleOrStringDecoder(key: .progress)
currentTime = try values.doubleOrStringDecoder(key: .currentTime) currentTime = try values.doubleOrStringDecoder(key: .currentTime)
isFinished = try values.decode(Bool.self, forKey: .isFinished) isFinished = try values.decode(Bool.self, forKey: .isFinished)
lastUpdate = try values.intOrStringDecoder(key: .lastUpdate) lastUpdate = try values.doubleOrStringDecoder(key: .lastUpdate)
startedAt = try values.intOrStringDecoder(key: .startedAt) startedAt = try values.doubleOrStringDecoder(key: .startedAt)
finishedAt = try? values.intOrStringDecoder(key: .finishedAt) finishedAt = try? values.doubleOrStringDecoder(key: .finishedAt)
} }
func encode(to encoder: Encoder) throws { func encode(to encoder: Encoder) throws {

10
ios/App/Shared/util/Extensions.swift
View file

@ -55,8 +55,14 @@ extension KeyedDecodingContainer {
extension CAPPluginCall { extension CAPPluginCall {
func getJson<T: Decodable>(_ key: String, type: T.Type) -> T? { func getJson<T: Decodable>(_ key: String, type: T.Type) -> T? {
guard let value = getObject(key) else { return nil } guard let value = getObject(key) else { return nil }
guard let json = try? JSONSerialization.data(withJSONObject: value) else { return nil } do {
return try? JSONDecoder().decode(type, from: json) let json = try JSONSerialization.data(withJSONObject: value)
return try JSONDecoder().decode(type, from: json)
} catch {
NSLog("Failed to get json for \(key)")
debugPrint(error)
return nil
}
} }
} }