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

[blogger] split 'search' extractor (#2930)

Browse Source
This commit is contained in:
Mike Fährmann
2022-09-19 20:45:58 +02:00
parent 64202dd012
commit eef50c1f28
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gallery_dl/extractor/blogger.py
View File

@@ -173,13 +173,28 @@ class BloggerBlogExtractor(BloggerExtractor):
class BloggerSearchExtractor(BloggerExtractor):
"""Extractor for search resuls and labels"""
"""Extractor for Blogger search resuls"""
subcategory = "search"
pattern = BASE_PATTERN + r"/search(?:/?\?q=([^/?#]+)|/label/([^/?#]+))"
pattern = BASE_PATTERN + r"/search/?\?q=([^&#]+)"
test = (
("https://julianbphotography.blogspot.com/search?q=400mm", {
"count": "< 10"
}),
)
def __init__(self, match):
BloggerExtractor.__init__(self, match)
self.query = text.unquote(match.group(3))
def posts(self, blog):
return self.api.blog_search(blog["id"], self.query)
class BloggerLabelExtractor(BloggerExtractor):
"""Extractor for Blogger posts by label"""
subcategory = "label"
pattern = BASE_PATTERN + r"/search/label/([^/?#]+)"
test = (
("https://dmmagazine.blogspot.com/search/label/D%26D", {
"range": "1-25",
"count": 25,
@@ -188,16 +203,10 @@ class BloggerSearchExtractor(BloggerExtractor):
def __init__(self, match):
BloggerExtractor.__init__(self, match)
query = match.group(3)
if query:
self.query, self.label = query, None
else:
self.query, self.label = None, match.group(4)
self.label = text.unquote(match.group(3))
def posts(self, blog):
if self.query:
return self.api.blog_search(blog["id"], text.unquote(self.query))
return self.api.blog_posts(blog["id"], text.unquote(self.label))
return self.api.blog_posts(blog["id"], self.label)
class BloggerAPI():