danvics/ytptube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #39 from ArabCoders/dev

Browse source 
Sometimes live stream will not have release_timestamp
This commit is contained in:
Abdulmohsen 2023-12-03 16:55:39 +03:00 committed by GitHub
commit 6de32f9f02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/DownloadQueue.py
View file

@ -56,11 +56,14 @@ class DownloadQueue:
error: str = None error: str = None
live_in: str = None live_in: str = None
if 'live_status' in entry and 'release_timestamp' in entry and entry.get('live_status') == 'is_upcoming' and entry.get('release_timestamp'): if 'live_status' in entry and entry.get('live_status') == 'is_upcoming':
dt_ts = datetime.fromtimestamp( if 'release_timestamp' in entry and entry.get('release_timestamp'):
entry.get('release_timestamp'), tz=timezone.utc).strftime('%Y-%m-%d %H:%M:%S %z') dt_ts = datetime.fromtimestamp(
error = f"Live stream is scheduled to start at {dt_ts}" entry.get('release_timestamp'), tz=timezone.utc).strftime('%Y-%m-%d %H:%M:%S %z')
live_in = formatdate(entry.get('release_timestamp')) error = f"Live stream is scheduled to start at {dt_ts}"
live_in = formatdate(entry.get('release_timestamp'))
else:
error = 'Live stream not yet started. And no date is set.'
else: else:
error = entry['msg'] if 'msg' in entry else None error = entry['msg'] if 'msg' in entry else None

4
frontend/src/components/Page-Completed.vue
View file

@ -94,12 +94,12 @@
</div> </div>
<div class="column is-4 has-text-centered"> <div class="column is-4 has-text-centered">
<span :date-datetime="item.datetime" <span :date-datetime="item.datetime"
:data-tooltip="moment(item.datetime).format('MMMM Do YYYY, h:mm:ss a')"> :data-tooltip="moment(item.datetime).format('YYYY-M-DD H:mm Z')">
{{ moment(item.datetime).fromNow() }} {{ moment(item.datetime).fromNow() }}
</span> </span>
</div> </div>
<div class="column is-4 has-text-centered" v-if="item.live_in && item.status != 'finished'"> <div class="column is-4 has-text-centered" v-if="item.live_in && item.status != 'finished'">
<span :date-datetime="item.datetime" data-tooltip="Live in"> <span :date-datetime="item.datetime" :data-tooltip="'Will start at: ' + moment(item.live_in).format('YYYY-M-DD H:mm Z')">
{{ moment(item.live_in).fromNow() }} {{ moment(item.live_in).fromNow() }}
</span> </span>
</div> </div>