[chevereto] combine 'image' & 'video' extractors into a 'file' extractor

2026-02-14 19:21:35 +01:00
parent 1c8d07885c
commit 41998cbb8f
5 changed files with 106 additions and 117 deletions
--- a/test/results/imagepond.py
+++ b/test/results/imagepond.py
@@ -10,8 +10,8 @@ from gallery_dl.extractor import chevereto
 __tests__ = (
 {
    "#url"     : "https://imagepond.net/image/IMG-20250217-160622.TJNphg",
-    "#category": ("chevereto", "imagepond", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "imagepond", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
    "#results"     : "https://media.imagepond.net/media/IMG_20250217_1606226b345a5dbd0e8971.jpg",
    "#sha1_content": "ec7fac6b427f7af01038619208cd69478e91ddef",

@@ -20,20 +20,22 @@ __tests__ = (
    "extension": "jpg",
    "filename" : "IMG_20250217_1606226b345a5dbd0e8971",
    "id"       : "TJNphg",
+    "title"    : "IMG_20250217_160622.jpg",
+    "type"     : "image",
    "url"      : "https://media.imagepond.net/media/IMG_20250217_1606226b345a5dbd0e8971.jpg",
    "user"     : "dariusbbb24",
 },

 {
    "#url"     : "https://www.imagepond.net/image/IMG-20250217-160622.TJNphg",
-    "#category": ("chevereto", "imagepond", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "imagepond", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
 },

 {
    "#url"     : "https://imagepond.net/video/1000423939.zb8Fxy",
-    "#category": ("chevereto", "imagepond", "video"),
-    "#class"   : chevereto.CheveretoVideoExtractor,
+    "#category": ("chevereto", "imagepond", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
    "#results" : "https://media.imagepond.net/media/100042393993a6bfa75fc505e9.mp4",

    "album"    : "",
@@ -47,6 +49,7 @@ __tests__ = (
    "id"       : "zb8Fxy",
    "thumbnail": "https://media.imagepond.net/media/100042393993a6bfa75fc505e9.fr.jpeg",
    "title"    : "1000423939",
+    "type"     : "video",
    "url"      : "https://media.imagepond.net/media/100042393993a6bfa75fc505e9.mp4",
    "user"     : "christiankita",
    "width"    : 720,
--- a/test/results/imglike.py
+++ b/test/results/imglike.py
@@ -10,8 +10,8 @@ from gallery_dl.extractor import chevereto
 __tests__ = (
 {
    "#url"     : "https://imglike.com/image/EMT-Skills-Verification-by-EMSA.Lx6dT",
-    "#category": ("chevereto", "imglike", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "imglike", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
    "#results" : "https://imglike.com/images/2022/08/12/EMT-Skills-Verification-by-EMSA.gif",

    "album"    : "",
@@ -25,8 +25,8 @@ __tests__ = (

 {
    "#url"     : "https://www.imglike.com/image/EMT-Skills-Verification-by-EMSA.Lx6dT",
-    "#category": ("chevereto", "imglike", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "imglike", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
 },

 {
@@ -59,7 +59,7 @@ __tests__ = (
    "#url"     : "https://imglike.com/category/Bursting-boobs",
    "#category": ("chevereto", "imglike", "category"),
    "#class"   : chevereto.CheveretoCategoryExtractor,
-    "#pattern" : chevereto.CheveretoImageExtractor.pattern,
+    "#pattern" : chevereto.CheveretoFileExtractor.pattern,
    "#range"   : "1-100",
    "#count"   : 100,
 },
--- a/test/results/jpgfish.py
+++ b/test/results/jpgfish.py
@@ -10,8 +10,8 @@ from gallery_dl.extractor import chevereto
 __tests__ = (
 {
    "#url"     : "https://jpg7.cr/img/funnymeme.LecXGS",
-    "#category": ("chevereto", "jpgfish", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "jpgfish", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
    "#results"     : "https://simp3.selti-delivery.ru/images/funnymeme.jpg",
    "#sha1_content": "098e5e9b17ad634358426e0ffd1c93871474d13c",

@@ -23,14 +23,15 @@ __tests__ = (
    "filename" : "funnymeme",
    "id"       : "LecXGS",
    "title"    : "funnymeme",
+    "type"     : "article",
    "url"      : "https://simp3.selti-delivery.ru/images/funnymeme.jpg",
    "user"     : "exearco",
 },

 {
    "#url"     : "https://jpg4.su/img/funnymeme.LecXGS",
-    "#category": ("chevereto", "jpgfish", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "jpgfish", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
    "#results" : "https://simp3.selti-delivery.ru/images/funnymeme.jpg",

    "album"    : "",
@@ -45,8 +46,8 @@ __tests__ = (
 {
    "#url"     : "https://jpg6.su/img/LecXGS/",
    "#comment" : "image ID without name (#8307)",
-    "#category": ("chevereto", "jpgfish", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "jpgfish", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
    "#results"     : "https://simp3.selti-delivery.ru/images/funnymeme.jpg",
    "#sha1_content": "098e5e9b17ad634358426e0ffd1c93871474d13c",

@@ -61,8 +62,8 @@ __tests__ = (

 {
    "#url"     : "https://jpg.church/img/auCruA",
-    "#category": ("chevereto", "jpgfish", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "jpgfish", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
    "#results" : "https://simp2.selti-delivery.ru/hannahowo_00457.jpg",

    "album"     : "401-500",
@@ -74,50 +75,50 @@ __tests__ = (

 {
    "#url"     : "https://jpg1.su/img/funnymeme.LecXGS",
-    "#category": ("chevereto", "jpgfish", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "jpgfish", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
 },

 {
    "#url"     : "https://jpeg.pet/img/funnymeme.LecXGS",
-    "#category": ("chevereto", "jpgfish", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "jpgfish", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
 },

 {
    "#url"     : "https://jpg.pet/img/funnymeme.LecXGS",
-    "#category": ("chevereto", "jpgfish", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "jpgfish", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
 },

 {
    "#url"     : "https://jpg.fishing/img/funnymeme.LecXGS",
-    "#category": ("chevereto", "jpgfish", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "jpgfish", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
 },

 {
    "#url"     : "https://jpg.fish/img/funnymeme.LecXGS",
-    "#category": ("chevereto", "jpgfish", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "jpgfish", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
 },

 {
    "#url"     : "https://jpg.church/img/funnymeme.LecXGS",
-    "#category": ("chevereto", "jpgfish", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "jpgfish", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
 },

 {
    "#url"     : "https://www.jpg6.su/img/funnymeme.LecXGS",
-    "#category": ("chevereto", "jpgfish", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "jpgfish", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
 },

 {
    "#url"     : "https://jpg6.su/img/test.NLqFQHc",
-    "#category": ("chevereto", "jpgfish", "image"),
-    "#class"   : chevereto.CheveretoImageExtractor,
+    "#category": ("chevereto", "jpgfish", "file"),
+    "#class"   : chevereto.CheveretoFileExtractor,
    "#results" : "https://simp6.selti-delivery.ru/images3/test--2219f2531862b749d5.png",

    "album"     : "",