mirror of
https://github.com/mikf/gallery-dl.git
synced 2024-11-23 11:12:40 +01:00
96fcff182c
* Generic extractor, see issue #683 * Fix failed test_names test, no subcategory needed * Prefix directory_fmt with "generic" * Relax regex (would break some urls) * Flake8 compliance * pattern: don't require a scheme This fixes a bug when we force the generic extractor on urls without a scheme (that are allowed by all other extractors). * Fix using g: and r: on urls without http(s) scheme Almost all extractors accept urls without an initial http(s) scheme. Many extractors also allow for generic subdomains in their "pattern" variable; some of them implement this with the regex character class "[^.]+" (everything but a dot). This leads to a problem when the extractor is given a url starting with g: or r: (to force using the generic or recursive extractor) and without the http(s) scheme: e.g. with "r:foobar.tumblr.com" the "r:" is wrongly considered part of the subdomain. This commit fixes the bug, replacing the too generic "[^.]+" with the more specific "[\w-]+" (letters, digits and "-", the only characters allowed in domain names), which is already used by some extractors. * Relax imageurl_pattern_ext: allow relative urls * First round of small suggested changes * Support image urls starting with "//" * self.baseurl: remove trailing slash * Relax regexp (didn't catch some image urls) * Some fixes and cleanup * Fix domain pattern; option to enable extractor Fixed the domain section for "pattern", to pass "test_add" and "test_add_module" tests. Added the "enabled" configuration option (default False) to enable the generic extractor. Using "g(eneric):URL" forces using the extractor.
108 lines
3.9 KiB
Python
108 lines
3.9 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Copyright 2018-2021 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.
|
|
|
|
"""Extract images from https://www.myportfolio.com/"""
|
|
|
|
from .common import Extractor, Message
|
|
from .. import text, exception
|
|
|
|
|
|
class MyportfolioGalleryExtractor(Extractor):
|
|
"""Extractor for an image gallery on www.myportfolio.com"""
|
|
category = "myportfolio"
|
|
subcategory = "gallery"
|
|
directory_fmt = ("{category}", "{user}", "{title}")
|
|
filename_fmt = "{num:>02}.{extension}"
|
|
archive_fmt = "{user}_{filename}"
|
|
pattern = (r"(?:myportfolio:(?:https?://)?([^/]+)|"
|
|
r"(?:https?://)?([\w-]+\.myportfolio\.com))"
|
|
r"(/[^/?&#]+)?")
|
|
test = (
|
|
("https://andrewling.myportfolio.com/volvo-xc-90-hybrid", {
|
|
"url": "acea0690c76db0e5cf267648cefd86e921bc3499",
|
|
"keyword": "6ac6befe2ee0af921d24cf1dd4a4ed71be06db6d",
|
|
}),
|
|
("https://andrewling.myportfolio.com/", {
|
|
"pattern": r"https://andrewling\.myportfolio\.com/[^/?#+]+$",
|
|
"count": ">= 6",
|
|
}),
|
|
("https://stevenilousphotography.myportfolio.com/society", {
|
|
"exception": exception.NotFoundError,
|
|
}),
|
|
# custom domain
|
|
("myportfolio:https://tooco.com.ar/6-of-diamonds-paradise-bird", {
|
|
"count": 3,
|
|
}),
|
|
("myportfolio:https://tooco.com.ar/", {
|
|
"pattern": pattern,
|
|
"count": ">= 40",
|
|
}),
|
|
)
|
|
|
|
def __init__(self, match):
|
|
Extractor.__init__(self, match)
|
|
domain1, domain2, self.path = match.groups()
|
|
self.domain = domain1 or domain2
|
|
self.prefix = "myportfolio:" if domain1 else ""
|
|
|
|
def items(self):
|
|
url = "https://" + self.domain + (self.path or "")
|
|
response = self.request(url)
|
|
if response.history and response.url.endswith(".adobe.com/missing"):
|
|
raise exception.NotFoundError()
|
|
page = response.text
|
|
|
|
projects = text.extract(
|
|
page, '<section class="project-covers', '</section>')[0]
|
|
|
|
if projects:
|
|
data = {"_extractor": MyportfolioGalleryExtractor}
|
|
base = self.prefix + "https://" + self.domain
|
|
for path in text.extract_iter(projects, ' href="', '"'):
|
|
yield Message.Queue, base + path, data
|
|
else:
|
|
data = self.metadata(page)
|
|
imgs = self.images(page)
|
|
data["count"] = len(imgs)
|
|
yield Message.Directory, data
|
|
for data["num"], url in enumerate(imgs, 1):
|
|
yield Message.Url, url, text.nameext_from_url(url, data)
|
|
|
|
@staticmethod
|
|
def metadata(page):
|
|
"""Collect general image metadata"""
|
|
# og:title contains data as "<user> - <title>", but both
|
|
# <user> and <title> can contain a "-" as well, so we get the title
|
|
# from somewhere else and cut that amount from the og:title content
|
|
|
|
extr = text.extract_from(page)
|
|
user = extr('property="og:title" content="', '"') or \
|
|
extr('property=og:title content="', '"')
|
|
descr = extr('property="og:description" content="', '"') or \
|
|
extr('property=og:description content="', '"')
|
|
title = extr('<h1 ', '</h1>')
|
|
|
|
if title:
|
|
title = title.partition(">")[2]
|
|
user = user[:-len(title)-3]
|
|
elif user:
|
|
user, _, title = user.partition(" - ")
|
|
else:
|
|
raise exception.NotFoundError()
|
|
|
|
return {
|
|
"user": text.unescape(user),
|
|
"title": text.unescape(title),
|
|
"description": text.unescape(descr),
|
|
}
|
|
|
|
@staticmethod
|
|
def images(page):
|
|
"""Extract and return a list of all image-urls"""
|
|
return list(text.extract_iter(page, 'js-lightbox" data-src="', '"'))
|