extern/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2025-01-18 03:48:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix check user audiobook data exists when getting last update

Browse Source
This commit is contained in:
advplyr 2021-10-26 16:52:45 -05:00
parent 580b961c4a
commit 4dd9f779e2
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
server/objects/Stream.js
View File

@ -68,7 +68,7 @@ class Stream extends EventEmitter {
get segmentStartNumber() { get segmentStartNumber() {
if (!this.startTime) return 0 if (!this.startTime) return 0
return Math.floor((this.startTime >= this.maxSeekBackTime ? (this.startTime - this.maxSeekBackTime) : 0) / this.segmentLength) return Math.floor(Math.max(this.startTime - this.maxSeekBackTime, 0) / this.segmentLength)
} }
get numSegments() { get numSegments() {
@ -83,6 +83,18 @@ class Stream extends EventEmitter {
return this.audiobook.tracks return this.audiobook.tracks
} }
get clientUser() {
return this.client.user || {}
}
get clientUserAudiobooks() {
return this.clientUser.audiobooks || {}
}
get clientUserAudiobookData() {
return this.clientUserAudiobooks[this.audiobookId]
}
get clientPlaylistUri() { get clientPlaylistUri() {
return `/hls/${this.id}/output.m3u8` return `/hls/${this.id}/output.m3u8`
} }
@ -106,18 +118,16 @@ class Stream extends EventEmitter {
startTime: this.startTime, startTime: this.startTime,
segmentStartNumber: this.segmentStartNumber, segmentStartNumber: this.segmentStartNumber,
isTranscodeComplete: this.isTranscodeComplete, isTranscodeComplete: this.isTranscodeComplete,
lastUpdate: this.client.user.audiobooks[this.audiobook.id].lastUpdate lastUpdate: this.clientUserAudiobookData ? this.clientUserAudiobookData.lastUpdate : 0
} }
} }
init() { init() {
var clientUserAudiobooks = this.client.user ? this.client.user.audiobooks || {} : {} if (this.clientUserAudiobookData) {
var userAudiobook = clientUserAudiobooks[this.audiobookId] || null var timeRemaining = this.totalDuration - this.clientUserAudiobookData.currentTime
if (userAudiobook) { Logger.info('[STREAM] User has progress for audiobook', this.clientUserAudiobookData.progress, `Time Remaining: ${timeRemaining}s`)
var timeRemaining = this.totalDuration - userAudiobook.currentTime
Logger.info('[STREAM] User has progress for audiobook', userAudiobook.progress, `Time Remaining: ${timeRemaining}s`)
if (timeRemaining > 15) { if (timeRemaining > 15) {
this.startTime = userAudiobook.currentTime this.startTime = this.clientUserAudiobookData.currentTime
this.clientCurrentTime = this.startTime this.clientCurrentTime = this.startTime
} }
} }
@ -241,23 +251,22 @@ class Stream extends EventEmitter {
this.ffmpeg = Ffmpeg() this.ffmpeg = Ffmpeg()
var timeStart = this.startTime >= this.maxSeekBackTime ? (this.startTime - this.maxSeekBackTime) : 0 var adjustedStartTime = Math.max(this.startTime - this.maxSeekBackTime, 0)
var trackStartTime = await writeConcatFile(this.tracks, this.concatFilesPath, timeStart) var trackStartTime = await writeConcatFile(this.tracks, this.concatFilesPath, adjustedStartTime)
this.ffmpeg.addInput(this.concatFilesPath) this.ffmpeg.addInput(this.concatFilesPath)
// seek_timestamp : https://ffmpeg.org/ffmpeg.html // seek_timestamp : https://ffmpeg.org/ffmpeg.html
// the argument to the -ss option is considered an actual timestamp, and is not offset by the start time of the file // the argument to the -ss option is considered an actual timestamp, and is not offset by the start time of the file
// note: this may result in the same thing as output seeking, fixes https://github.com/advplyr/audiobookshelf/issues/116 // fixes https://github.com/advplyr/audiobookshelf/issues/116
this.ffmpeg.inputOption('-seek_timestamp 1') this.ffmpeg.inputOption('-seek_timestamp 1')
this.ffmpeg.inputFormat('concat') this.ffmpeg.inputFormat('concat')
this.ffmpeg.inputOption('-safe 0') this.ffmpeg.inputOption('-safe 0')
// this.ffmpeg.inputOption('-segment_time_metadata 1')
if (timeStart > 0) { if (adjustedStartTime > 0) {
const shiftedStartTime = timeStart - trackStartTime const shiftedStartTime = adjustedStartTime - trackStartTime
// Issues using exact fractional seconds i.e. 29.49814 - changing to 29.5s // Issues using exact fractional seconds i.e. 29.49814 - changing to 29.5s
var startTimeS = Math.round(shiftedStartTime * 10) / 10 + 's' var startTimeS = Math.round(shiftedStartTime * 10) / 10 + 's'
Logger.info(`[STREAM] Starting Stream at startTime ${secondsToTimestamp(timeStart)} (User startTime ${secondsToTimestamp(this.startTime)}) and Segment #${this.segmentStartNumber}`) Logger.info(`[STREAM] Starting Stream at startTime ${secondsToTimestamp(adjustedStartTime)} (User startTime ${secondsToTimestamp(this.startTime)}) and Segment #${this.segmentStartNumber}`)
this.ffmpeg.inputOption(`-ss ${startTimeS}`) this.ffmpeg.inputOption(`-ss ${startTimeS}`)
this.ffmpeg.inputOption('-noaccurate_seek') this.ffmpeg.inputOption('-noaccurate_seek')