diff --git a/.github/workflows/cron-backup.yaml b/.github/workflows/cron-backup.yaml index 1cee85e..1f40a7e 100644 --- a/.github/workflows/cron-backup.yaml +++ b/.github/workflows/cron-backup.yaml @@ -2,7 +2,7 @@ name: cron/backup on: workflow_dispatch: schedule: - - cron: '30 8 * * 5' + - cron: '30 7 * * 5' jobs: cronjob: diff --git a/.github/workflows/cron-csv.yaml b/.github/workflows/cron-csv.yaml index 49c17e7..7d5411e 100644 --- a/.github/workflows/cron-csv.yaml +++ b/.github/workflows/cron-csv.yaml @@ -2,7 +2,7 @@ name: cron/csv on: workflow_dispatch: schedule: - - cron: '20 8 * * *' + - cron: '20 7 * * *' jobs: cronjob: diff --git a/.github/workflows/cron-daily.yaml b/.github/workflows/cron-daily.yaml index 6616384..6045df4 100644 --- a/.github/workflows/cron-daily.yaml +++ b/.github/workflows/cron-daily.yaml @@ -2,7 +2,7 @@ name: cron/daily on: workflow_dispatch: schedule: - - cron: '0 */12 * * *' + - cron: '0 7,19 * * *' jobs: cronjob: diff --git a/.github/workflows/cron-weekly.yaml b/.github/workflows/cron-weekly.yaml index e5166a4..1277c04 100644 --- a/.github/workflows/cron-weekly.yaml +++ b/.github/workflows/cron-weekly.yaml @@ -2,7 +2,7 @@ name: cron/weekly on: workflow_dispatch: schedule: - - cron: '10 8 * * *' + - cron: '10 7 * * *' jobs: cronjob: diff --git a/README.md b/README.md index 13a035f..5cd007a 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,7 @@ Az alábbi mezőket exportálja a **/public/m3-db.csv.gz** tömörített fájlba * year * duration * short_description + * released #### Műsor hozzáadása azonosító segítségével Útvonal: **/cron/add?id=** diff --git a/application/views/foot.php b/application/views/foot.php index 5c4e70e..e7dc5cb 100644 --- a/application/views/foot.php +++ b/application/views/foot.php @@ -58,57 +58,14 @@ function initPlayer(el) { }); } - async function getReleaseDate(programid) { - const infoRes = await fetch(String('\x68\x74\x74\x70\x73\x3a\x2f\x2f\x6e\x65\x6d\x7a\x65\x74\x69\x61\x72\x63\x68\x69\x76\x75\x6d\x2e\x68\x75\x2f\x61\x70\x69\x2f\x6d\x33\x2f\x76\x33\x2f\x69\x74\x65\x6d\x3f\x69\x64\x3d')+programid); - const infoResJson = await infoRes.json(); - - let releaseDate = null; - for (const key of ['start_playable_dts', 'start_startTime_dts']) { - if (key in infoResJson && Array.isArray(infoResJson[key]) && infoResJson[key].length > 0) { - for (const dts of infoResJson[key]) { - const dtsDate = new Date(dts); - if (releaseDate === null || dtsDate < releaseDate) { - releaseDate = dtsDate; - } - } - } - } - - return releaseDate; - } - const domLoaded = () => { console.log('DOM loaded'); const videoElements = document.querySelectorAll('.video-js'); for (const el of videoElements) { - getReleaseDate(el.dataset.programid).then(releaseDate => { - let playableDate = null; - if (releaseDate) { - playableDate = new Date(releaseDate); - playableDate.setHours(playableDate.getHours() - 2); - } - - if (playableDate && playableDate <= new Date()) { - // el.style.border = 'solid 2px green';}if(true){//debug - initPlayer(el); - } else { - if (releaseDate) { - const overlay = document.createElement('div'); - overlay.className = 'm3player-overlay'; - overlay.textContent = '📅 ' + releaseDate.toLocaleString('hu-HU'); - overlay.title = 'Közzététel időpontja'; - el.parentNode.appendChild(overlay); - } - //debug - el.addEventListener('dblclick', ev => { - ev.preventDefault(); - const overlay = el.parentNode.querySelector('.m3player-overlay'); - if (overlay) overlay.remove(); - initPlayer(el); - }, {'once':true}); - } - }); + const overlay = el.parentNode.querySelector('.m3player-overlay'); + if (!overlay) initPlayer(el); + else el.addEventListener('dblclick',ev=>{ev.preventDefault();if(overlay){overlay.remove()};initPlayer(el);},{'once':true});// DEBUG } }; diff --git a/application/views/head.php b/application/views/head.php index 0b6fc2a..009bebc 100644 --- a/application/views/head.php +++ b/application/views/head.php @@ -22,7 +22,7 @@ - +
diff --git a/application/views/list.php b/application/views/list.php index dde5000..a77e691 100644 --- a/application/views/list.php +++ b/application/views/list.php @@ -10,6 +10,8 @@ echo '
'.$total.' találat
'; echo $links; + $today_mid = new DateTime(); + $today_mid->setTime(12, 0, 0); ?>
@@ -38,6 +40,15 @@ class="video-js" preload="none" poster="https://nemzetiarchivum.hu/images/m3/" > + modify('-1 hour')->setTime(12, 0, 0); + $prerender = (floor($released_mid->getTimestamp() / 60 / 60 / 24) % 3); + if ($prerender > 0) $released_mid->modify('-'.$prerender.' day');//🧀 + if ($released_mid > $today_mid): + ?> +
📅
+ diff --git a/public/app.css b/public/app.css index e7bb3e7..7b65ed0 100644 --- a/public/app.css +++ b/public/app.css @@ -87,10 +87,15 @@ h1 { font-style: italic; } -.list__table td, .list__table th { +.list__table td { vertical-align: top; } +.details__table tbody tr td { + white-space: normal; + word-wrap: break-word; +} + .list__no_items { text-align: center; margin-top: 20px;
@@ -51,30 +62,32 @@ class="video-js"
- - - $val): - if(trim($val)): - ?> - - - - - - -
- -
+
+ + + $val): + if(trim($val)): + ?> + + + + + + +
+ +
+