5530871b5a
Instead of getting a complete 'filename' from an URL and splitting that
into 'name' and 'extension', the new approach gets rid of the complete
version and renames 'name' to 'filename'. (Using anything other than
{extension} for a filename extension doesn't really work anyway)
Example: "https://example.org/path/filename.ext"
before:
- filename : filename.ext
- name : filename
- extension: ext
now:
- filename : filename
- extension: ext
53 lines
1.9 KiB
Python
53 lines
1.9 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Copyright 2017-2019 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.
|
|
|
|
"""Direct link handling"""
|
|
|
|
from .common import Extractor, Message
|
|
from .. import text
|
|
|
|
|
|
class DirectlinkExtractor(Extractor):
|
|
"""Extractor for direct links to images and other media files"""
|
|
category = "directlink"
|
|
filename_fmt = "{domain}/{path}"
|
|
archive_fmt = "{domain}/{path}"
|
|
pattern = (r"https?://(?P<domain>[^/]+)/(?P<path>[^?&#]+\."
|
|
r"(?:jpe?g|jpe|png|gif|web[mp]|mp4|mkv|og[gmv]|opus))"
|
|
r"(?:\?(?P<query>[^/?#]*))?(?:#(?P<fragment>.*))?$")
|
|
test = (
|
|
(("https://en.wikipedia.org/static/images/project-logos/enwiki.png"), {
|
|
"url": "18c5d00077332e98e53be9fed2ee4be66154b88d",
|
|
"keyword": "e81b9fe3022e971365dd859f38e4ef717a6c69ed",
|
|
}),
|
|
# more complex example
|
|
("https://example.org/path/file.webm?que=1&ry=2#fragment", {
|
|
"url": "fd4aec8a32842343394e6078a06c3e6b647bf671",
|
|
"keyword": "ff75764b1ae66615b723a6357b8193fa2de84678",
|
|
}),
|
|
# percent-encoded characters
|
|
("https://example.org/%27%3C%23/%23%3E%27.jpg?key=%3C%26%3E", {
|
|
"url": "2627e8140727fdf743f86fe18f69f99a052c9718",
|
|
"keyword": "4d19dc12e41ffcb4cbec2013e335cf482377c35e",
|
|
}),
|
|
)
|
|
|
|
def __init__(self, match):
|
|
Extractor.__init__(self, match)
|
|
self.data = match.groupdict()
|
|
|
|
def items(self):
|
|
text.nameext_from_url(self.url, self.data)
|
|
for key, value in self.data.items():
|
|
if value:
|
|
self.data[key] = text.unquote(value)
|
|
|
|
yield Message.Version, 1
|
|
yield Message.Directory, self.data
|
|
yield Message.Url, self.url, self.data
|