diff --git a/bdfr/site_downloaders/download_factory.py b/bdfr/site_downloaders/download_factory.py index 2c7ef21..f6f4895 100644 --- a/bdfr/site_downloaders/download_factory.py +++ b/bdfr/site_downloaders/download_factory.py @@ -18,7 +18,7 @@ from bdfr.site_downloaders.redgifs import Redgifs from bdfr.site_downloaders.self_post import SelfPost from bdfr.site_downloaders.vidble import Vidble from bdfr.site_downloaders.youtube import Youtube -from bdfr.site_downloaders.vreddit import vreddit +from bdfr.site_downloaders.vreddit import Vreddit class DownloadFactory: @@ -49,7 +49,7 @@ class DownloadFactory: elif re.match(r'i\.redd\.it.*', sanitised_url): return Direct elif re.match(r'v\.redd\.it.*', sanitised_url): - return vreddit + return Vreddit elif re.match(r'pornhub\.com.*', sanitised_url): return PornHub elif re.match(r'vidble\.com', sanitised_url): diff --git a/bdfr/site_downloaders/vreddit.py b/bdfr/site_downloaders/vreddit.py index 945ee93..b1117a0 100644 --- a/bdfr/site_downloaders/vreddit.py +++ b/bdfr/site_downloaders/vreddit.py @@ -16,7 +16,7 @@ from bdfr.site_downloaders.base_downloader import BaseDownloader logger = logging.getLogger(__name__) -class vreddit(BaseDownloader): +class Vreddit(BaseDownloader): def __init__(self, post: Submission): super().__init__(post) diff --git a/tests/site_downloaders/test_download_factory.py b/tests/site_downloaders/test_download_factory.py index 134396c..b66d17b 100644 --- a/tests/site_downloaders/test_download_factory.py +++ b/tests/site_downloaders/test_download_factory.py @@ -17,6 +17,7 @@ from bdfr.site_downloaders.pornhub import PornHub from bdfr.site_downloaders.redgifs import Redgifs from bdfr.site_downloaders.self_post import SelfPost from bdfr.site_downloaders.youtube import Youtube +from bdfr.site_downloaders.vreddit import Vreddit @pytest.mark.online @@ -48,6 +49,7 @@ from bdfr.site_downloaders.youtube import Youtube ('http://video.pbs.org/viralplayer/2365173446/', YtdlpFallback), ('https://www.pornhub.com/view_video.php?viewkey=ph5a2ee0461a8d0', PornHub), ('https://www.patreon.com/posts/minecart-track-59346560', Gallery), + ('https://v.redd.it/9z1dnk3xr5k61', Vreddit) )) def test_factory_lever_good(test_submission_url: str, expected_class: BaseDownloader, reddit_instance: praw.Reddit): result = DownloadFactory.pull_lever(test_submission_url) diff --git a/tests/site_downloaders/test_vreddit.py b/tests/site_downloaders/test_vreddit.py new file mode 100644 index 0000000..65428b5 --- /dev/null +++ b/tests/site_downloaders/test_vreddit.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python3 +# coding=utf-8 + +from unittest.mock import MagicMock + +import pytest + +from bdfr.exceptions import NotADownloadableLinkError +from bdfr.resource import Resource +from bdfr.site_downloaders.vreddit import Vreddit + + +@pytest.mark.online +@pytest.mark.slow +@pytest.mark.parametrize(('test_url', 'expected_hash'), ( + ('https://www.reddit.com/user/Xomb_Forever/comments/u5p2kj/hold_up/', '690cffe27a7884196437926c22897216'), +)) +def test_find_resources_good(test_url: str, expected_hash: str): + test_submission = MagicMock() + test_submission.url = test_url + downloader = Vreddit(test_submission) + resources = downloader.find_resources() + assert len(resources) == 1 + assert isinstance(resources[0], Resource) + resources[0].download() + assert resources[0].hash.hexdigest() == expected_hash + + +@pytest.mark.online +@pytest.mark.parametrize('test_url', ( + 'https://www.polygon.com/disney-plus/2020/5/14/21249881/gargoyles-animated-series-disney-plus-greg-weisman' + '-interview-oj-simpson-goliath-chronicles', +)) +def test_find_resources_bad(test_url: str): + test_submission = MagicMock() + test_submission.url = test_url + downloader = Vreddit(test_submission) + with pytest.raises(NotADownloadableLinkError): + downloader.find_resources()