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

[flickr] support 3k, 4k, 5k, and 6k photo sizes (closes #472)

Browse Source
This commit is contained in:
Mike Fährmann
2019-11-10 17:52:51 +01:00
parent 521fcd2eb9
commit abfcb356fc
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gallery_dl/extractor/flickr.py
View File

@@ -280,18 +280,22 @@ class FlickrAPI(oauth.OAuth1API):
API_KEY = "ac4fd7aa98585b9eee1ba761c209de68" API_KEY = "ac4fd7aa98585b9eee1ba761c209de68"
API_SECRET = "3adb0f568dc68393" API_SECRET = "3adb0f568dc68393"
FORMATS = [ FORMATS = [
("o", "Original" , None), ("o" , "Original" , None),
("k", "Large 2048" , 2048), ("6k", "X-Large 6K" , 6144),
("h", "Large 1600" , 1600), ("5k", "X-Large 5K" , 5120),
("l", "Large" , 1024), ("4k", "X-Large 4K" , 4096),
("c", "Medium 800" , 800), ("3k", "X-Large 3K" , 3072),
("z", "Medium 640" , 640), ("k" , "Large 2048" , 2048),
("m", "Medium" , 500), ("h" , "Large 1600" , 1600),
("n", "Small 320" , 320), ("l" , "Large" , 1024),
("s", "Small" , 240), ("c" , "Medium 800" , 800),
("q", "Large Square", 150), ("z" , "Medium 640" , 640),
("t", "Thumbnail" , 100), ("m" , "Medium" , 500),
("s", "Square" , 75), ("n" , "Small 320" , 320),
("s" , "Small" , 240),
("q" , "Large Square", 150),
("t" , "Thumbnail" , 100),
("s" , "Square" , 75),
] ]
VIDEO_FORMATS = { VIDEO_FORMATS = {
"orig" : 9, "orig" : 9,
@@ -325,7 +329,7 @@ class FlickrAPI(oauth.OAuth1API):
if not fmt[2] or fmt[2] <= self.maxsize] if not fmt[2] or fmt[2] <= self.maxsize]
else: else:
self.formats = self.FORMATS self.formats = self.FORMATS
self.formats = self.formats[:4] self.formats = self.formats[:8]
def favorites_getList(self, user_id): def favorites_getList(self, user_id):
"""Returns a list of the user's favorite photos.""" """Returns a list of the user's favorite photos."""

1
test/test_results.py
View File

@@ -28,6 +28,7 @@ TRAVIS_SKIP = {
BROKEN = { BROKEN = {
"hentaifox", "hentaifox",
"mangapark", "mangapark",
"pixhost",
"yaplog", "yaplog",
} }