mirror of
https://github.com/mikf/gallery-dl.git
synced 2025-02-01 03:51:42 +01:00
[skeb] rename 'data' -> 'file' & add tests
This commit is contained in:
parent
f9a8e8cacf
commit
4cfceb23cb
@ -34,12 +34,12 @@ class SkebExtractor(Extractor):
|
||||
if metadata:
|
||||
post.update(metadata)
|
||||
|
||||
datas = self._get_urls_from_post(response)
|
||||
post["count"] = len(datas)
|
||||
files = self._get_files_from_post(response)
|
||||
post["count"] = len(files)
|
||||
yield Message.Directory, post
|
||||
for post["num"], data in enumerate(datas, 1):
|
||||
post.update(data)
|
||||
url = post["file_url"]
|
||||
for post["num"], file in enumerate(files, 1):
|
||||
post.update(file)
|
||||
url = file["file_url"]
|
||||
yield Message.Url, url, text.nameext_from_url(url, post)
|
||||
|
||||
def posts(self):
|
||||
@ -109,47 +109,48 @@ class SkebExtractor(Extractor):
|
||||
}
|
||||
return resp, post
|
||||
|
||||
def _get_urls_from_post(self, resp):
|
||||
datas = []
|
||||
def _get_files_from_post(self, resp):
|
||||
files = []
|
||||
|
||||
if self.thumbnails and "og_image_url" in resp:
|
||||
data = {}
|
||||
data["content_category"] = "thumb"
|
||||
data["file_id"] = "thumb"
|
||||
data["_file_id"] = str(resp["id"]) + "t"
|
||||
data["file_url"] = resp["og_image_url"]
|
||||
datas.append(data)
|
||||
files.append({
|
||||
"content_category": "thumb",
|
||||
"file_id" : "thumb",
|
||||
"_file_id": str(resp["id"]) + "t",
|
||||
"file_url": resp["og_image_url"],
|
||||
})
|
||||
|
||||
if self.article and "article_image_url" in resp:
|
||||
url = resp["article_image_url"]
|
||||
if url:
|
||||
data = {}
|
||||
data["content_category"] = "article"
|
||||
data["file_id"] = "article"
|
||||
data["_file_id"] = str(resp["id"]) + "a"
|
||||
data["file_url"] = url
|
||||
datas.append(data)
|
||||
files.append({
|
||||
"content_category": "article",
|
||||
"file_id" : "article",
|
||||
"_file_id": str(resp["id"]) + "a",
|
||||
"file_url": url,
|
||||
})
|
||||
|
||||
for preview in resp["previews"]:
|
||||
data = {}
|
||||
data["content_category"] = "preview"
|
||||
data["file_id"] = data["_file_id"] = preview["id"]
|
||||
data["file_url"] = preview["url"]
|
||||
info = preview["information"]
|
||||
data["original"] = {
|
||||
"width" : info["width"],
|
||||
"height" : info["height"],
|
||||
"byte_size" : info["byte_size"],
|
||||
"duration" : info["duration"],
|
||||
"frame_rate": info["frame_rate"],
|
||||
"software" : info["software"],
|
||||
"extension" : info["extension"],
|
||||
"is_movie" : info["is_movie"],
|
||||
"transcoder": info["transcoder"],
|
||||
}
|
||||
datas.append(data)
|
||||
files.append({
|
||||
"content_category": "preview",
|
||||
"file_id" : preview["id"],
|
||||
"_file_id": preview["id"],
|
||||
"file_url": preview["url"],
|
||||
"original": {
|
||||
"width" : info["width"],
|
||||
"height" : info["height"],
|
||||
"byte_size" : info["byte_size"],
|
||||
"duration" : info["duration"],
|
||||
"frame_rate": info["frame_rate"],
|
||||
"software" : info["software"],
|
||||
"extension" : info["extension"],
|
||||
"is_movie" : info["is_movie"],
|
||||
"transcoder": info["transcoder"],
|
||||
},
|
||||
})
|
||||
|
||||
return datas
|
||||
return files
|
||||
|
||||
|
||||
class SkebPostExtractor(SkebExtractor):
|
||||
|
@ -16,6 +16,8 @@ __tests__ = (
|
||||
|
||||
"anonymous" : False,
|
||||
"body" : r"re:はじめまして。私はYouTubeにてVTuberとして活動をしている湊ラ",
|
||||
"count" : 2,
|
||||
"num" : range(1, 2),
|
||||
"client" : {
|
||||
"avatar_url" : r"re:https://pbs.twimg.com/profile_images/\d+/\w+\.jpg",
|
||||
"header_url" : r"re:https://pbs.twimg.com/profile_banners/1375007870291300358/\d+/1500x500",
|
||||
@ -60,6 +62,9 @@ __tests__ = (
|
||||
"#class" : skeb.SkebUserExtractor,
|
||||
"#pattern" : r"https://si\.imgix\.net/\w+/uploads/origins/[\w-]+",
|
||||
"#range" : "1-5",
|
||||
|
||||
"count": int,
|
||||
"num" : int,
|
||||
},
|
||||
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user