mirror of
https://github.com/ihabunek/twitch-dl
synced 2024-08-30 18:32:25 +00:00
c8a6d67822
Instead of calculating the average speed for the whole download, consider only the last 100 chunks.
138 lines
4.3 KiB
Python
138 lines
4.3 KiB
Python
import logging
|
|
import time
|
|
|
|
from collections import deque
|
|
from dataclasses import dataclass, field
|
|
from statistics import mean
|
|
from typing import Dict, NamedTuple, Optional, Deque
|
|
|
|
from twitchdl.output import print_out
|
|
from twitchdl.utils import format_size, format_time
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
TaskId = int
|
|
|
|
|
|
@dataclass
|
|
class Task:
|
|
id: TaskId
|
|
size: int
|
|
downloaded: int = 0
|
|
|
|
def advance(self, size):
|
|
self.downloaded += size
|
|
|
|
|
|
class Sample(NamedTuple):
|
|
downloaded: int
|
|
timestamp: float
|
|
|
|
|
|
@dataclass
|
|
class Progress:
|
|
vod_count: int
|
|
downloaded: int = 0
|
|
estimated_total: Optional[int] = None
|
|
last_printed: float = field(default_factory=time.time)
|
|
progress_bytes: int = 0
|
|
progress_perc: int = 0
|
|
remaining_time: Optional[int] = None
|
|
speed: Optional[float] = None
|
|
start_time: float = field(default_factory=time.time)
|
|
tasks: Dict[TaskId, Task] = field(default_factory=dict)
|
|
vod_downloaded_count: int = 0
|
|
samples: Deque[Sample] = field(default_factory=lambda: deque(maxlen=100))
|
|
|
|
def start(self, task_id: int, size: int):
|
|
if task_id in self.tasks:
|
|
raise ValueError(f"Task {task_id}: cannot start, already started")
|
|
|
|
self.tasks[task_id] = Task(task_id, size)
|
|
self._calculate_total()
|
|
self._calculate_progress()
|
|
self.print()
|
|
|
|
def advance(self, task_id: int, size: int):
|
|
if task_id not in self.tasks:
|
|
raise ValueError(f"Task {task_id}: cannot advance, not started")
|
|
|
|
self.downloaded += size
|
|
self.progress_bytes += size
|
|
self.tasks[task_id].advance(size)
|
|
self.samples.append(Sample(self.downloaded, time.time()))
|
|
self._calculate_progress()
|
|
self.print()
|
|
|
|
def already_downloaded(self, task_id: int, size: int):
|
|
if task_id in self.tasks:
|
|
raise ValueError(f"Task {task_id}: cannot mark as downloaded, already started")
|
|
|
|
self.tasks[task_id] = Task(task_id, size)
|
|
self.progress_bytes += size
|
|
self.vod_downloaded_count += 1
|
|
self._calculate_total()
|
|
self._calculate_progress()
|
|
self.print()
|
|
|
|
def abort(self, task_id: int):
|
|
if task_id not in self.tasks:
|
|
raise ValueError(f"Task {task_id}: cannot abort, not started")
|
|
|
|
del self.tasks[task_id]
|
|
self.progress_bytes = sum(t.downloaded for t in self.tasks.values())
|
|
|
|
self._calculate_total()
|
|
self._calculate_progress()
|
|
self.print()
|
|
|
|
def end(self, task_id: int):
|
|
if task_id not in self.tasks:
|
|
raise ValueError(f"Task {task_id}: cannot end, not started")
|
|
|
|
task = self.tasks[task_id]
|
|
if task.size != task.downloaded:
|
|
logger.warn(f"Taks {task_id} ended with {task.downloaded}b downloaded, expected {task.size}b.")
|
|
|
|
self.vod_downloaded_count += 1
|
|
self.print()
|
|
|
|
def _calculate_total(self):
|
|
self.estimated_total = 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.progress_perc = int(100 * self.progress_bytes / self.estimated_total) if self.estimated_total else 0
|
|
self.remaining_time = int((self.estimated_total - self.progress_bytes) / self.speed) if self.estimated_total and self.speed else None
|
|
|
|
def _calculate_speed(self):
|
|
if len(self.samples) < 2:
|
|
return None
|
|
|
|
first_sample = self.samples[0]
|
|
last_sample = self.samples[-1]
|
|
|
|
size = last_sample.downloaded - first_sample.downloaded
|
|
duration = last_sample.timestamp - first_sample.timestamp
|
|
|
|
return size / duration
|
|
|
|
def print(self):
|
|
now = time.time()
|
|
|
|
# Don't print more often than 10 times per second
|
|
if now - self.last_printed < 0.1:
|
|
return
|
|
|
|
progress = " ".join([
|
|
f"Downloaded {self.vod_downloaded_count}/{self.vod_count} VODs",
|
|
f"<blue>{self.progress_perc}%</blue>",
|
|
f"of <blue>~{format_size(self.estimated_total)}</blue>" if self.estimated_total else "",
|
|
f"at <blue>{format_size(self.speed)}/s</blue>" if self.speed else "",
|
|
f"ETA <blue>{format_time(self.remaining_time)}</blue>" if self.remaining_time is not None else "",
|
|
])
|
|
|
|
print_out(f"\r{progress} ", end="")
|
|
self.last_printed = now
|