csmith1865/obscreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

fix videos length on slide add only + fix player loop when 1 element only

Browse Source
This commit is contained in:
jr-k 2024-08-01 10:09:30 +02:00
parent 02c54566a9
commit 790b9d422f
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/controller/SlideController.py
View File

@ -42,8 +42,9 @@ class SlideController(ObController):
slide = Slide( slide = Slide(
content_id=content.id if content else request.form['content_id'], content_id=content.id if content else request.form['content_id'],
enabled='enabled' in request.form and request.form['enabled'] == '1',
delegate_duration='delegate_duration' in request.form and request.form['delegate_duration'] == '1',
duration=request.form['duration'], duration=request.form['duration'],
enabled='enabled' in request.form and request.form['enabled'],
is_notification=True if 'is_notification' in request.form and request.form['is_notification'] == '1' else False, is_notification=True if 'is_notification' in request.form and request.form['is_notification'] == '1' else False,
playlist_id=request.form['playlist_id'] if 'playlist_id' in request.form and request.form['playlist_id'] else None, playlist_id=request.form['playlist_id'] if 'playlist_id' in request.form and request.form['playlist_id'] else None,
cron_schedule=get_optional_string(request.form['cron_schedule']), cron_schedule=get_optional_string(request.form['cron_schedule']),

14
views/player/player.jinja.html
View File

@ -84,6 +84,14 @@
let notificationItemIndex = null; let notificationItemIndex = null;
// Functions // Functions
const itemsLoadedProcess = function() {
if (items.loop.length === 1) {
const duplicatedItem = Object.assign({}, items.loop[0]);
duplicatedItem['id'] = duplicatedItem['id'] + 'bis';
items.loop.push(duplicatedItem);
}
};
const itemCheck = setInterval(function() { const itemCheck = setInterval(function() {
if (previewMode) { if (previewMode) {
return; return;
@ -95,6 +103,7 @@
} }
}).then(function(data) { }).then(function(data) {
items = data; items = data;
itemsLoadedProcess();
if (needHardRefresh === null) { if (needHardRefresh === null) {
needHardRefresh = items.hard_refresh_request; needHardRefresh = items.hard_refresh_request;
@ -202,6 +211,7 @@
}; };
const main = function() { const main = function() {
itemsLoadedProcess();
setInterval(checkAndMoveNotifications, 1000); setInterval(checkAndMoveNotifications, 1000);
setTimeout(function() { setTimeout(function() {
if (items.loop.length === 0) { if (items.loop.length === 0) {
@ -391,7 +401,9 @@
if (element.innerHTML.match('<video>')) { if (element.innerHTML.match('<video>')) {
if (!previewMode) { if (!previewMode) {
video.play(); setTimeout(function() {
video.play();
}, 1000);
} }
} }
} }