From 3a093d08443df2a1cdeabc6a2b37ade524ce82c4 Mon Sep 17 00:00:00 2001
From: Serene-Arc <serenical@gmail.com>
Date: Mon, 15 Mar 2021 14:00:21 +1000
Subject: [PATCH] Add shortcut in download for certain errors

---
 bulkredditdownloader/downloader.py             | 7 ++++++-
 bulkredditdownloader/resource.py               | 3 +++
 bulkredditdownloader/tests/test_integration.py | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/bulkredditdownloader/downloader.py b/bulkredditdownloader/downloader.py
index 67c481a..de1e921 100644
--- a/bulkredditdownloader/downloader.py
+++ b/bulkredditdownloader/downloader.py
@@ -335,7 +335,12 @@ class RedditDownloader:
             if destination.exists():
                 logger.warning(f'File already exists: {destination}')
             else:
-                res.download()
+                try:
+                    res.download()
+                except errors.BulkDownloaderException:
+                    logger.error(
+                        f'Failed to download resource from {res.url} with downloader {downloader_class.__name__}')
+                    return
                 if res.hash.hexdigest() in self.master_hash_list and self.args.no_dupes:
                     logger.warning(f'Resource from "{res.url}" and hash "{res.hash.hexdigest()}" downloaded elsewhere')
                 else:
diff --git a/bulkredditdownloader/resource.py b/bulkredditdownloader/resource.py
index a93cc0c..af39554 100644
--- a/bulkredditdownloader/resource.py
+++ b/bulkredditdownloader/resource.py
@@ -32,6 +32,9 @@ class Resource:
             response = requests.get(url)
             if response.status_code == 200:
                 return response.content
+            elif response.status_code in (301, 401, 403, 404):
+                logger.error(f'Unrecoverable error requesting resource: HTTP Code {response.status_code}')
+                return None
             else:
                 raise requests.exceptions.ConnectionError
         except requests.exceptions.ConnectionError:
diff --git a/bulkredditdownloader/tests/test_integration.py b/bulkredditdownloader/tests/test_integration.py
index dab80c8..600e983 100644
--- a/bulkredditdownloader/tests/test_integration.py
+++ b/bulkredditdownloader/tests/test_integration.py
@@ -22,6 +22,8 @@ from bulkredditdownloader.__main__ import cli
     ['-s', 'r/TrollXChromosomes/', '-L', 1],
     ['-s', 'TrollXChromosomes/', '-L', 1],
     ['-s', 'trollxchromosomes', '-L', 1],
+    ['-s', 'trollxchromosomes,mindustry,python', '-L', 1],
+    ['-s', 'trollxchromosomes, mindustry, python', '-L', 1],
     ['-s', 'trollxchromosomes', '-L', 1, '--time', 'day'],
     ['-s', 'trollxchromosomes', '-L', 1, '--sort', 'new'],
     ['-s', 'trollxchromosomes', '-L', 1, '--time', 'day', '--sort', 'new'],
@@ -46,13 +48,13 @@ def test_cli_download_subreddits(test_args: list[str], tmp_path: Path):
     ['-l', 'https://www.reddit.com/r/TrollXChromosomes/comments/m2601g/its_a_step_in_the_right_direction/'],
     ['-l', 'm3hxzd'],  # Really long title used to overflow filename limit
     ['-l', 'm3kua3'],  # Has a deleted user
+    ['-l', 'm5bqkf'],  # Resource leading to a 404
 ))
 def test_cli_download_links(test_args: list[str], tmp_path: Path):
     runner = CliRunner()
     test_args = ['download', str(tmp_path), '-v', '--config', 'test_config.cfg'] + test_args
     result = runner.invoke(cli, test_args)
     assert result.exit_code == 0
-    assert len(list(tmp_path.iterdir())) == 1
 
 
 @pytest.mark.online