diff --git a/docs/configuration.rst b/docs/configuration.rst index 79452af0..f8d87d33 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -4741,10 +4741,12 @@ Type * ``string`` * ``list`` of ``strings`` Default - ``"works"`` + * ``["works", "sentrequests"]`` + if `sent-requests `__ are enabled + * ``["works"]`` otherwise Example - * ``"works,sent-requests"`` - * ``["works", "sent-requests"]`` + * ``"works,sentrequests"`` + * ``["works", "sentrequests"]`` Description A (comma-separated) list of subcategories to include when processing a user profile. @@ -4752,7 +4754,7 @@ Description Possible values are * ``"works"`` - * ``"sent-requests"`` + * ``"sentrequests"`` It is possible to use ``"all"`` instead of listing all values separately. diff --git a/gallery_dl/extractor/skeb.py b/gallery_dl/extractor/skeb.py index a902532b..3c7205a6 100644 --- a/gallery_dl/extractor/skeb.py +++ b/gallery_dl/extractor/skeb.py @@ -213,11 +213,11 @@ class SkebWorksExtractor(SkebExtractor): return self._pagination(url, params) -class SkebSentRequestsExtractor(SkebExtractor): +class SkebSentrequestsExtractor(SkebExtractor): """Extractor for a skeb user's sent requests""" - subcategory = "sent-requests" + subcategory = "sentrequests" pattern = USER_PATTERN + r"/sent[ _-]?requests" - example = "https://skeb.jp/@USER/sent-requests" + example = "https://skeb.jp/@USER/sentrequests" def posts(self): url = f"{self.root}/api/users/{self.groups[0]}/works" @@ -232,14 +232,14 @@ class SkebUserExtractor(Dispatch, SkebExtractor): def items(self): if self.config("sent-requests", False): - default = ("works", "sent-requests") + default = ("works", "sentrequests") else: default = ("works",) base = f"{self.root}/@{self.groups[0]}/" return self._dispatch_extractors(( (SkebWorksExtractor , base + "works"), - (SkebSentRequestsExtractor, base + "sent-requests"), + (SkebSentrequestsExtractor, base + "sentrequests"), ), default) diff --git a/scripts/supportedsites.py b/scripts/supportedsites.py index 7dd2eda5..6e1ae146 100755 --- a/scripts/supportedsites.py +++ b/scripts/supportedsites.py @@ -392,7 +392,7 @@ SUBCATEGORY_MAP = { "skeb": { "following" : "Followed Creators", "following-users": "Followed Users", - "sent-requests" : "Sent Requests", + "sentrequests" : "Sent Requests", }, "smugmug": { "path": "Images from Users and Folders", diff --git a/test/results/skeb.py b/test/results/skeb.py index 6087939e..f640d7e0 100644 --- a/test/results/skeb.py +++ b/test/results/skeb.py @@ -39,7 +39,7 @@ __tests__ = ( "original" : { "byte_size" : int, "duration" : None, - "extension" : r"re:psd|png", + "extension" : {"psd", "png"}, "frame_rate": None, "height" : 3727, "is_movie" : False, @@ -69,7 +69,7 @@ __tests__ = ( "#options" : {"include": "all"}, "#results" : ( "https://skeb.jp/@kanade_cocotte/works", - "https://skeb.jp/@kanade_cocotte/sent-requests", + "https://skeb.jp/@kanade_cocotte/sentrequests", ), }, @@ -79,7 +79,7 @@ __tests__ = ( "#options" : {"sent-requests": True}, "#results" : ( "https://skeb.jp/@kanade_cocotte/works", - "https://skeb.jp/@kanade_cocotte/sent-requests", + "https://skeb.jp/@kanade_cocotte/sentrequests", ), }, @@ -105,12 +105,12 @@ __tests__ = ( { "#url" : "https://skeb.jp/@kanade_cocotte/sent-requests", - "#class" : skeb.SkebSentRequestsExtractor, + "#class" : skeb.SkebSentrequestsExtractor, }, { "#url" : "https://skeb.jp/@4ra_su4/sentrequests", - "#class" : skeb.SkebSentRequestsExtractor, + "#class" : skeb.SkebSentrequestsExtractor, "#pattern" : ( r"https://si.imgix.net/4e44b668/uploads/origins/e42cbd8e-44af-4aaa-a11b-6a174f42202c\?bg=%23fff&auto=format&fm=webp&w=800&s=\w+", r"https://si.imgix.net/4d30e75e/uploads/origins/6d3bb612-3f45-4d8e-9d31-49dceb3dab11\?bg=%23fff&auto=format&fm=webp&w=800&s=\w+",