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

Refactor starting a playback session

Browse source
This commit is contained in:
ronaldheft 2022-08-18 15:57:03 -04:00
parent 2912d442b5
commit 1746ed6469
1 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,6 +27,15 @@ public class AbsAudioPlayer: CAPPlugin {
self.bridge?.webView?.allowsBackForwardNavigationGestures = true; self.bridge?.webView?.allowsBackForwardNavigationGestures = true;
} }
@objc func startPlaybackSession(_ session: PlaybackSession, playWhenReady: Bool, playbackRate: Float = 1.0) throws {
guard let libraryItemId = session.libraryItemId else { throw PlayerError.libraryItemIdNotSpecified }
self.sendPrepareMetadataEvent(itemId: libraryItemId, playWhenReady: playWhenReady)
self.sendPlaybackSession(session: try session.asDictionary())
PlayerHandler.startPlayback(sessionId: session.id, playWhenReady: playWhenReady, playbackRate: playbackRate)
self.sendMetadata()
}
@objc func prepareLibraryItem(_ call: CAPPluginCall) { @objc func prepareLibraryItem(_ call: CAPPluginCall) {
let libraryItemId = call.getString("libraryItemId") let libraryItemId = call.getString("libraryItemId")
@ -39,9 +48,6 @@ public class AbsAudioPlayer: CAPPlugin {
return call.resolve() return call.resolve()
} }
initialPlayWhenReady = playWhenReady
initialPlaybackRate = playbackRate
PlayerHandler.stopPlayback() PlayerHandler.stopPlayback()
let isLocalItem = libraryItemId?.starts(with: "local_") ?? false let isLocalItem = libraryItemId?.starts(with: "local_") ?? false
@ -53,32 +59,26 @@ public class AbsAudioPlayer: CAPPlugin {
return call.resolve([:]) return call.resolve([:])
} }
playbackSession.save() playbackSession.save()
sendPrepareMetadataEvent(itemId: libraryItemId!, playWhenReady: playWhenReady)
do { do {
self.sendPlaybackSession(session: try playbackSession.asDictionary()) try self.startPlaybackSession(playbackSession, playWhenReady: playWhenReady, playbackRate: playbackRate)
call.resolve(try playbackSession.asDictionary()) call.resolve(try playbackSession.asDictionary())
} catch(let exception) { } catch(let exception) {
NSLog("failed to convert session to json") NSLog("Failed to start session")
debugPrint(exception) debugPrint(exception)
call.resolve([:]) call.resolve([:])
} }
PlayerHandler.startPlayback(sessionId: playbackSession.id, playWhenReady: playWhenReady, playbackRate: playbackRate)
self.sendMetadata()
} else { // Playing from the server } else { // Playing from the server
sendPrepareMetadataEvent(itemId: libraryItemId!, playWhenReady: playWhenReady)
ApiClient.startPlaybackSession(libraryItemId: libraryItemId!, episodeId: episodeId, forceTranscode: false) { session in ApiClient.startPlaybackSession(libraryItemId: libraryItemId!, episodeId: episodeId, forceTranscode: false) { session in
session.save()
do { do {
self.sendPlaybackSession(session: try session.asDictionary()) try self.startPlaybackSession(session, playWhenReady: playWhenReady, playbackRate: playbackRate)
call.resolve(try session.asDictionary()) call.resolve(try session.asDictionary())
} catch(let exception) { } catch(let exception) {
NSLog("failed to convert session to json") NSLog("Failed to start session")
debugPrint(exception) debugPrint(exception)
call.resolve([:]) call.resolve([:])
} }
session.save()
PlayerHandler.startPlayback(sessionId: session.id, playWhenReady: playWhenReady, playbackRate: playbackRate)
self.sendMetadata()
} }
} }
} }
@ -245,3 +245,7 @@ public class AbsAudioPlayer: CAPPlugin {
self.notifyListeners("onPlaybackSession", data: session) self.notifyListeners("onPlaybackSession", data: session)
} }
} }
enum PlayerError: String, Error {
case libraryItemIdNotSpecified = "No libraryItemId provided on session"
}