From da6789b2b03df95f194128d153f66f675a1ca363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 10 Nov 2019 17:03:38 +0100 Subject: [PATCH] disable unique archive id checks for some tests - same image twice in a livedoor blog post - unreliable results for related pinterest items --- CHANGELOG.md | 2 ++ gallery_dl/extractor/livedoor.py | 1 + gallery_dl/extractor/pinterest.py | 10 ++++++---- gallery_dl/version.py | 2 +- test/test_results.py | 9 ++++++--- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b6981e9..7f840d2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## Unreleased + ## 1.11.1 - 2019-11-09 ### Fixes - Fix inclusion of bash completion and man pages in source distributions diff --git a/gallery_dl/extractor/livedoor.py b/gallery_dl/extractor/livedoor.py index e922f61b..c5fbf818 100644 --- a/gallery_dl/extractor/livedoor.py +++ b/gallery_dl/extractor/livedoor.py @@ -89,6 +89,7 @@ class LivedoorBlogExtractor(LivedoorExtractor): ("http://blog.livedoor.jp/zatsu_ke/", { "range": "1-50", "count": 50, + "archive": False, "pattern": r"https?://livedoor.blogimg.jp/\w+/imgs/\w/\w/\w+\.\w+", "keyword": { "post": { diff --git a/gallery_dl/extractor/pinterest.py b/gallery_dl/extractor/pinterest.py index e36a82bf..912e4678 100644 --- a/gallery_dl/extractor/pinterest.py +++ b/gallery_dl/extractor/pinterest.py @@ -119,8 +119,9 @@ class PinterestRelatedPinExtractor(PinterestPinExtractor): directory_fmt = ("{category}", "related {original_pin[id]}") pattern = BASE_PATTERN + r"/pin/([^/?#&]+).*#related$" test = ("https://www.pinterest.com/pin/858146903966145189/#related", { - "range": "31-50", - "count": 20, + "range": "31-70", + "count": 40, + "archive": False, }) def metadata(self): @@ -138,8 +139,9 @@ class PinterestRelatedBoardExtractor(PinterestBoardExtractor): "{board[name]}", "related") pattern = BASE_PATTERN + r"/(?!pin/)([^/?#&]+)/([^/?#&]+).*#related$" test = ("https://www.pinterest.com/g1952849/test-/#related", { - "range": "31-50", - "count": 20, + "range": "31-70", + "count": 40, + "archive": False, }) def pins(self): diff --git a/gallery_dl/version.py b/gallery_dl/version.py index 4d73139d..24b2f917 100644 --- a/gallery_dl/version.py +++ b/gallery_dl/version.py @@ -6,4 +6,4 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -__version__ = "1.11.1" +__version__ = "1.11.2-dev" diff --git a/test/test_results.py b/test/test_results.py index 6d628c30..b0f07a4d 100644 --- a/test/test_results.py +++ b/test/test_results.py @@ -27,7 +27,6 @@ TRAVIS_SKIP = { # temporary issues, etc. BROKEN = { "hentaifox", - "livedoor", "mangapark", "yaplog", } @@ -85,8 +84,12 @@ class TestExtractorResults(unittest.TestCase): self.skipTest(exc) raise - # test archive-id uniqueness - self.assertEqual(len(set(tjob.archive_list)), len(tjob.archive_list)) + if result.get("archive", True): + self.assertEqual( + len(set(tjob.archive_list)), + len(tjob.archive_list), + "archive-id uniqueness", + ) if tjob.queue: # test '_extractor' entries