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

[photobucket] remove module

Browse Source 
had been broken for years and the new site is payed access only
This commit is contained in:
Mike Fährmann
2024-06-02 01:40:31 +02:00
parent 612435480a
commit ce228ee163
6 changed files with 0 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/configuration.rst
View File

@@ -2904,16 +2904,6 @@ Description
``postfile``, ``images``, ``image_large``, ``attachments``, and ``content``. ``postfile``, ``images``, ``image_large``, ``attachments``, and ``content``.
extractor.photobucket.subalbums
-------------------------------
Type
``bool``
Default
``true``
Description
Download subalbums.
extractor.pillowfort.external extractor.pillowfort.external
----------------------------- -----------------------------
Type Type

6
docs/supportedsites.md
View File

@@ -613,12 +613,6 @@ Consider all listed sites to potentially be NSFW.
<td>Creators, Posts, User Profiles</td> <td>Creators, Posts, User Profiles</td>
<td><a href="https://github.com/mikf/gallery-dl#cookies">Cookies</a></td> <td><a href="https://github.com/mikf/gallery-dl#cookies">Cookies</a></td>
</tr> </tr>
<tr>
<td>Photobucket</td>
<td>https://photobucket.com/</td>
<td>Albums, individual Images</td>
<td></td>
</tr>
<tr> <tr>
<td>PhotoVogue</td> <td>PhotoVogue</td>
<td>https://www.vogue.com/photovogue/</td> <td>https://www.vogue.com/photovogue/</td>

1
gallery_dl/extractor/__init__.py
View File

@@ -113,7 +113,6 @@ modules = [
"paheal", "paheal",
"patreon", "patreon",
"philomena", "philomena",
"photobucket",
"photovogue", "photovogue",
"picarto", "picarto",
"piczel", "piczel",

145
gallery_dl/extractor/photobucket.py
View File

@@ -1,145 +0,0 @@
# -*- coding: utf-8 -*-
# Copyright 2019-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
# published by the Free Software Foundation.
"""Extractors for https://photobucket.com/"""
from .common import Extractor, Message
from .. import text, exception
import binascii
import json
class PhotobucketAlbumExtractor(Extractor):
"""Extractor for albums on photobucket.com"""
category = "photobucket"
subcategory = "album"
directory_fmt = ("{category}", "{username}", "{location}")
filename_fmt = "{offset:>03}{pictureId:?_//}_{titleOrFilename}.{extension}"
archive_fmt = "{id}"
pattern = (r"(?:https?://)?((?:[\w-]+\.)?photobucket\.com)"
r"/user/[^/?&#]+/library(?:/[^?&#]*)?")
example = "https://s123.photobucket.com/user/USER/library"
def __init__(self, match):
self.root = "https://" + match.group(1)
Extractor.__init__(self, match)
def _init(self):
self.session.headers["Referer"] = self.url
def items(self):
for image in self.images():
image["titleOrFilename"] = text.unescape(image["titleOrFilename"])
image["title"] = text.unescape(image["title"])
image["extension"] = image["ext"]
yield Message.Directory, image
yield Message.Url, image["fullsizeUrl"], image
if self.config("subalbums", True):
for album in self.subalbums():
album["_extractor"] = PhotobucketAlbumExtractor
yield Message.Queue, album["url"], album
def images(self):
"""Yield all images of the current album"""
url = self.url
params = {"sort": "3", "page": 1}
while True:
page = self.request(url, params=params).text
json_data = text.extract(page, "collectionData:", ",\n")[0]
if not json_data:
msg = text.extr(page, 'libraryPrivacyBlock">', "</div>")
msg = ' ("{}")'.format(text.remove_html(msg)) if msg else ""
self.log.error("Unable to get JSON data%s", msg)
return
data = json.loads(json_data)
yield from data["items"]["objects"]
if data["total"] <= data["offset"] + data["pageSize"]:
self.album_path = data["currentAlbumPath"]
return
params["page"] += 1
def subalbums(self):
"""Return all subalbum objects"""
url = self.root + "/component/Albums-SubalbumList"
params = {
"albumPath": self.album_path,
"fetchSubAlbumsOnly": "true",
"deferCollapsed": "true",
"json": "1",
}
data = self.request(url, params=params).json()
return data["body"].get("subAlbums", ())
class PhotobucketImageExtractor(Extractor):
"""Extractor for individual images from photobucket.com"""
category = "photobucket"
subcategory = "image"
directory_fmt = ("{category}", "{username}")
filename_fmt = "{pictureId:?/_/}{titleOrFilename}.{extension}"
archive_fmt = "{username}_{id}"
pattern = (r"(?:https?://)?(?:[\w-]+\.)?photobucket\.com"
r"(?:/gallery/user/([^/?&#]+)/media/([^/?&#]+)"
r"|/user/([^/?&#]+)/media/[^?&#]+\.html)")
example = "https://s123.photobucket.com/user/USER/media/NAME.EXT.html"
def __init__(self, match):
Extractor.__init__(self, match)
self.user = match.group(1) or match.group(3)
self.media_id = match.group(2)
def _init(self):
self.session.headers["Referer"] = self.url
def items(self):
url = "https://photobucket.com/galleryd/search.php"
params = {"userName": self.user, "searchTerm": "", "ref": ""}
if self.media_id:
params["mediaId"] = self.media_id
else:
params["url"] = self.url
# retry API call up to 5 times, since it can randomly fail
tries = 0
while tries < 5:
data = self.request(url, method="POST", params=params).json()
image = data["mediaDocuments"]
if "message" not in image:
break # success
tries += 1
self.log.debug(image["message"])
else:
raise exception.StopExtraction(image["message"])
# adjust metadata entries to be at least somewhat similar
# to what the 'album' extractor provides
if "media" in image:
image = image["media"][image["mediaIndex"]]
image["albumView"] = data["mediaDocuments"]["albumView"]
image["username"] = image["ownerId"]
else:
image["fileUrl"] = image.pop("imageUrl")
image.setdefault("title", "")
image.setdefault("description", "")
name, _, ext = image["fileUrl"].rpartition("/")[2].rpartition(".")
image["ext"] = image["extension"] = ext
image["titleOrFilename"] = image["title"] or name
image["tags"] = image.pop("clarifaiTagList", [])
mtype, _, mid = binascii.a2b_base64(image["id"]).partition(b":")
image["pictureId"] = mid.decode() if mtype == b"mediaId" else ""
yield Message.Directory, image
yield Message.Url, image["fileUrl"], image

68
test/results/photobucket.py
View File

@@ -1,68 +0,0 @@
# -*- coding: utf-8 -*-
# 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
# published by the Free Software Foundation.
from gallery_dl.extractor import photobucket
__tests__ = (
{
"#url" : "https://s369.photobucket.com/user/CrpyLrkr/library",
"#category": ("", "photobucket", "album"),
"#class" : photobucket.PhotobucketAlbumExtractor,
"#pattern" : r"https?://[oi]+\d+.photobucket.com/albums/oo139/",
"#count" : ">= 50",
},
{
"#url" : "https://s271.photobucket.com/user/lakerfanryan/library/",
"#comment" : "subalbums of main 'directory'",
"#category": ("", "photobucket", "album"),
"#class" : photobucket.PhotobucketAlbumExtractor,
"#options" : {"image-filter": "False"},
"#pattern" : photobucket.PhotobucketAlbumExtractor.pattern,
"#count" : 1,
},
{
"#url" : "https://s271.photobucket.com/user/lakerfanryan/library/Basketball",
"#comment" : "subalbums of subalbum without images",
"#category": ("", "photobucket", "album"),
"#class" : photobucket.PhotobucketAlbumExtractor,
"#pattern" : photobucket.PhotobucketAlbumExtractor.pattern,
"#count" : ">= 9",
},
{
"#url" : "https://s1277.photobucket.com/user/sinisterkat44/library/",
"#comment" : "private (missing JSON data)",
"#category": ("", "photobucket", "album"),
"#class" : photobucket.PhotobucketAlbumExtractor,
"#count" : 0,
},
{
"#url" : "https://s1110.photobucket.com/user/chndrmhn100/library/Chandu%20is%20the%20King?sort=3&page=1",
"#category": ("", "photobucket", "album"),
"#class" : photobucket.PhotobucketAlbumExtractor,
},
{
"#url" : "https://s271.photobucket.com/user/lakerfanryan/media/Untitled-3-1.jpg.html",
"#category": ("", "photobucket", "image"),
"#class" : photobucket.PhotobucketImageExtractor,
"#sha1_url" : "3b647deeaffc184cc48c89945f67574559c9051f",
"#sha1_metadata": "69732741b2b351db7ecaa77ace2fdb39f08ca5a3",
},
{
"#url" : "https://s271.photobucket.com/user/lakerfanryan/media/IsotopeswBros.jpg.html?sort=3&o=2",
"#category": ("", "photobucket", "image"),
"#class" : photobucket.PhotobucketImageExtractor,
"#sha1_url" : "12c1890c09c9cdb8a88fba7eec13f324796a8d7b",
"#sha1_metadata": "61200a223df6c06f45ac3d30c88b3f5b048ce9a8",
},
)

1
test/test_results.py
View File

@@ -25,7 +25,6 @@ from test import results # noqa E402
# temporary issues, etc. # temporary issues, etc.
BROKEN = { BROKEN = {
"photobucket",
} }
CONFIG = { CONFIG = {