From b26152f3ca6351c32289485d1109d50822733471 Mon Sep 17 00:00:00 2001 From: "Alexander \"Arav\" Andreev" Date: Mon, 20 Jul 2020 04:31:27 +0400 Subject: [PATCH] Moved User-Agent off to __init__ in its own variable. --- scrapthechan/__init__.py | 3 +++ scrapthechan/scraper.py | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scrapthechan/__init__.py b/scrapthechan/__init__.py index 9193b0c..be09bf8 100644 --- a/scrapthechan/__init__.py +++ b/scrapthechan/__init__.py @@ -8,6 +8,9 @@ __license__ = \ For a copy see COPYING file in a directory of the program, or see """ + +USER_AGENT = f"ScrapTheChan/{__version__}" + VERSION = \ f"ScrapTheChan ver. {__version__} ({__date__})\n{__copyright__}\n"\ f"\n{__license__}" diff --git a/scrapthechan/scraper.py b/scrapthechan/scraper.py index fc0a014..bacc8ff 100644 --- a/scrapthechan/scraper.py +++ b/scrapthechan/scraper.py @@ -1,4 +1,4 @@ -"""Base Scraper implementation.""" +"""Base class for all scrapers that will actually do the job.""" from base64 import b64encode from os import remove, stat @@ -8,14 +8,14 @@ from typing import List, Callable from urllib.request import urlretrieve, URLopener import hashlib -from scrapthechan import __version__ +from scrapthechan import USER_AGENT from scrapthechan.fileinfo import FileInfo __all__ = ["Scraper"] class Scraper: - """Base scraper implementation. + """Base class for all scrapers that will actually do the job. Arguments: save_directory -- a path to a directory where file will be @@ -29,7 +29,7 @@ class Scraper: self._save_directory = save_directory self._files = files self._url_opener = URLopener() - self._url_opener.version = f"ScrapTheChan/{__version__}" + self._url_opener.version = USER_AGENT self._progress_callback = download_progress_callback def run(self):