diff options
Diffstat (limited to 'gallery_dl/extractor/photobucket.py')
| -rw-r--r-- | gallery_dl/extractor/photobucket.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gallery_dl/extractor/photobucket.py b/gallery_dl/extractor/photobucket.py index 83f75a3..8456f97 100644 --- a/gallery_dl/extractor/photobucket.py +++ b/gallery_dl/extractor/photobucket.py @@ -22,11 +22,11 @@ class PhotobucketAlbumExtractor(Extractor): filename_fmt = "{offset:>03}{pictureId:?_//}_{titleOrFilename}.{extension}" archive_fmt = "{id}" pattern = (r"(?:https?://)?((?:[^.]+\.)?photobucket\.com)" - r"/user/[^/?&#]+/library/[^?&#]*") + r"/user/[^/?&#]+/library(?:/[^?&#]*)?") test = ( - ("https://s258.photobucket.com/user/focolandia/library/", { - "pattern": r"https?://[oi]+\d+.photobucket.com/albums/hh280/", - "count": ">= 39" + ("https://s369.photobucket.com/user/CrpyLrkr/library", { + "pattern": r"https?://[oi]+\d+.photobucket.com/albums/oo139/", + "count": ">= 50" }), # subalbums of main "directory" ("https://s271.photobucket.com/user/lakerfanryan/library/", { @@ -149,10 +149,9 @@ class PhotobucketImageExtractor(Extractor): if "message" not in image: break # success tries += 1 - self.log.debug("'%s'", image["message"]) + self.log.debug(image["message"]) else: - self.log.error("%s", image["message"]) - raise exception.StopExtraction() + raise exception.StopExtraction(image["message"]) # adjust metadata entries to be at least somewhat similar # to what the 'album' extractor provides |