github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify extractor constants

Browse Source 
- single strings for URL patterns
- tuples instead of lists for 'directory_fmt' and 'test'
- single-tuple tests where applicable
This commit is contained in:
Mike Fährmann
2019-02-08 13:45:40 +01:00
parent 34bab080ae
commit 6284731107
84 changed files with 1080 additions and 1108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gallery_dl/extractor/3dbooru.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2015-2018 Mike Fährmann
# Copyright 2015-2019 Mike Fährmann
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
@@ -29,29 +29,29 @@ class ThreedeebooruExtractor(booru.MoebooruPageMixin, booru.BooruExtractor):
class ThreedeebooruTagExtractor(booru.TagMixin,
ThreedeebooruExtractor):
"""Extractor for images from behoimi.org based on search-tags"""
pattern = [r"(?:https?://)?(?:www\.)?behoimi\.org/post"
r"(?:/(?:index)?)?\?tags=(?P<tags>[^&#]+)"]
test = [("http://behoimi.org/post?tags=himekawa_azuru+dress", {
pattern = (r"(?:https?://)?(?:www\.)?behoimi\.org/post"
r"(?:/(?:index)?)?\?tags=(?P<tags>[^&#]+)")
test = ("http://behoimi.org/post?tags=himekawa_azuru+dress", {
"url": "ecb30c6aaaf8a6ff8f55255737a9840832a483c1",
"content": "11cbda40c287e026c1ce4ca430810f761f2d0b2a",
})]
})
class ThreedeebooruPoolExtractor(booru.PoolMixin,
ThreedeebooruExtractor):
"""Extractor for image-pools from behoimi.org"""
pattern = [r"(?:https?://)?(?:www\.)?behoimi\.org/pool/show/(?P<pool>\d+)"]
test = [("http://behoimi.org/pool/show/27", {
pattern = r"(?:https?://)?(?:www\.)?behoimi\.org/pool/show/(?P<pool>\d+)"
test = ("http://behoimi.org/pool/show/27", {
"url": "da75d2d1475449d5ef0c266cb612683b110a30f2",
"content": "fd5b37c5c6c2de4b4d6f1facffdefa1e28176554",
})]
})
class ThreedeebooruPostExtractor(booru.PostMixin,
ThreedeebooruExtractor):
"""Extractor for single images from behoimi.org"""
pattern = [r"(?:https?://)?(?:www\.)?behoimi\.org/post/show/(?P<post>\d+)"]
test = [("http://behoimi.org/post/show/140852", {
pattern = r"(?:https?://)?(?:www\.)?behoimi\.org/post/show/(?P<post>\d+)"
test = ("http://behoimi.org/post/show/140852", {
"url": "ce874ea26f01d6c94795f3cc3aaaaa9bc325f2f6",
"content": "26549d55b82aa9a6c1686b96af8bfcfa50805cd4",
"options": (("tags", True),),
@@ -61,19 +61,19 @@ class ThreedeebooruPostExtractor(booru.PostMixin,
"tags_model": "himekawa_azuru",
"tags_general": str,
},
})]
})
class ThreedeebooruPopularExtractor(booru.MoebooruPopularMixin,
ThreedeebooruExtractor):
"""Extractor for popular images from behoimi.org"""
pattern = [r"(?:https?://)?(?:www\.)?behoimi\.org"
pattern = (r"(?:https?://)?(?:www\.)?behoimi\.org"
r"/post/popular_(?P<scale>by_(?:day|week|month)|recent)"
r"(?:\?(?P<query>[^#]*))?"]
test = [("http://behoimi.org/post/popular_by_month?month=2&year=2013", {
r"(?:\?(?P<query>[^#]*))?")
test = ("http://behoimi.org/post/popular_by_month?month=2&year=2013", {
"url": "a447e115fdab60c25ab71c4fdb1b9f509bc23f99",
"count": 20,
})]
})
def __init__(self, match):
super().__init__(match)