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

fixed minor display issue

Browse source
This commit is contained in:
ArabCoders 2023-12-31 16:05:35 +03:00
parent 83a2d8628b
commit 0297258405
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/Download.py
View file

@ -9,6 +9,7 @@ import shutil
import yt_dlp import yt_dlp
from src.Utils import get_format, get_opts, jsonCookie, mergeConfig from src.Utils import get_format, get_opts, jsonCookie, mergeConfig
from src.DTO.ItemDTO import ItemDTO from src.DTO.ItemDTO import ItemDTO
from src.Notifier import Notifier
log = logging.getLogger('download') log = logging.getLogger('download')
@ -25,7 +26,7 @@ class Download:
default_ytdl_opts: dict = None default_ytdl_opts: dict = None
debug: bool = False debug: bool = False
tempPath: str = None tempPath: str = None
notifier: Notifier = None
_ytdlp_fields: tuple = ( _ytdlp_fields: tuple = (
'tmpfilename', 'tmpfilename',
'filename', 'filename',
@ -146,15 +147,15 @@ class Download:
logging.debug(f'Deleting Temp directory: {self.tempPath}') logging.debug(f'Deleting Temp directory: {self.tempPath}')
shutil.rmtree(self.tempPath, ignore_errors=True) shutil.rmtree(self.tempPath, ignore_errors=True)
async def start(self, notifier): async def start(self, notifier: Notifier):
if self.manager is None: if self.manager is None:
self.manager = multiprocessing.Manager() self.manager = multiprocessing.Manager()
self.status_queue = self.manager.Queue() self.status_queue = self.manager.Queue()
self.proc = multiprocessing.Process(target=self._download)
self.proc.start()
self.loop = asyncio.get_running_loop() self.loop = asyncio.get_running_loop()
self.notifier = notifier self.notifier = notifier
self.proc = multiprocessing.Process(target=self._download)
self.proc.start()
self.info.status = 'preparing' self.info.status = 'preparing'
await self.notifier.updated(self.info) await self.notifier.updated(self.info)
asyncio.create_task(self.update_status()) asyncio.create_task(self.update_status())
@ -198,13 +199,16 @@ class Download:
self.info.status = status['status'] self.info.status = status['status']
self.info.msg = status.get('msg') self.info.msg = status.get('msg')
if 'error' == self.info.status:
self.info.error = status.get('msg')
if 'downloaded_bytes' in status: if 'downloaded_bytes' in status:
total = status.get('total_bytes') or status.get( total = status.get('total_bytes') or status.get(
'total_bytes_estimate') 'total_bytes_estimate')
if total: if total:
self.info.percent = status['downloaded_bytes'] / \ perc = status['downloaded_bytes'] / total * 100
total * 100 self.info.percent = perc
self.info.total_bytes = total
self.info.speed = status.get('speed') self.info.speed = status.get('speed')
self.info.eta = status.get('eta') self.info.eta = status.get('eta')

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

@ -82,7 +82,7 @@
<div class="column is-12" v-if="item.error"> <div class="column is-12" v-if="item.error">
<span class="has-text-danger">{{ item.error }}</span> <span class="has-text-danger">{{ item.error }}</span>
</div> </div>
<div class="column is-12" v-if="item.msg !== ''"> <div class="column is-12" v-if="!item.error && item.msg && item.msg.length() > 0">
<span class="has-text-danger">{{ item.msg }}</span> <span class="has-text-danger">{{ item.msg }}</span>
</div> </div>
<div class="column is-4 has-text-centered" v-if="!item.live_in"> <div class="column is-4 has-text-centered" v-if="!item.live_in">