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

Fixed date reporting.

Browse source
This commit is contained in:
ArabCoders 2023-11-27 13:50:58 +03:00
parent 0d17e2704c
commit b0c7dd8709
5 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/DTO/ItemDTO.py
View file

@ -21,6 +21,7 @@ class ItemDTO:
output_template: str = None output_template: str = None
timestamp: float = time.time_ns() timestamp: float = time.time_ns()
is_live: bool = None is_live: bool = None
datetime: str = None
# yt-dlp injected fields. # yt-dlp injected fields.
tmpfilename: str = None tmpfilename: str = None

5
app/src/DataStore.py
View file

@ -1,4 +1,5 @@
from collections import OrderedDict from collections import OrderedDict
from datetime import datetime
import json import json
import sqlite3 import sqlite3
from src.Utils import calcDownloadPath from src.Utils import calcDownloadPath
@ -58,6 +59,10 @@ class DataStore:
key: str = data.pop('_id') key: str = data.pop('_id')
item: ItemDTO = ItemDTO(**data) item: ItemDTO = ItemDTO(**data)
item._id = key item._id = key
if not item.datetime:
item.datetime = datetime.fromtimestamp(item.timestamp / 1_000_000_000).strftime(
'%Y-%m-%dT%H:%M:%SZ')
items.append((row['id'], item)) items.append((row['id'], item))
return items return items

1
app/src/DownloadQueue.py
View file

@ -104,6 +104,7 @@ class DownloadQueue:
ytdlp_config=ytdlp_config, ytdlp_config=ytdlp_config,
output_template=output_template if output_template else self.config.output_template, output_template=output_template if output_template else self.config.output_template,
error=error, error=error,
datetime=datetime.now(timezone.utc).strftime('%Y-%m-%d %H:%M:%S %z'),
is_live=entry['is_live'] if 'is_live' in entry else None, is_live=entry['is_live'] if 'is_live' in entry else None,
) )

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

@ -85,8 +85,9 @@
</span> </span>
</div> </div>
<div class="column is-4 has-text-centered"> <div class="column is-4 has-text-centered">
<span :data-tooltip="moment(item.timestamp / 1000000).format('MMMM Do YYYY, h:mm:ss a')"> <span :date-datetime="item.datetime"
{{ moment(item.timestamp / 1000000).fromNow() }} :data-tooltip="moment(item.datetime).format('MMMM Do YYYY, h:mm:ss a')">
{{ moment(item.datetime).fromNow() }}
</span> </span>
</div> </div>
<div class="column is-4 has-text-centered"> <div class="column is-4 has-text-centered">
@ -110,7 +111,8 @@
</a> </a>
</div> </div>
<div class="column" v-if="item.filename"> <div class="column" v-if="item.filename">
<a class="button is-fullwidth is-primary" :href="makeDownload(config, item)" :download="item.filename?.split('/').reverse()[0]"> <a class="button is-fullwidth is-primary" :href="makeDownload(config, item)"
:download="item.filename?.split('/').reverse()[0]">
<span class="icon-text"> <span class="icon-text">
<span class="icon"> <span class="icon">
<i class="fa-solid fa-download"></i> <i class="fa-solid fa-download"></i>

5
frontend/src/components/Page-Downloading.vue
View file

@ -53,8 +53,9 @@
</span> </span>
</div> </div>
<div class="column is-4 has-text-centered"> <div class="column is-4 has-text-centered">
<span :data-tooltip="moment(item.timestamp / 1000000).format('MMMM Do YYYY, h:mm:ss a')"> <span :data-datetime="item.datetime"
{{ moment(item.timestamp / 1000000).fromNow() }} :data-tooltip="moment(item.datetime).format('MMMM Do YYYY, h:mm:ss a')">
{{ moment(item.datetime).fromNow() }}
</span> </span>
</div> </div>
<div class="column is-4 has-text-centered"> <div class="column is-4 has-text-centered">