Video upload replaced with passing a URL; add VK clips

Author: NetherQuartz

downloadbot/__main__.py

@@ -17,7 +17,7 @@
 welcome_text = """
 Hello there 👋
 
-I can download videos from X/Twitter 🐦, Pinterest 📍, Instagram 📸 and TikTok ♪. Just send me a link
+I can download videos from X/Twitter 🐦, Pinterest 📍, Instagram 📸, TikTok ♪ and VK. Just send me a link
 
 Also you can add me to a group or use me in any chat with `@QuartzMediaBot <your link>`
 """
@@ -32,46 +32,45 @@ async def start(message: types.Message) -> None:
 pinterest_pattern = r"(?:https?://)?(?:www\.)?(?:\w+\.)?(?:pin\.it|pinterest\.com)/\S+"
 instagram_pattern = r"(?:https?://)?(?:www\.)?instagram\.com/\S+"
 tiktok_pattern = r"(?:https?://)?(?:www\.)?(?:\w+\.)?tiktok\.com/\S+"
+vk_pattern = r"(?:https?://)?(?:www\.)?(?:\w+\.)?vk\.(?:com|ru)/clip-\S+"
 
-combined_pattern = "|".join([twitter_pattern, pinterest_pattern, instagram_pattern, tiktok_pattern])
+combined_pattern = "|".join([
+    twitter_pattern,
+    pinterest_pattern,
+    instagram_pattern,
+    tiktok_pattern,
+    vk_pattern
+])
 
 
 @bot.message_handler(regexp=combined_pattern)
 async def download_video(message: types.Message) -> None:
     progress_msg = await bot.reply_to(message, "🔎")
     try:
         url = re.findall(combined_pattern, message.text)[0]
-        video = await get_video(url)
+        video = await get_video(url, download=True)
+        msg = None
 
-        if video.buffer:
-            if not video.is_image and video.has_audio:
+        match video.content_type:
+            case "video/mp4":
                 telebot.logger.debug("Sending video")
-                await bot.send_video(
+                msg = await bot.send_video(
                     message.chat.id,
-                    video=video.buffer,
-                    height=video.height,
-                    width=video.width,
-                    supports_streaming=True,
+                    video=video.url,
                     reply_parameters=types.ReplyParameters(message_id=message.id)
                 )
-            elif video.is_image:
+            case _ if video.buffer:
                 telebot.logger.debug("Sending photo")
-                await bot.send_photo(
+                msg = await bot.send_photo(
                     message.chat.id,
                     photo=video.buffer,
                     reply_parameters=types.ReplyParameters(message_id=message.id)
                 )
-            elif not video.has_audio:
-                telebot.logger.debug("Sending gif")
-                await bot.send_animation(
-                    message.chat.id,
-                    animation=video.buffer,
-                    height=video.height,
-                    width=video.width,
-                    reply_parameters=types.ReplyParameters(message_id=message.id)
-                )
-        elif message.chat.type == "private":
-            await bot.reply_to(message, text="It seems not to be a link to video 😔")
+            case _ if message.chat.type == "private":
+                await bot.reply_to(message, text="It seems not to be a link to video 😔")
+
+        if msg:
+            telebot.logger.info(f"{msg.video=} {msg.photo=} {msg.animation=} {msg.document=}")
 
     except Exception as e:
         telebot.logger.exception(e)

downloadbot/download.py

@@ -24,16 +24,33 @@ class Video:
     width: int | None
     is_image: bool
     has_audio: bool | None
+    skipped_download: bool
+    content_type: str | None
 
 
 HEADERS = {"Content-Type": "application/json", "Accept": "application/json"}
 DEFAULT_THUMBNAIL = "https://avatars.mds.yandex.net/i?id=f8e7cca4d77040af7b7a642f2ee39c81_l-4902542-images-thumbs&n=13"
 
 
 async def download_video(session: aiohttp.ClientSession, video_data: Video) -> Video:
-    async with session.get(video_data.url) as video_response:
+    async with session.get(video_data.url, headers={"Range": "bytes=0-"}) as video_response:
+        logger.info(f"Response headers: {video_response.headers}")
+        video_data.content_type = video_response.headers.get("Content-Type")
+        logger.info(f"Content type: {video_data.content_type}")
+        if video_data.content_type and video_data.content_type.split("/")[0] == "video":
+            video_data.skipped_download = True
+            return video_data
+
         video_buffer = BytesIO()
-        video_buffer.write(await video_response.read())
+        while True:
+            chunk = None
+            try:
+                chunk = await video_response.content.readany()
+            except:
+                break
+            if not chunk:
+                break
+            video_buffer.write(chunk)
         video_buffer.seek(0)
 
     video_data.buffer = video_buffer
@@ -63,19 +80,6 @@ async def download_video(session: aiohttp.ClientSession, video_data: Video) -> V
         info = json.loads(result.stdout or r"{}")
         video_data.has_audio = bool(info.get("streams"))
 
-        if not video_data.has_audio and not video_data.is_image:
-            gif_path = tmp.name + ".gif"
-            convert_cmd = [
-                "ffmpeg", "-y",
-                "-i", tmp.name,
-                "-f", "gif",
-                gif_path
-            ]
-            subprocess.run(convert_cmd, check=True)
-            with open(gif_path, "rb") as f:
-                video_buffer.write(f.read())
-                video_buffer.seek(0)
-
     logger.info(f"{video_data=}")
     return video_data
 
@@ -90,7 +94,9 @@ async def get_video(post_url: str, download: bool = True) -> Video:
         height=None,
         width=None,
         is_image=False,
-        has_audio=None
+        has_audio=None,
+        skipped_download=False,
+        content_type=None
     )
 
     async with aiohttp.ClientSession() as session: