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

Jump to bottom

[skeb] add 'sent-requests' option (#2322) #2330

Merged
merged 3 commits into from
Feb 28, 2022
Merged

[skeb] add 'sent-requests' option (#2322) #2330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
244e09f
Update skeb.py
alice945 Feb 23, 2022
b488c6d
Update configuration.rst
alice945 Feb 23, 2022
880fcd9
flake8
mikf Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions docs/configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1979,6 +1979,16 @@ Description
Download videos.


extractor.skeb.sent-requests
-------------------------
Type
``bool``
Default
``false``
Description
Download sent requests.


extractor.skeb.thumbnails
-------------------------
Type
Expand Down
26 changes: 18 additions & 8 deletions gallery_dl/extractor/skeb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ def __init__(self, match):
Extractor.__init__(self, match)
self.user_name = match.group(1)
self.thumbnails = self.config("thumbnails", False)
self.sent_requests = self.config("sent-requests", False)

def items(self):
for post_num in self.posts():
response, post = self._get_post_data(post_num)
for user_name, post_num in self.posts():
response, post = self._get_post_data(user_name, post_num)
yield Message.Directory, post
for data in self._get_urls_from_post(response, post):
url = data["file_url"]
Expand All @@ -38,24 +39,33 @@ def _pagination(self):
url = "{}/api/users/{}/works".format(self.root, self.user_name)
params = {"role": "creator", "sort": "date", "offset": 0}
headers = {"Referer": self.root, "Authorization": "Bearer null"}
do_requests = self.sent_requests

while True:
posts = self.request(url, params=params, headers=headers).json()

for post in posts:
post_num = post["path"].rpartition("/")[2]
user_name = post["path"].split("/")[1][1:]
if post["private"]:
self.log.debug("Skipping %s (private)", post_num)
self.log.debug("Skipping @%s/%s (private)",
user_name, post_num)
continue
yield post_num
yield user_name, post_num

if len(posts) < 30:
return
if do_requests:
params["offset"] = 0
params['role'] = "client"
do_requests = False
continue
else:
return
params["offset"] += 30

def _get_post_data(self, post_num):
def _get_post_data(self, user_name, post_num):
url = "{}/api/users/{}/works/{}".format(
self.root, self.user_name, post_num)
self.root, user_name, post_num)
headers = {"Referer": self.root, "Authorization": "Bearer null"}
resp = self.request(url, headers=headers).json()
creator = resp["creator"]
Expand Down Expand Up @@ -130,7 +140,7 @@ def __init__(self, match):
self.post_num = match.group(2)

def posts(self):
return (self.post_num,)
return (self.user_name, self.post_num,)


class SkebUserExtractor(SkebExtractor):
Expand Down