Skip to content

Bulk asynchronous downloader for multiple file hosts

feat: support view URLs (vidara)

NTFSvolume7288bc9dd3cc
diff --git a/cyberdrop_dl/crawlers/vidara.py b/cyberdrop_dl/crawlers/vidara.py
index 291ac50ab..f311a4312 100644
--- a/cyberdrop_dl/crawlers/vidara.py
+++ b/cyberdrop_dl/crawlers/vidara.py
@@ -1,5 +1,6 @@
from __future__ import annotations
+import dataclasses
from typing import TYPE_CHECKING, ClassVar
from cyberdrop_dl.crawlers.crawler import Crawler, DownloadConfig, SupportedDomains, SupportedPaths
@@ -23,37 +24,41 @@ class VidaraCrawler(Crawler):
"stmix.io",
"vidvara.lol",
)
- SUPPORTED_PATHS: ClassVar[SupportedPaths] = {"Video": "/e/<video_id>"}
+ SUPPORTED_PATHS: ClassVar[SupportedPaths] = {
+ "Video": (
+ "/e/<video_id>",
+ "/v/<video_id>",
+ ),
+ }
DOMAIN: ClassVar[str] = "vidara"
PRIMARY_URL: ClassVar[AbsoluteHttpURL] = AbsoluteHttpURL("https://vidara.to")
async def fetch(self, scrape_item: ScrapeItem) -> None:
match scrape_item.url.parts[1:]:
- case ["e", video_id]:
+ case ["e" | "v", video_id]:
await self.video(scrape_item, video_id)
case _:
raise ValueError
@error_handling_wrapper
async def video(self, scrape_item: ScrapeItem, video_id: str) -> None:
- if await self.check_complete_from_referer(scrape_item.url):
+ embed_url = self.PRIMARY_URL / "e" / video_id
+ if await self.check_complete(embed_url):
return
- m3u8_url, thumbnail = await self._request_stream(video_id)
- m3u8, info = await self.request_m3u8_playlist(m3u8_url)
- name, ext = self.get_filename_and_ext(video_id + ".mp4")
-
+ video = await self._request_stream(video_id)
+ m3u8, info = await self.request_m3u8_playlist(video.m3u8)
await self.handle_file(
- scrape_item.url,
+ embed_url,
scrape_item,
- name,
- ext,
+ video.title,
+ ext := ".mp4",
m3u8=m3u8,
- custom_filename=self.create_custom_filename(name, ext, resolution=info.resolution),
- thumbnail=thumbnail,
+ custom_filename=self.create_custom_filename(video.title, ext, resolution=info.resolution),
+ thumbnail=video.thumb,
)
- async def _request_stream(self, video_id: str) -> tuple[AbsoluteHttpURL, AbsoluteHttpURL]:
+ async def _request_stream(self, video_id: str) -> Video:
resp = await self.request_json(
self.PRIMARY_URL / "api/stream",
method="POST",
@@ -62,7 +67,17 @@ class VidaraCrawler(Crawler):
"filecode": video_id,
},
)
- return (
- self.parse_url(resp["streaming_url"]),
- self.parse_url(resp["thumbnail"]),
+ return Video(
+ id=video_id,
+ title=resp.get("title") or video_id,
+ m3u8=self.parse_url(resp["streaming_url"]),
+ thumb=self.parse_url(resp["thumbnail"]),
)
+
+
[email protected](slots=True, frozen=True)
+class Video:
+ id: str
+ title: str
+ m3u8: AbsoluteHttpURL
+ thumb: AbsoluteHttpURL