Mirrored_Repos/twitch-dl
1
0
Fork 0
mirror of https://github.com/ihabunek/twitch-dl synced 2024-08-30 18:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Calculate progress only when printing progress

Browse Source
This commit is contained in:
Ivan Habunek 2024-04-28 10:13:47 +02:00
parent 9549679679
commit aac450a5bc
No known key found for this signature in database
GPG Key ID: F5F0623FF5EBCB3D
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
twitchdl/progress.py
View File

@ -41,7 +41,6 @@ class Progress:
self.remaining_time: Optional[int] = None self.remaining_time: Optional[int] = None
self.samples: Deque[Sample] = deque(maxlen=1000) self.samples: Deque[Sample] = deque(maxlen=1000)
self.speed: Optional[float] = None self.speed: Optional[float] = None
self.start_time: float = time.time()
self.tasks: Dict[TaskId, Task] = {} self.tasks: Dict[TaskId, Task] = {}
self.vod_count = vod_count self.vod_count = vod_count
self.vod_downloaded_count: int = 0 self.vod_downloaded_count: int = 0
@ -51,8 +50,6 @@ class Progress:
raise ValueError(f"Task {task_id}: cannot start, already started") raise ValueError(f"Task {task_id}: cannot start, already started")
self.tasks[task_id] = Task(task_id, size) self.tasks[task_id] = Task(task_id, size)
self._calculate_total()
self._calculate_progress()
self.print() self.print()
def advance(self, task_id: int, size: int): def advance(self, task_id: int, size: int):
@ -63,7 +60,6 @@ class Progress:
self.progress_bytes += size self.progress_bytes += size
self.tasks[task_id].advance(size) self.tasks[task_id].advance(size)
self.samples.append(Sample(self.downloaded, time.time())) self.samples.append(Sample(self.downloaded, time.time()))
self._calculate_progress()
self.print() self.print()
def already_downloaded(self, task_id: int, size: int): def already_downloaded(self, task_id: int, size: int):
@ -73,8 +69,6 @@ class Progress:
self.tasks[task_id] = Task(task_id, size) self.tasks[task_id] = Task(task_id, size)
self.progress_bytes += size self.progress_bytes += size
self.vod_downloaded_count += 1 self.vod_downloaded_count += 1
self._calculate_total()
self._calculate_progress()
self.print() self.print()
def abort(self, task_id: int): def abort(self, task_id: int):
@ -83,9 +77,6 @@ class Progress:
del self.tasks[task_id] del self.tasks[task_id]
self.progress_bytes = sum(t.downloaded for t in self.tasks.values()) self.progress_bytes = sum(t.downloaded for t in self.tasks.values())
self._calculate_total()
self._calculate_progress()
self.print() self.print()
def end(self, task_id: int): def end(self, task_id: int):
@ -101,12 +92,10 @@ class Progress:
self.vod_downloaded_count += 1 self.vod_downloaded_count += 1
self.print() self.print()
def _calculate_total(self): def _recalculate(self):
self.estimated_total = ( self.estimated_total = (
int(mean(t.size for t in self.tasks.values()) * self.vod_count) if self.tasks else None int(mean(t.size for t in self.tasks.values()) * self.vod_count) if self.tasks else None
) )
def _calculate_progress(self):
self.speed = self._calculate_speed() self.speed = self._calculate_speed()
self.progress_perc = ( self.progress_perc = (
int(100 * self.progress_bytes / self.estimated_total) if self.estimated_total else 0 int(100 * self.progress_bytes / self.estimated_total) if self.estimated_total else 0
@ -136,6 +125,8 @@ class Progress:
if self.last_printed and now - self.last_printed < 0.1: if self.last_printed and now - self.last_printed < 0.1:
return return
self._recalculate()
click.echo(f"\rDownloaded {self.vod_downloaded_count}/{self.vod_count} VODs", nl=False) click.echo(f"\rDownloaded {self.vod_downloaded_count}/{self.vod_count} VODs", nl=False)
click.secho(f" {self.progress_perc}%", fg="blue", nl=False) click.secho(f" {self.progress_perc}%", fg="blue", nl=False)