Skip to content

Commit 54f91c0

Browse files
committed
formatting with black and isort
1 parent df25201 commit 54f91c0

File tree

3 files changed

+29
-20
lines changed

3 files changed

+29
-20
lines changed

bdfr/__main__.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
click.option("-t", "--time", type=click.Choice(("all", "hour", "day", "week", "month", "year")), default=None),
4242
click.option("-u", "--user", type=str, multiple=True, default=None),
4343
click.option("-v", "--verbose", default=None, count=True),
44-
click.option('--progress-bar', is_flag=True, default=False),
44+
click.option("--progress-bar", is_flag=True, default=False),
4545
]
4646

4747
_downloader_options = [
@@ -123,7 +123,7 @@ def cli_archive(context: click.Context, **_):
123123
def cli_clone(context: click.Context, **_):
124124
config = Configuration()
125125
config.process_click_arguments(context)
126-
setup_logging(config.verbose, config.progress_bar),
126+
setup_logging(config.verbose, config.progress_bar),
127127
try:
128128
reddit_scraper = RedditCloner(config)
129129
reddit_scraper.download()
@@ -142,13 +142,13 @@ def filter(self, record: logging.LogRecord) -> bool:
142142

143143
if progress_bar:
144144
logger.setLevel(logging.CRITICAL)
145-
logging.getLogger('progress_bar').setLevel(logging.INFO)
145+
logging.getLogger("progress_bar").setLevel(logging.INFO)
146146
else:
147147
logger.setLevel(1)
148148
stream = logging.StreamHandler(sys.stdout)
149149
stream.addFilter(StreamExceptionFilter())
150150

151-
formatter = logging.Formatter('[%(asctime)s - %(name)s - %(levelname)s] - %(message)s')
151+
formatter = logging.Formatter("[%(asctime)s - %(name)s - %(levelname)s] - %(message)s")
152152
stream.setFormatter(formatter)
153153

154154
logger.addHandler(stream)
@@ -159,11 +159,11 @@ def filter(self, record: logging.LogRecord) -> bool:
159159
else:
160160
stream.setLevel(9)
161161

162-
logging.getLogger('progress_bar').setLevel(logging.CRITICAL)
162+
logging.getLogger("progress_bar").setLevel(logging.CRITICAL)
163163

164-
logging.getLogger('praw').setLevel(logging.CRITICAL)
165-
logging.getLogger('prawcore').setLevel(logging.CRITICAL)
166-
logging.getLogger('urllib3').setLevel(logging.CRITICAL)
164+
logging.getLogger("praw").setLevel(logging.CRITICAL)
165+
logging.getLogger("prawcore").setLevel(logging.CRITICAL)
166+
logging.getLogger("urllib3").setLevel(logging.CRITICAL)
167167

168168

169169
if __name__ == "__main__":

bdfr/downloader.py

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,22 @@
99
from datetime import datetime
1010
from multiprocessing import Pool
1111
from pathlib import Path
12-
from tqdm import tqdm
13-
from tqdm.contrib.logging import logging_redirect_tqdm
1412

1513
import praw
1614
import praw.exceptions
1715
import praw.models
1816
import prawcore
17+
from tqdm import tqdm
18+
from tqdm.contrib.logging import logging_redirect_tqdm
1919

2020
from bdfr import exceptions as errors
2121
from bdfr.configuration import Configuration
2222
from bdfr.connector import RedditConnector
2323
from bdfr.site_downloaders.download_factory import DownloadFactory
2424

2525
logger = logging.getLogger(__name__)
26-
logger_progress_bar = logging.getLogger('progress_bar')
26+
logger_progress_bar = logging.getLogger("progress_bar")
27+
2728

2829
def _calc_hash(existing_file: Path):
2930
chunk_size = 1024 * 1024
@@ -36,6 +37,7 @@ def _calc_hash(existing_file: Path):
3637
file_hash = md5_hash.hexdigest()
3738
return existing_file, file_hash
3839

40+
3941
class RedditDownloader(RedditConnector):
4042
def __init__(self, args: Configuration):
4143
super(RedditDownloader, self).__init__(args)
@@ -48,23 +50,23 @@ def download(self):
4850
for generator in tqdm(self.reddit_lists, desc="Subreddits", unit="subreddit", colour="red"):
4951
desc = generator.url if isinstance(generator, praw.models.ListingGenerator) else "Posts"
5052
for submission in tqdm(list(generator), desc=desc, unit="post", colour="green", leave=False):
51-
title_short = submission.title[:60] + (submission.title[60:] and '...')
52-
log_str = f'{submission.score:5d}🔼 {title_short}'
53+
title_short = submission.title[:60] + (submission.title[60:] and "...")
54+
log_str = f"{submission.score:5d}🔼 {title_short}"
5355
try:
5456
if self._download_submission(submission):
55-
logger_progress_bar.info(f'{log_str}')
57+
logger_progress_bar.info(f"{log_str}")
5658
else:
57-
logger_progress_bar.info(f'{log_str}')
59+
logger_progress_bar.info(f"{log_str}")
5860
except prawcore.PrawcoreException as e:
59-
logger.error(f'Submission {submission.id} failed to download due to a PRAW exception: {e}')
60-
logger_progress_bar.info(f'{log_str}')
61+
logger.error(f"Submission {submission.id} failed to download due to a PRAW exception: {e}")
62+
logger_progress_bar.info(f"{log_str}")
6163
else:
6264
for generator in self.reddit_lists:
6365
for submission in generator:
6466
try:
6567
self._download_submission(submission)
6668
except prawcore.PrawcoreException as e:
67-
logger.error(f'Submission {submission.id} failed to download due to a PRAW exception: {e}')
69+
logger.error(f"Submission {submission.id} failed to download due to a PRAW exception: {e}")
6870

6971
def _download_submission(self, submission: praw.models.Submission):
7072
if submission.id in self.excluded_submission_ids:
@@ -163,7 +165,9 @@ def _download_submission(self, submission: praw.models.Submission):
163165
self.master_hash_list[resource_hash] = destination
164166
logger.debug(f"Hash added to master list: {resource_hash}")
165167
logger.info(f"Downloaded submission {submission.id} from {submission.subreddit.display_name}")
166-
logger_progress_bar.info(f"✓ {submission.subreddit.display_name} ({submission.score}) {submission.title} - {submission.author}")
168+
logger_progress_bar.info(
169+
f"✓ {submission.subreddit.display_name} ({submission.score}) {submission.title} - {submission.author}"
170+
)
167171
return True
168172

169173
@staticmethod

setup.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@
33

44
from setuptools import setup
55

6-
setup(setup_requires=['pbr', 'appdirs'], pbr=True, data_files=[('config', ['bdfr/default_config.cfg'])], python_requires='>=3.9.0')
6+
setup(
7+
setup_requires=["pbr", "appdirs"],
8+
pbr=True,
9+
data_files=[("config", ["bdfr/default_config.cfg"])],
10+
python_requires=">=3.9.0",
11+
)

0 commit comments

Comments
 (0)