github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[turbo] update 'saint' extractors (#8893 #8896)

Browse Source 
* Implements turbo.py & remove from domain pattern from saints.py
* Remove leftover commented pattern from saints.py
* Make turbo.py comply with flake8
* Add album support
* Improved metadata extracion for albums and single files & created turbo.py tests using saints.py test
* Align turbo.py extractor with flake8 rules
* Fix #class name on turbo.py tests
* Fix #category test
* Fix #category test x2
* Fix #category tests
* Fix #category tests
* Fix TurboMediaExtractor self.groups unpacking

* update basic module formatting
* replace 'saint' with 'turbo' in modules list
* remove saint extractors and tests
* update & simplify 'media' extractor
* update & simplify 'album' extractor
* update tests
* update supportedsites
* update 'category-map' & 'config-map'

---------

Co-authored-by: Mike Fährmann <mike_faehrmann@web.de>
This commit is contained in:
brerk
2026-01-19 15:20:13 -06:00
committed by GitHub
parent cc5bfa6eb0
commit e00c717b15
11 changed files with 230 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
test/results/saint.py
View File

@@ -1,145 +0,0 @@
# -*- coding: utf-8 -*-
# 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.
from gallery_dl.extractor import saint
__tests__ = (
{
"#url" : "https://saint2.su/a/2c5iuWHTumH",
"#class": saint.SaintAlbumExtractor,
"#results": (
"https://data.saint2.cr/data/3b1ccebf3576f8d5aac3ee0e5a12da95.mp4",
"https://data.saint2.cr/data/3b125e3fb4b98693f17d85cb53590215.mp4",
),
"album_id" : "2c5iuWHTumH",
"album_name" : "animations",
"album_size" : 37083862,
"count" : 2,
"date" : "type:datetime",
"description": "Descriptions can contain only alphanumeric ASCII characters",
"extension" : "mp4",
"file" : r"re:https://...",
"filename" : {"3b1ccebf3576f8d5aac3ee0e5a12da95-6lC7mKrJst8",
"3b125e3fb4b98693f17d85cb53590215-ze10Ohbpoy5"},
"id" : {"6lC7mKrJst8",
"ze10Ohbpoy5"},
"id2" : {"6712834015d67",
"671284a627e0e"},
"id_dl" : {"M2IxY2NlYmYzNTc2ZjhkNWFhYzNlZTBlNWExMmRhOTUubXA0",
"M2IxMjVlM2ZiNGI5ODY5M2YxN2Q4NWNiNTM1OTAyMTUubXA0"},
"name" : {"3b1ccebf3576f8d5aac3ee0e5a12da95",
"3b125e3fb4b98693f17d85cb53590215"},
"num" : {1, 2},
},
{
"#url" : "https://turbovid.cr/a/FiphGijfJoR",
"#comment" : "'turbovid' album (#8851)",
"#category": ("lolisafe", "saint", "album"),
"#class" : saint.SaintAlbumExtractor,
"#results" : (
"https://data.saint2.cr/data/jZqe1xxqw9bX7.mp4",
"https://data.saint2.cr/data/eJ9fLurGdaHqS.mp4",
"https://data.saint2.cr/data/WkD7hRaHdBpBI.mp4",
),
"album_id" : "FiphGijfJoR",
"album_name" : """test-???-"&> album""",
"album_size" : 37165256,
"count" : 3,
"num" : range(1, 3),
"date" : None,
"description": """test-???-"&> description""",
"extension" : "mp4",
"file" : r"re:https://data.saint2.cr/data/\w+.mp4",
"filename" : str,
"id" : str,
"id2" : str,
"id_dl" : str,
"name" : str,
"size" : int,
},
{
"#url" : "https://turbo.cr/a/FiphGijfJoR",
"#comment" : "'turbo' album (#8888)",
"#class" : saint.SaintAlbumExtractor,
},
{
"#url" : "https://saint2.su/embed/6lC7mKrJst8",
"#class": saint.SaintMediaExtractor,
"#results" : "https://data.saint2.cr/data/3b1ccebf3576f8d5aac3ee0e5a12da95.mp4",
"#sha1_content": "39037a029b3fe96f838b4545316caaa545c84075",
"count" : 1,
"date" : "dt:2024-10-18 15:48:16",
"extension": "mp4",
"file" : str,
"filename" : "3b1ccebf3576f8d5aac3ee0e5a12da95-6lC7mKrJst8",
"id" : "6lC7mKrJst8",
"id2" : "6712834015d67",
"id_dl" : "M2IxY2NlYmYzNTc2ZjhkNWFhYzNlZTBlNWExMmRhOTUubXA0",
"name" : "3b1ccebf3576f8d5aac3ee0e5a12da95",
"num" : 1,
},
{
"#url" : "https://saint2.su/d/M2IxMjVlM2ZiNGI5ODY5M2YxN2Q4NWNiNTM1OTAyMTUubXA0",
"#class": saint.SaintMediaExtractor,
"#results": "https://data.saint2.cr/data/3b125e3fb4b98693f17d85cb53590215.mp4",
"count" : 1,
"extension": "mp4",
"file" : str,
"filename" : "M2IxMjVlM2ZiNGI5ODY5M2YxN2Q4NWNiNTM1OTAyMTUubXA0",
"id" : "M2IxMjVlM2ZiNGI5ODY5M2YxN2Q4NWNiNTM1OTAyMTUubXA0",
"id_dl" : "M2IxMjVlM2ZiNGI5ODY5M2YxN2Q4NWNiNTM1OTAyMTUubXA0",
"name" : "M2IxMjVlM2ZiNGI5ODY5M2YxN2Q4NWNiNTM1OTAyMTUubXA0",
"num" : 1,
},
{
"#url" : "https://saint2.pk/embed/6lC7mKrJst8",
"#class": saint.SaintMediaExtractor,
},
{
"#url" : "https://saint2.cr/embed/6lC7mKrJst8",
"#class": saint.SaintMediaExtractor,
},
{
"#url" : "https://saint.to/embed/6lC7mKrJst8",
"#class": saint.SaintMediaExtractor,
},
{
"#url" : "https://turbovid.cr/embed/WkD7hRaHdBpBI",
"#comment" : "'turbovid' URL/video",
"#category": ("lolisafe", "saint", "media"),
"#class" : saint.SaintMediaExtractor,
"#results" : "https://data.saint2.cr/data/WkD7hRaHdBpBI.mp4",
"date" : None,
"extension" : "mp4",
"file" : "https://data.saint2.cr/data/WkD7hRaHdBpBI.mp4",
"filename" : "WkD7hRaHdBpBI",
"id" : "WkD7hRaHdBpBI",
"id2" : "WkD7hRaHdBpBI",
"id_dl" : "V2tEN2hSYUhkQnBCSS5tcDQ=",
"name" : "WkD7hRaHdBpBI",
},
{
"#url" : "https://turbo.cr/embed/WkD7hRaHdBpBI",
"#comment" : "'turbo' URL/video",
"#class" : saint.SaintMediaExtractor,
},
)

124
test/results/turbo.py Normal file
View File

@@ -0,0 +1,124 @@
# -*- coding: utf-8 -*-
# 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.
from gallery_dl.extractor import turbo
__tests__ = (
{
"#url" : "https://turbo.cr/a/2c5iuWHTumH",
"#class": turbo.TurboAlbumExtractor,
"#pattern": (
r"https://dl\d+.turbocdn.st/data/3b125e3fb4b98693f17d85cb53590215.mp4\?exp=\d+&token=\w+&fn=3b125e3fb4b98693f17d85cb53590215.mp4",
r"https://dl\d+.turbocdn.st/data/3b1ccebf3576f8d5aac3ee0e5a12da95.mp4\?exp=\d+&token=\w+&fn=3b1ccebf3576f8d5aac3ee0e5a12da95.mp4",
),
"album_id" : "2c5iuWHTumH",
"album_name" : "animations",
"album_size" : 37083862,
"count" : 2,
"description": "Descriptions can contain only alphanumeric ASCII characters",
"extension" : "mp4",
"file" : r"re:https://...",
"filename" : {"3b1ccebf3576f8d5aac3ee0e5a12da95-6lC7mKrJst8",
"3b125e3fb4b98693f17d85cb53590215-ze10Ohbpoy5"},
"id" : {"6lC7mKrJst8",
"ze10Ohbpoy5"},
"name" : {"3b1ccebf3576f8d5aac3ee0e5a12da95",
"3b125e3fb4b98693f17d85cb53590215"},
"num" : {1, 2},
},
{
"#url" : "https://turbovid.cr/a/FiphGijfJoR",
"#comment" : "'turbovid' album (#8851)",
"#category": ("lolisafe", "turbo", "album"),
"#class" : turbo.TurboAlbumExtractor,
"#pattern" : (
r"https://dl\d+.turbocdn.st/data/WkD7hRaHdBpBI.mp4\?exp=\d+&token=\w+&fn=3b1ccebf3576f8d5aac3ee0e5a12da95-6lC7mKrJst8.mp4",
r"https://dl\d+.turbocdn.st/data/eJ9fLurGdaHqS.mp4\?exp=\d+&token=\w+&fn=3b125e3fb4b98693f17d85cb53590215-ze10Ohbpoy5.mp4",
r"https://dl\d+.turbocdn.st/data/jZqe1xxqw9bX7.mp4\?exp=\d+&token=\w+&fn=test-%E3%83%86%E3%82%B9%E3%83%88-%2522%26%3E.mp4",
),
"album_id" : "FiphGijfJoR",
"album_name" : """test-テスト-"&> album""",
"album_size" : 37165256,
"count" : 3,
"num" : range(1, 3),
"description": """test-テスト-"&> description""",
"extension" : "mp4",
"file" : r"re:https://dl\d+.turbocdn.st/data/.+",
"filename" : str,
"id" : str,
"name" : str,
"size" : int,
},
{
"#url" : "https://saint2.su/a/FiphGijfJoR",
"#comment" : "'saint' album (#8888)",
"#class" : turbo.TurboAlbumExtractor,
},
{
"#url" : "https://turbo.cr/embed/6lC7mKrJst8",
"#class": turbo.TurboMediaExtractor,
"#pattern" : r"https://dl\d+.turbocdn.st/data/3b1ccebf3576f8d5aac3ee0e5a12da95.mp4",
"#sha1_content": "39037a029b3fe96f838b4545316caaa545c84075",
"count" : 1,
"date" : "dt:2024-10-18 00:00:00",
"extension": "mp4",
"file" : str,
"filename" : "3b1ccebf3576f8d5aac3ee0e5a12da95-6lC7mKrJst8",
"id" : "6lC7mKrJst8",
"name" : "3b1ccebf3576f8d5aac3ee0e5a12da95",
"num" : 1,
},
{
"#url" : "https://turbo.cr/d/M2IxMjVlM2ZiNGI5ODY5M2YxN2Q4NWNiNTM1OTAyMTUubXA0",
"#comment": "'Page not found'",
"#class" : turbo.TurboMediaExtractor,
"#count" : 0,
},
{
"#url" : "https://saint2.pk/embed/6lC7mKrJst8",
"#class": turbo.TurboMediaExtractor,
},
{
"#url" : "https://saint2.cr/embed/6lC7mKrJst8",
"#class": turbo.TurboMediaExtractor,
},
{
"#url" : "https://saint.to/embed/6lC7mKrJst8",
"#class": turbo.TurboMediaExtractor,
},
{
"#url" : "https://turbovid.cr/embed/WkD7hRaHdBpBI",
"#comment" : "'turbovid' URL/video",
"#category": ("lolisafe", "turbo", "media"),
"#class" : turbo.TurboMediaExtractor,
"#pattern" : r"https://dl\d+.turbocdn.st/data/\w+.mp4",
"extension" : "mp4",
"file" : str,
"filename" : "3b1ccebf3576f8d5aac3ee0e5a12da95-6lC7mKrJst8-WkD7hRaHdBpBI",
"id" : "WkD7hRaHdBpBI",
"name" : "3b1ccebf3576f8d5aac3ee0e5a12da95-6lC7mKrJst8",
},
{
"#url" : "https://saint2.su/embed/WkD7hRaHdBpBI",
"#comment" : "'saint' URL/video",
"#class" : turbo.TurboMediaExtractor,
},
)