summaryrefslogtreecommitdiffstats
path: root/gallery_dl/extractor/photobucket.py
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@unit193.net>2020-10-25 17:59:22 -0400
committerLibravatarUnit 193 <unit193@unit193.net>2020-10-25 17:59:22 -0400
commit5dc7d6f5902ddaee5223d041d5c10060f0c72430 (patch)
tree6ddd103a86ea7bbb0d695f5fdfa55e43f04756ca /gallery_dl/extractor/photobucket.py
parente0c914765184ebbf99cffdecfe8cdbe10f42486e (diff)
New upstream version 1.15.2.upstream/1.15.2
Diffstat (limited to 'gallery_dl/extractor/photobucket.py')
-rw-r--r--gallery_dl/extractor/photobucket.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/gallery_dl/extractor/photobucket.py b/gallery_dl/extractor/photobucket.py
index a6456da..5e2120a 100644
--- a/gallery_dl/extractor/photobucket.py
+++ b/gallery_dl/extractor/photobucket.py
@@ -22,7 +22,7 @@ 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://s369.photobucket.com/user/CrpyLrkr/library", {
"pattern": r"https?://[oi]+\d+.photobucket.com/albums/oo139/",
@@ -111,8 +111,8 @@ class PhotobucketImageExtractor(Extractor):
filename_fmt = "{pictureId:?/_/}{titleOrFilename}.{extension}"
archive_fmt = "{username}_{id}"
pattern = (r"(?:https?://)?(?:[^.]+\.)?photobucket\.com"
- r"(?:/gallery/user/([^/?&#]+)/media/([^/?&#]+)"
- r"|/user/([^/?&#]+)/media/[^?&#]+\.html)")
+ r"(?:/gallery/user/([^/?#]+)/media/([^/?#]+)"
+ r"|/user/([^/?#]+)/media/[^?#]+\.html)")
test = (
(("https://s271.photobucket.com/user/lakerfanryan"
"/media/Untitled-3-1.jpg.html"), {