merge changes from phantasma

This commit is contained in:
j 2024-02-17 10:55:11 +00:00
commit 7ad121d912
5 changed files with 79 additions and 5 deletions

View file

@ -10,6 +10,8 @@ async function loadData(id, args) {
"id",
"title",
"director",
"year",
"date",
"source",
"summary",
"streams",
@ -45,6 +47,11 @@ async function loadData(id, args) {
} else {
data.byline = data.item.director ? data.item.director.join(', ') : ''
}
if (data.item.year) {
data.byline += ' (' + data.item.year + ')'
} else if (data.item.date) {
data.byline += ' (' + data.item.date.split('-')[0] + ')'
}
data.link = `${pandora.proto}://${data.site}/${data.item.id}/info`
let poster = pandora.site.user.ui.icons == 'posters' ? 'poster' : 'icon'
data.icon = `${pandora.proto}://${data.site}/${data.item.id}/${poster}.jpg`
@ -105,6 +112,15 @@ async function loadData(id, args) {
duration: duration
})
})
if (data.layers[pandora.subtitleLayer]) {
var previous;
data.layers[pandora.subtitleLayer].forEach(annotation => {
if (previous) {
previous.out = annotation['in']
}
previous = annotation
})
}
var value = []
Object.keys(data.layers).forEach(layer => {
var html = []
@ -127,7 +143,11 @@ async function loadData(id, args) {
</div>
`)
})
value.push('<div class="layer">' + html.join('\n') + '</div>')
var layerClass = ""
if (layerData.isSubtitles) {
layerClass = " is-subtitles"
}
value.push('<div class="layer'+layerClass+'">' + html.join('\n') + '</div>')
})
data.value = value.join('\n')
@ -137,6 +157,11 @@ async function loadData(id, args) {
} else {
data.byline = data.item.director ? data.item.director.join(', ') : ''
}
if (data.item.year) {
data.byline += ' (' + data.item.year + ')'
} else if (data.item.date) {
data.byline += ' (' + data.item.date.split('-')[0] + ')'
}
data.link = `${pandora.proto}://${data.site}/${data.item.id}/${data["in"]},${data.out}`
data.poster = `${pandora.proto}://${data.site}/${data.item.id}/${pandora.resolution}p${data["in"]}.jpg`
data.aspectratio = data.item.videoRatio