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

Fix progress syncing

Browse source
This commit is contained in:
ronaldheft 2022-08-16 21:14:33 -04:00
parent 6aa0f2253b
commit 10f2da9e90
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ios/App/App/plugins/AbsAudioPlayer.swift
View file

@ -130,7 +130,9 @@ public class AbsAudioPlayer: CAPPlugin {
@objc func sendMetadata() { @objc func sendMetadata() {
self.notifyListeners("onPlayingUpdate", data: [ "value": !PlayerHandler.paused ]) self.notifyListeners("onPlayingUpdate", data: [ "value": !PlayerHandler.paused ])
self.notifyListeners("onMetadata", data: PlayerHandler.getMetdata()) if let metadata = PlayerHandler.getMetdata() {
self.notifyListeners("onMetadata", data: metadata)
}
} }
@objc func sendPlaybackClosedEvent() { @objc func sendPlaybackClosedEvent() {
self.notifyListeners("onPlaybackClosed", data: [ "value": true ]) self.notifyListeners("onPlaybackClosed", data: [ "value": true ])

4
ios/App/Shared/player/AudioPlayer.swift
View file

@ -107,6 +107,10 @@ class AudioPlayer: NSObject {
NotificationCenter.default.post(name: NSNotification.Name(PlayerEvents.closed.rawValue), object: nil) NotificationCenter.default.post(name: NSNotification.Name(PlayerEvents.closed.rawValue), object: nil)
} }
func isInitialized() -> Bool {
return self.status != -1
}
func getItemIndexForTime(time:Double) -> Int { func getItemIndexForTime(time:Double) -> Int {
let playbackSession = Database.shared.getPlaybackSession(id: self.sessionId)! let playbackSession = Database.shared.getPlaybackSession(id: self.sessionId)!
for index in 0..<self.allPlayerItems.count { for index in 0..<self.allPlayerItems.count {

14
ios/App/Shared/player/PlayerHandler.swift
View file

@ -157,16 +157,19 @@ class PlayerHandler {
player?.seek(amount, from: "handler") player?.seek(amount, from: "handler")
} }
public static func getMetdata() -> [String: Any] { public static func getMetdata() -> [String: Any]? {
guard let player = player else { return nil }
guard player.isInitialized() else { return nil }
DispatchQueue.main.async { DispatchQueue.main.async {
syncProgress() syncProgress()
} }
return [ return [
"duration": player?.getDuration() ?? 0, "duration": player.getDuration(),
"currentTime": player?.getCurrentTime() ?? 0, "currentTime": player.getCurrentTime(),
"playerState": !paused, "playerState": !paused,
"currentRate": player?.rate ?? 0, "currentRate": player.rate,
] ]
} }
@ -199,6 +202,7 @@ class PlayerHandler {
public static func syncProgress() { public static func syncProgress() {
guard let player = player else { return } guard let player = player else { return }
guard player.isInitialized() else { return }
guard let session = getPlaybackSession() else { return } guard let session = getPlaybackSession() else { return }
// Get current time // Get current time
@ -254,7 +258,7 @@ class PlayerHandler {
guard Connectivity.isConnectedToInternet else { return } guard Connectivity.isConnectedToInternet else { return }
DispatchQueue.global(qos: .utility).async { DispatchQueue.global(qos: .utility).async {
let realm = try! Realm() let realm = try! Realm()
for session in realm.objects(PlaybackSession.self) { for session in realm.objects(PlaybackSession.self).where({ $0.serverConnectionConfigId == Store.serverConfig?.id }) {
NSLog("Sending sessionId(\(session.id)) to server") NSLog("Sending sessionId(\(session.id)) to server")
let sessionRef = ThreadSafeReference(to: session) let sessionRef = ThreadSafeReference(to: session)
ApiClient.reportLocalPlaybackProgress(session.freeze()) { success in ApiClient.reportLocalPlaybackProgress(session.freeze()) { success in