From 11ed26b3186a1576536cc0f3bee48ce3b10c0805 Mon Sep 17 00:00:00 2001
From: Dan <14043624+delivrance@users.noreply.github.com>
Date: Sat, 15 Dec 2018 21:40:44 +0100
Subject: [PATCH] Refactor Animation, Video and VideoNote

---
 .../types/messages_and_media/animation.py     | 48 ++++++++++++++-----
 .../client/types/messages_and_media/video.py  | 45 ++++++++++++-----
 .../types/messages_and_media/video_note.py    | 41 ++++++++++++----
 3 files changed, 100 insertions(+), 34 deletions(-)

diff --git a/pyrogram/client/types/messages_and_media/animation.py b/pyrogram/client/types/messages_and_media/animation.py
index a8641e9e..0e36d5cf 100644
--- a/pyrogram/client/types/messages_and_media/animation.py
+++ b/pyrogram/client/types/messages_and_media/animation.py
@@ -16,7 +16,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
+from struct import pack
+
+from pyrogram.api import types
 from pyrogram.api.core import Object
+from .photo_size import PhotoSize
+from ...ext.utils import encode
 
 
 class Animation(Object):
@@ -53,18 +58,9 @@ class Animation(Object):
 
     ID = 0xb0700025
 
-    def __init__(
-            self,
-            file_id: str,
-            width: int,
-            height: int,
-            duration: int,
-            thumb=None,
-            file_name: str = None,
-            mime_type: str = None,
-            file_size: int = None,
-            date: int = None
-    ):
+    def __init__(self, file_id: str, width: int, height: int, duration: int, *,
+                 thumb=None, file_name: str = None, mime_type: str = None, file_size: int = None, date: int = None,
+                 client=None, raw=None):
         self.file_id = file_id
         self.thumb = thumb
         self.file_name = file_name
@@ -74,3 +70,31 @@ class Animation(Object):
         self.width = width
         self.height = height
         self.duration = duration
+
+        self._client = client
+        self._raw = raw
+
+    @staticmethod
+    def parse(client, animation: types.Document, video_attributes: types.DocumentAttributeVideo,
+              file_name: str) -> "Animation":
+        return Animation(
+            file_id=encode(
+                pack(
+                    "<iiqq",
+                    10,
+                    animation.dc_id,
+                    animation.id,
+                    animation.access_hash
+                )
+            ),
+            width=getattr(video_attributes, "w", 0),
+            height=getattr(video_attributes, "h", 0),
+            duration=getattr(video_attributes, "duration", 0),
+            thumb=PhotoSize.parse(client, animation.thumb),
+            mime_type=animation.mime_type,
+            file_size=animation.size,
+            file_name=file_name,
+            date=animation.date,
+            client=client,
+            raw=animation
+        )
diff --git a/pyrogram/client/types/messages_and_media/video.py b/pyrogram/client/types/messages_and_media/video.py
index 8b272a2d..4873730c 100644
--- a/pyrogram/client/types/messages_and_media/video.py
+++ b/pyrogram/client/types/messages_and_media/video.py
@@ -16,7 +16,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
+from struct import pack
+
+from pyrogram.api import types
 from pyrogram.api.core import Object
+from .photo_size import PhotoSize
+from ...ext.utils import encode
 
 
 class Video(Object):
@@ -53,18 +58,9 @@ class Video(Object):
 
     ID = 0xb0700008
 
-    def __init__(
-            self,
-            file_id: str,
-            width: int,
-            height: int,
-            duration: int,
-            thumb=None,
-            file_name: str = None,
-            mime_type: str = None,
-            file_size: int = None,
-            date: int = None
-    ):
+    def __init__(self, file_id: str, width: int, height: int, duration: int, *,
+                 thumb=None, file_name: str = None, mime_type: str = None, file_size: int = None, date: int = None,
+                 client=None, raw=None):
         self.file_id = file_id
         self.thumb = thumb
         self.file_name = file_name
@@ -74,3 +70,28 @@ class Video(Object):
         self.width = width
         self.height = height
         self.duration = duration
+
+        self._client = client
+        self._raw = raw
+
+    @staticmethod
+    def parse(client, video: types.Document, video_attributes: types.DocumentAttributeVideo, file_name: str) -> "Video":
+        return Video(
+            file_id=encode(
+                pack(
+                    "<iiqq",
+                    4,
+                    video.dc_id,
+                    video.id,
+                    video.access_hash
+                )
+            ),
+            width=video_attributes.w,
+            height=video_attributes.h,
+            duration=video_attributes.duration,
+            thumb=PhotoSize.parse(client, video.thumb),
+            mime_type=video.mime_type,
+            file_size=video.size,
+            file_name=file_name,
+            date=video.date
+        )
diff --git a/pyrogram/client/types/messages_and_media/video_note.py b/pyrogram/client/types/messages_and_media/video_note.py
index 642eb5aa..0b07c00b 100644
--- a/pyrogram/client/types/messages_and_media/video_note.py
+++ b/pyrogram/client/types/messages_and_media/video_note.py
@@ -16,7 +16,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
+from struct import pack
+
+from pyrogram.api import types
 from pyrogram.api.core import Object
+from .photo_size import PhotoSize
+from ...ext.utils import encode
 
 
 class VideoNote(Object):
@@ -47,16 +52,9 @@ class VideoNote(Object):
 
     ID = 0xb0700010
 
-    def __init__(
-            self,
-            file_id: str,
-            length: int,
-            duration: int,
-            thumb=None,
-            mime_type: str = None,
-            file_size: int = None,
-            date: int = None
-    ):
+    def __init__(self, file_id: str, length: int, duration: int, *,
+                 thumb=None, mime_type: str = None, file_size: int = None, date: int = None,
+                 client=None, raw=None):
         self.file_id = file_id
         self.thumb = thumb
         self.mime_type = mime_type
@@ -64,3 +62,26 @@ class VideoNote(Object):
         self.date = date
         self.length = length
         self.duration = duration
+
+        self._client = client
+        self._raw = raw
+
+    @staticmethod
+    def parse(client, video_note: types.Document, video_attributes: types.DocumentAttributeVideo) -> "VideoNote":
+        return VideoNote(
+            file_id=encode(
+                pack(
+                    "<iiqq",
+                    13,
+                    video_note.dc_id,
+                    video_note.id,
+                    video_note.access_hash
+                )
+            ),
+            length=video_attributes.w,
+            duration=video_attributes.duration,
+            thumb=PhotoSize.parse(client, video_note.thumb),
+            file_size=video_note.size,
+            mime_type=video_note.mime_type,
+            date=video_note.date
+        )