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

fix 'keywords' in extractor tests (#3491)

Browse Source
This commit is contained in:
Mike Fährmann
2023-01-03 15:14:23 +01:00
parent 3f29b8fe91
commit ed2d715019
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gallery_dl/extractor/gelbooru.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2014-2022 Mike Fährmann
# Copyright 2014-2023 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
@@ -195,7 +195,7 @@ class GelbooruPostExtractor(GelbooruBase,
# notes
("https://gelbooru.com/index.php?page=post&s=view&id=5997331", {
"options": (("notes", True),),
"keywords": {
"keyword": {
"notes": [
{
"body": "Look over this way when you talk~",

4
gallery_dl/extractor/nitter.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2022 Mike Fährmann
# Copyright 2022-2023 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
@@ -451,7 +451,7 @@ class NitterTweetExtractor(NitterExtractor):
}),
# age-restricted (#2354)
("https://nitter.unixfox.eu/mightbecurse/status/1492954264909479936", {
"keywords": {"date": "dt:2022-02-13 20:10:09"},
"keyword": {"date": "dt:2022-02-13 20:10:00"},
"count": 1,
}),
)

4
gallery_dl/extractor/twitter.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2016-2022 Mike Fährmann
# Copyright 2016-2023 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
@@ -772,7 +772,7 @@ class TwitterTweetExtractor(TwitterExtractor):
# age-restricted (#2354)
("https://twitter.com/mightbecursed/status/1492954264909479936", {
"options": (("syndication", True),),
"keywords": {"date": "dt:2022-02-13 20:10:09"},
"keyword": {"date": "dt:2022-02-13 20:10:09"},
"count": 1,
}),
# media alt texts / descriptions (#2617)

9
gallery_dl/extractor/vk.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2021-2022 Mike Fährmann
# Copyright 2021-2023 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
@@ -110,7 +110,7 @@ class VkPhotosExtractor(VkExtractor):
"pattern": r"https://sun\d+-\d+\.userapi\.com/s/v1/if1"
r"/[\w-]+\.jpg\?size=\d+x\d+&quality=96&type=album",
"count": ">= 35",
"keywords": {
"keyword": {
"id": r"re:\d+",
"user": {
"id": "398982326",
@@ -122,12 +122,11 @@ class VkPhotosExtractor(VkExtractor):
}),
("https://vk.com/cosplayinrussia", {
"range": "15-25",
"keywords": {
"keyword": {
"id": r"re:\d+",
"user": {
"id" : "-165740836",
"info": "Предложка открыта, кидайте ваши косплейчики. При "
"правильном оформлении они будут опубликованы",
"info": str,
"name": "cosplayinrussia",
"nick": "Косплей | Cosplay 18+",
},

12
gallery_dl/extractor/zerochan.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2022 Mike Fährmann
# Copyright 2022-2023 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
@@ -111,13 +111,15 @@ class ZerochanTagExtractor(ZerochanExtractor):
test = ("https://www.zerochan.net/Perth+%28Kantai+Collection%29", {
"pattern": r"https://static\.zerochan\.net/.+\.full\.\d+\.(jpg|png)",
"count": "> 24",
"keywords": {
"keyword": {
"extension": r"re:jpg|png",
"file_url": "",
"filename": r"re:Perth.\(Kantai.Collection\).full.\d+",
"file_url": r"re:https://static\.zerochan\.net"
r"/.+\.full\.\d+\.(jpg|png)",
"filename": r"re:(Perth\.\(Kantai\.Collection\)"
r"|Kantai\.Collection)\.full\.\d+",
"height": r"re:^\d+$",
"id": r"re:^\d+$",
"name": "Perth (Kantai Collection)",
"name": r"re:(Perth \(Kantai Collection\)|Kantai Collection)",
"search_tags": "Perth (Kantai Collection)",
"size": r"re:^\d+k$",
"width": r"re:^\d+$",