Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[deviantart] add support for /deviation/ and fav.me URLs #3560

Merged
merged 3 commits into from
Jan 23, 2023
Merged

[deviantart] add support for /deviation/ and fav.me URLs #3560

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
293abb8
[deviantart] add support for /deviation/ URLs
ClosedPort22 Jan 23, 2023
674c719
[deviantart] refactor base36 conversion
ClosedPort22 Jan 23, 2023
c90b4ea
[deviantart] add support for fav.me URLs
ClosedPort22 Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions gallery_dl/extractor/deviantart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,7 @@ def prepare(self, deviation):
)

# filename metadata
alphabet = "0123456789abcdefghijklmnopqrstuvwxyz"
deviation["index_base36"] = util.bencode(deviation["index"], alphabet)
deviation["index_base36"] = base36_from_id(deviation["index"])
sub = re.compile(r"\W").sub
deviation["filename"] = "".join((
sub("_", deviation["title"].lower()), "_by_",
Expand Down Expand Up @@ -867,7 +866,9 @@ class DeviantartDeviationExtractor(DeviantartExtractor):
archive_fmt = "g_{_username}_{index}.{extension}"
pattern = (BASE_PATTERN + r"/(art|journal)/(?:[^/?#]+-)?(\d+)"
r"|(?:https?://)?(?:www\.)?deviantart\.com/"
r"(?:view/|view(?:-full)?\.php/*\?(?:[^#]+&)?id=)(\d+)")
r"(?:view/|deviation/|view(?:-full)?\.php/*\?(?:[^#]+&)?id=)"
r"(\d+)" # bare deviation ID without slug
r"|(?:https?://)?fav\.me/d([0-9a-z]+)") # base36
test = (
(("https://www.deviantart.com/shimoda7/art/For-the-sake-10073852"), {
"options": (("original", 0),),
Expand Down Expand Up @@ -940,6 +941,15 @@ class DeviantartDeviationExtractor(DeviantartExtractor):
("https://www.deviantart.com/view/1", {
"exception": exception.NotFoundError,
}),
# /deviation/ (#3558)
("https://www.deviantart.com/deviation/817215762"),
# fav.me (#3558)
("https://fav.me/ddijrpu", {
"count": 1,
}),
("https://fav.me/dddd", {
"exception": exception.NotFoundError,
}),
# old-style URLs
("https://shimoda7.deviantart.com"
"/art/For-the-sake-of-a-memory-10073852"),
Expand All @@ -956,7 +966,8 @@ class DeviantartDeviationExtractor(DeviantartExtractor):
def __init__(self, match):
DeviantartExtractor.__init__(self, match)
self.type = match.group(3)
self.deviation_id = match.group(4) or match.group(5)
self.deviation_id = \
match.group(4) or match.group(5) or id_from_base36(match.group(6))

def deviations(self):
url = "{}/{}/{}/{}".format(
Expand Down Expand Up @@ -1561,6 +1572,17 @@ def _login_impl(extr, username, password):
}


def id_from_base36(base36):
return util.bdecode(base36, _ALPHABET)


def base36_from_id(deviation_id):
return util.bencode(int(deviation_id), _ALPHABET)


_ALPHABET = "0123456789abcdefghijklmnopqrstuvwxyz"


###############################################################################
# Journal Formats #############################################################

Expand Down