Now incrementing _files_downloaded happens when _progress_callback is set. And made super() with no args.
This commit is contained in:
parent
e7cf2e7c4b
commit
2f9d26427c
@ -7,13 +7,14 @@ from multiprocessing.pool import ThreadPool
|
||||
from scrapthechan.scraper import Scraper
|
||||
from scrapthechan.fileinfo import FileInfo
|
||||
|
||||
|
||||
__all__ = ["ThreadedScraper"]
|
||||
|
||||
|
||||
class ThreadedScraper(Scraper):
|
||||
def __init__(self, save_directory: str, files: List[FileInfo],
|
||||
download_progress_callback: Callable[[int], None] = None) -> None:
|
||||
super(ThreadedScraper, self).__init__(save_directory, files,
|
||||
download_progress_callback)
|
||||
super().__init__(save_directory, files, download_progress_callback)
|
||||
self._files_downloaded = 0
|
||||
self._files_downloaded_mutex = Lock()
|
||||
|
||||
@ -24,8 +25,8 @@ class ThreadedScraper(Scraper):
|
||||
pool.join()
|
||||
|
||||
def _thread_run(self, f: FileInfo):
|
||||
if not self._progress_callback is None:
|
||||
with self._files_downloaded_mutex:
|
||||
self._files_downloaded += 1
|
||||
if not self._progress_callback is None:
|
||||
self._progress_callback(self._files_downloaded)
|
||||
self._download_file(f)
|
||||
|
Loading…
Reference in New Issue
Block a user