From ba62b5e37cbdf9cb632cdfe208131f8633075a78 Mon Sep 17 00:00:00 2001
From: "Mikhail Andreev (adw0rd)" <x11org@gmail.com>
Date: Wed, 23 Dec 2020 23:54:15 +0300
Subject: [PATCH] Remove moviepy [#1] Done

---
 README.md                  | 2 +-
 instagrapi/mixins/igtv.py  | 7 ++++++-
 instagrapi/mixins/video.py | 7 ++++++-
 instagrapi/story.py        | 7 ++++++-
 setup.py                   | 3 +--
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 9c87e8f2..45e8f5c1 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ The current types are in [types.py](/instagrapi/types.py):
 | UserShort      | Short public user data (used in Usertag, Comment, Media, Direct)                       |
 | Usertag        | Tag user in Media (coordinates + UserShort)                                            |
 | Location       | GEO location (GEO coordinates, name, address)                                          |
-| Hashtag        | Hashtag object (id, name, picture)
+| Hashtag        | Hashtag object (id, name, picture)                                                     |
 | Collection     | Collection of medias (name, picture and list of medias)                                |
 | Comment        | Comments to Media                                                                      |
 | StoryMention   | Mention users in Story (user, coordinates and dimensions)                              |
diff --git a/instagrapi/mixins/igtv.py b/instagrapi/mixins/igtv.py
index a8379ada..d45da3f8 100644
--- a/instagrapi/mixins/igtv.py
+++ b/instagrapi/mixins/igtv.py
@@ -5,7 +5,6 @@
 from typing import List
 from uuid import uuid4
 from PIL import Image
-import moviepy.editor as mp
 
 from instagrapi import config
 from instagrapi.extractors import extract_media_v1
@@ -188,6 +187,12 @@ def igtv_configure(
 def analyze_video(path: Path, thumbnail: Path = None) -> tuple:
     """Analyze and crop thumbnail if need
     """
+
+    try:
+        import moviepy.editor as mp
+    except ImportError:
+        raise Exception('Please install moviepy>=1.0.3 and retry')
+
     print(f'Analizing IGTV file "{path}"')
     video = mp.VideoFileClip(str(path))
     width, height = video.size
diff --git a/instagrapi/mixins/video.py b/instagrapi/mixins/video.py
index 567e7b68..dad5c8c1 100644
--- a/instagrapi/mixins/video.py
+++ b/instagrapi/mixins/video.py
@@ -4,7 +4,6 @@
 from pathlib import Path
 from typing import List
 from uuid import uuid4
-import moviepy.editor as mp
 from urllib.parse import urlparse
 
 from instagrapi import config
@@ -375,6 +374,12 @@ def video_configure_to_story(
 def analyze_video(path: Path, thumbnail: Path = None) -> tuple:
     """Analyze video file
     """
+
+    try:
+        import moviepy.editor as mp
+    except ImportError:
+        raise Exception('Please install moviepy>=1.0.3 and retry')
+
     print(f'Analizing video file "{path}"')
     video = mp.VideoFileClip(str(path))
     width, height = video.size
diff --git a/instagrapi/story.py b/instagrapi/story.py
index fb765bab..95e40a77 100644
--- a/instagrapi/story.py
+++ b/instagrapi/story.py
@@ -2,7 +2,12 @@
 from pathlib import Path
 from typing import List
 
-from moviepy.editor import TextClip, CompositeVideoClip, VideoFileClip, ImageClip
+try:
+    from moviepy.editor import (
+        TextClip, CompositeVideoClip, VideoFileClip, ImageClip
+    )
+except ImportError:
+    raise Exception('Please install moviepy==1.0.3 and retry')
 
 from .types import StoryBuild, StoryMention
 
diff --git a/setup.py b/setup.py
index 317237d6..5d6b8533 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@
 
 setup(
     name='instagrapi',
-    version='1.3.2',
+    version='1.3.3',
     author='Mikhail Andreev',
     author_email='x11org@gmail.com',
     license='MIT',
@@ -28,7 +28,6 @@
         'pytz==2020.1',
         'requests==2.24.0',
         'PySocks==1.7.1',
-        'moviepy==1.0.3',
         'Pillow==7.2.0',
         'pydantic==1.7.2'
     ],