Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-22 02:32:33 +01:00
Code Issues Releases Wiki Activity

[motherless] general tidying

Browse Source
This commit is contained in:
Smacking Potato 2024-11-21 01:36:02 +00:00
parent 5547955126
commit ab2a725e9c
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gallery_dl/extractor/motherless.py
View File

@ -115,14 +115,14 @@ class MotherlessGalleryImagesExtractor(MotherlessExtractor):
yield Message.Directory, data
for id, url, extension, title, num in get_images(self):
data |= {
image_data = data | {
"id": id,
"filename": id,
"extension": extension,
"title": title,
"num": num}
yield Message.Url, url, data
yield Message.Url, url, image_data
class MotherlessGalleryVideosExtractor(MotherlessExtractor):
@ -145,14 +145,14 @@ class MotherlessGalleryVideosExtractor(MotherlessExtractor):
yield Message.Directory, data
for id, url, title, num in get_videos(self):
data |= {
video_data = data | {
"id": id,
"filename": id,
"extension": "mp4",
"title": title,
"num": num}
yield Message.Url, url, data
yield Message.Url, url, video_data
class MotherlessGalleryExtractor(MotherlessExtractor):
@ -175,72 +175,72 @@ class MotherlessGalleryExtractor(MotherlessExtractor):
yield Message.Directory, data
for id, url, extension, title, num in get_images(self):
data |= {
image_data = data | {
"id": id,
"filename": id,
"extension": extension,
"title": title,
"num": num}
yield Message.Url, url, data
yield Message.Url, url, image_data
for id, url, title, num in get_videos(self):
data |= {
video_data = data | {
"id": id,
"filename": id,
"extension": "mp4",
"title": title,
"num": num}
yield Message.Url, url, data
yield Message.Url, url, video_data
# Url extractors.
def get_images(extractor):
n = 1
total_count = 0
page_number = 1
total_image_count = 0
while True:
page = extractor.request(f"{extractor.root}/GI{extractor.gallery_id}?page={n}").text
page_count = 0
page = extractor.request(f"{extractor.root}/GI{extractor.gallery_id}?page={page_number}").text
page_image_count = 0
for result in re.finditer(' src="https://cdn5-thumbs\.motherlessmedia\.com/thumbs/([A-Z0-9]+?)\.([a-zA-Z]+)"[\s\S]+?alt="([^"]+)"', page):
id = result.group(1)
extension = result.group(2)
url = f"https://cdn5-images.motherlessmedia.com/images/{id}.{extension}"
title = result.group(3)
page_count += 1
page_image_count += 1
yield id, url, extension, title, total_count + page_count
yield id, url, extension, title, total_image_count + page_image_count
if page_count == 0:
if page_image_count == 0:
return
total_count += page_count
n += 1
total_image_count += page_image_count
page_number += 1
def get_videos(extractor):
n = 1
total_count = 0
page_number = 1
total_video_count = 0
while True:
page = extractor.request(f"{extractor.root}/GV{extractor.gallery_id}?page={n}").text
page_count = 0
page = extractor.request(f"{extractor.root}/GV{extractor.gallery_id}?page={page_number}").text
page_video_count = 0
for result in re.finditer('thumbs/([A-Z0-9]+?)-strip\.jpg" alt="([^"]+)"', page):
id = result.group(1)
url = f"https://cdn5-videos.motherlessmedia.com/videos/{id}.mp4"
title = result.group(2)
page_count += 1
page_video_count += 1
yield id, url, title, total_count + page_count
yield id, url, title, total_video_count + page_video_count
if page_count == 0:
if page_video_count == 0:
return
total_count += page_count
n += 1
total_video_count += page_video_count
page_number += 1
# Metadata extractors.