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

[smugmug] update tests

Browse Source 
My test account expired and all uploaded images got deleted.
This commit is contained in:
Mike Fährmann
2018-06-22 15:00:13 +02:00
parent 4eb94aca17
commit 7a98cc9798
2 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gallery_dl/extractor/smugmug.py
View File

@@ -44,16 +44,11 @@ class SmugmugAlbumExtractor(SmugmugExtractor):
archive_fmt = "a_{Album[AlbumKey]}_{Image[ImageKey]}" archive_fmt = "a_{Album[AlbumKey]}_{Image[ImageKey]}"
pattern = [r"smugmug:album:([^:]+)$"] pattern = [r"smugmug:album:([^:]+)$"]
test = [ test = [
("smugmug:album:MN6kHH", { ("smugmug:album:SXvjbW", {
"count": 0, "count": 0,
}), }),
("smugmug:album:6Ffcgk", { ("smugmug:album:ddvxpg", {
"count": 1, "url": "8775c2cf05f001e895435faa89f22a03214568bf",
"pattern": ".*/i-L4CxBdg/0/33e0b290/X3/i-L4CxBdg-X3.jpg",
}),
("smugmug:album:drn76C", {
"count": 2,
"content": "864f6953cb04121290407a579611bc5087d117ee",
}), }),
] ]
@@ -84,10 +79,10 @@ class SmugmugImageExtractor(SmugmugExtractor):
directory_fmt = ["{category}", "{User[NickName]}"] directory_fmt = ["{category}", "{User[NickName]}"]
archive_fmt = "{Image[ImageKey]}" archive_fmt = "{Image[ImageKey]}"
pattern = [BASE_PATTERN + r"(?:/[^/?&#]+)+/i-([^/?&#]+)"] pattern = [BASE_PATTERN + r"(?:/[^/?&#]+)+/i-([^/?&#]+)"]
test = [("https://mikf.smugmug.com/Test/n-xnNH3s/i-L4CxBdg", { test = [("https://acapella.smugmug.com/Micro-Macro/Drops/i-g2Dmf9z", {
"url": "905bfdef52ce1a731a4eae17e9ac348511e17ae4", "url": "ab0d7aa001a53ff3fd228622070b39005b6fc179",
"keyword": "df63d36cfaeb128fda86802942d9a4271d3feafc", "keyword": "4fcc02599d180321b22a7f7238102c48d5410c05",
"content": "626fe50d25fe49beeda15e116938db36e163c01f", "content": "64a8f69a1d824921eebbdf2420087937adfa45cd",
})] })]
def __init__(self, match): def __init__(self, match):
@@ -113,15 +108,12 @@ class SmugmugPathExtractor(SmugmugExtractor):
subcategory = "path" subcategory = "path"
pattern = [BASE_PATTERN + r"((?:/[^/?&#a-mo-z][^/?&#]*)*)/?$"] pattern = [BASE_PATTERN + r"((?:/[^/?&#a-mo-z][^/?&#]*)*)/?$"]
test = [ test = [
("https://mikf.smugmug.com/Test/", { ("https://acapella.smugmug.com/Micro-Macro/Drops/", {
"pattern": "smugmug:album:xgkb4C$", "pattern": "smugmug:album:ddvxpg$",
}), }),
("https://mikf.smugmug.com/Test/n-xnNH3s", { ("https://acapella.smugmug.com/", {
"pattern": "smugmug:album:xgkb4C$", "pattern": r"smugmug:album:\w+$",
}), "url": "8bd8b3f4f8bdd584bf5ddfd509ff3c98f8bc323b",
("https://mikf.smugmug.com/", {
"count": 4,
"pattern": "smugmug:album:(xgkb4C|MN6kHH|6Ffcgk|drn76C)$",
}), }),
("smugmug:www.creativedogportraits.com/PortfolioGallery/", { ("smugmug:www.creativedogportraits.com/PortfolioGallery/", {
"pattern": "smugmug:album:txWXzs$", "pattern": "smugmug:album:txWXzs$",

1
test/test_results.py
View File

@@ -24,7 +24,6 @@ TRAVIS_SKIP = {
BROKEN = { BROKEN = {
"desuarchive", "desuarchive",
"rbt", "rbt",
"smugmug",
"whatisthisimnotgoodwithcomputers", "whatisthisimnotgoodwithcomputers",
} }