Merge pull request #153 from Dineshkarthik/146-feature-download-video…

…-note

Enhancement -  Support for Video-Note Download

.gitignore

@@ -58,3 +58,4 @@ document/
 photo/
 voice/
 video/
+video_note/

config.yaml

@@ -9,11 +9,11 @@ media_types:
 - video
 - document
 - voice
+- video_note
 file_formats:
   audio:
   - all
   document:
   - all
   video:
   - all
-

media_downloader.py

@@ -1,18 +1,18 @@
 """Downloads media from telegram."""
-import os
+import asyncio
 import logging
-from typing import List, Tuple, Optional, Union
+import os
 from datetime import datetime as dt
+from typing import List, Optional, Tuple, Union
 
-import asyncio
 import pyrogram
 import yaml
-from pyrogram.types import Audio, Document, Photo, Video, Voice
+from pyrogram.types import Audio, Document, Photo, Video, VideoNote, Voice
+
 from utils.file_management import get_next_name, manage_duplicate_file
 from utils.log import LogFilter
 from utils.meta import print_meta
 
-
 logging.basicConfig(level=logging.INFO)
 logging.getLogger("pyrogram.session.session").addFilter(LogFilter())
 logging.getLogger("pyrogram.client").addFilter(LogFilter())
@@ -84,13 +84,14 @@ def _is_exist(file_path: str) -> bool:
 
 
 async def _get_media_meta(
-    media_obj: Union[Audio, Document, Photo, Video, Voice], _type: str
+    media_obj: Union[Audio, Document, Photo, Video, VideoNote, Voice],
+    _type: str,
 ) -> Tuple[str, Optional[str]]:
     """Extract file name and file id from media object.
 
     Parameters
     ----------
-    media_obj: Union[Audio, Document, Photo, Video, Voice]
+    media_obj: Union[Audio, Document, Photo, Video, VideoNote, Voice]
         Media object to be extracted.
     _type: str
         Type of media object.
@@ -106,13 +107,14 @@ async def _get_media_meta(
     else:
         file_format = None
 
-    if _type == "voice":
+    if _type in ["voice", "video_note"]:
         # pylint: disable = C0209
         file_format = media_obj.mime_type.split("/")[-1]  # type: ignore
         file_name: str = os.path.join(
             THIS_DIR,
             _type,
-            "voice_{}.{}".format(
+            "{}_{}.{}".format(
+                _type,
                 dt.utcfromtimestamp(media_obj.date).isoformat(),  # type: ignore
                 file_format,
             ),
@@ -190,7 +192,7 @@ async def download_media(
                 "Message[%d]: file reference expired, refetching...",
                 message.message_id,
             )
-            message = await client.get_messages( # type: ignore
+            message = await client.get_messages(  # type: ignore
                 chat_id=message.chat.id,  # type: ignore
                 message_ids=message.message_id,
             )

tests/test_media_downloader.py

@@ -60,6 +60,7 @@ def __init__(self, **kwargs):
         self.photo = kwargs.get("photo", None)
         self.video = kwargs.get("video", None)
         self.voice = kwargs.get("voice", None)
+        self.video_note = kwargs.get("video_note", None)
         self.chat = Chat(kwargs.get("chat_id", None))
 
 
@@ -91,6 +92,12 @@ def __init__(self, **kwargs):
         self.mime_type = kwargs["mime_type"]
 
 
+class MockVideoNote:
+    def __init__(self, **kwargs):
+        self.mime_type = kwargs["mime_type"]
+        self.date = kwargs["date"]
+
+
 class MockEventLoop:
     def __init__(self):
         pass
@@ -317,6 +324,28 @@ def test_get_media_meta(self):
             result,
         )
 
+        # Test VideoNote
+        message = MockMessage(
+            id=6,
+            media=True,
+            video_note=MockVideoNote(
+                mime_type="video/mp4",
+                date=1564066430,
+            ),
+        )
+        result = self.loop.run_until_complete(
+            async_get_media_meta(message.video_note, "video_note")
+        )
+        self.assertEqual(
+            (
+                platform_generic_path(
+                    "/root/project/video_note/video_note_2019-07-25T14:53:50.mp4"
+                ),
+                "mp4",
+            ),
+            result,
+        )
+
     @mock.patch("media_downloader.THIS_DIR", new=MOCK_DIR)
     @mock.patch("media_downloader.asyncio.sleep", return_value=None)
     @mock.patch("media_downloader.logger")

utils/__init__.py

@@ -1,6 +1,6 @@
 """Init namespace"""
 
-__version__ = "1.3.0"
+__version__ = "1.4.0"
 __license__ = "MIT License"
 __copyright__ = (
     "Copyright (C) 2019 Dineshkarthik <https://github.com/Dineshkarthik>"