Fix issues with playlists and fix issue with leaving watch page from an invalid id
This commit is contained in:
parent
b5a38862f4
commit
781e971357
|
@ -202,6 +202,9 @@ export default Vue.extend({
|
|||
|
||||
// For Invidious data, as duration is sent in seconds
|
||||
calculateVideoDuration: function (lengthSeconds) {
|
||||
if (typeof lengthSeconds === 'string') {
|
||||
return lengthSeconds
|
||||
}
|
||||
let durationText = ''
|
||||
let time = lengthSeconds
|
||||
let hours = 0
|
||||
|
|
|
@ -25,22 +25,16 @@ Vue.use(VueI18n)
|
|||
// List of locales approved for use
|
||||
const activeLocales = ['en-US', 'de-DE', 'es-MX', 'fi', 'fr-FR', 'ja', 'pt-BR', 'pt-PT', 'ru', 'vi', 'zh-CN', 'zh-TW']
|
||||
const messages = {}
|
||||
const fileLocation = isDev ? 'static/locales/' : `${__dirname}/static/locales/`
|
||||
|
||||
// Take active locales and load respective YAML file
|
||||
activeLocales.forEach((locale) => {
|
||||
try {
|
||||
// File location when running in dev
|
||||
const doc = yaml.safeLoad(fs.readFileSync(`static/locales/${locale}.yaml`))
|
||||
const doc = yaml.safeLoad(fs.readFileSync(`${fileLocation}${locale}.yaml`))
|
||||
messages[locale] = doc
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
try {
|
||||
// File location when compiled
|
||||
const doc = yaml.safeLoad(fs.readFileSync(`${__dirname}/static/locales/${locale}.yaml`))
|
||||
messages[locale] = doc
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
|
|
|
@ -92,7 +92,13 @@ export default Vue.extend({
|
|||
infoSource: 'local'
|
||||
}
|
||||
|
||||
this.playlistItems = result.items
|
||||
this.playlistItems = result.items.map((video) => {
|
||||
video.videoId = video.id
|
||||
video.lengthSeconds = video.duration
|
||||
video.author = video.author.name
|
||||
|
||||
return video
|
||||
})
|
||||
|
||||
this.isLoading = false
|
||||
}).catch((err) => {
|
||||
|
|
|
@ -700,9 +700,8 @@ export default Vue.extend({
|
|||
if (this.rememberHistory && !this.isLoading && !this.isLive) {
|
||||
const player = this.$refs.videoPlayer.player
|
||||
|
||||
if (typeof player !== 'undefined' && this.saveWatchedProgress) {
|
||||
if (player !== null && this.saveWatchedProgress) {
|
||||
const currentTime = this.$refs.videoPlayer.player.currentTime()
|
||||
console.log(currentTime)
|
||||
const payload = {
|
||||
videoId: this.videoId,
|
||||
watchProgress: currentTime
|
||||
|
|
Loading…
Reference in New Issue