From e16a6150ea095e7689c5ac977539dd898fb1e979 Mon Sep 17 00:00:00 2001
From: g00dy22 <g00dy22@mt2014.com>
Date: Sat, 6 May 2017 01:05:46 +0300
Subject: [PATCH 1/2] [VideoIUA] Add new extractor

---
 youtube_dl/extractor/extractors.py |  1 +
 youtube_dl/extractor/videoiua.py   | 33 ++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 youtube_dl/extractor/videoiua.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 1d749591001..76c6c52efbe 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -1134,6 +1134,7 @@
 from .videa import VideaIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
+from .videoiua import VideoIUAIE
 from .videomega import VideoMegaIE
 from .videomore import (
     VideomoreIE,
diff --git a/youtube_dl/extractor/videoiua.py b/youtube_dl/extractor/videoiua.py
new file mode 100644
index 00000000000..aefa15ad765
--- /dev/null
+++ b/youtube_dl/extractor/videoiua.py
@@ -0,0 +1,33 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+from .common import InfoExtractor
+
+
+class VideoIUAIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?video\.i\.ua/user/(?P<user>[0-9]+)/(?P<folder>[0-9]+)/(?P<id>[0-9]+)'
+    _TEST = {
+        'url': 'http://video.i.ua/user/3698736/77516/459718/',
+        'md5': '7a9b4483dece501b69ac772156d85ce6',
+        'info_dict': {
+            'id': '459718',
+            'ext': 'mp4',
+            'title': u'Красавица на качелях...',
+            'thumbnail': r're:^https?://.*\.jpg$'
+        }
+    }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        title = self._html_search_regex(r'<div\s+class="post_title">\s*<h2>(.+?)</h2>', webpage, 'title')
+        self.report_extraction(video_id)
+        video_url = self._html_search_regex(r'<video\s*id="video"\s*src="(.+?)"', webpage, u'video URL')
+        thumb_url = self._html_search_regex(r"poster:\s*'(.+?)'", webpage, u'thumbnail URL')
+        return {
+            'id': video_id,
+            'title': title,
+            'url': video_url,
+            'ext': 'mp4',
+            'thumbnail': thumb_url
+        }

From c62005aefbfa6dc972bab1f71a1086e286c854fc Mon Sep 17 00:00:00 2001
From: g00dy22 <g00dy22@mt2014.com>
Date: Sat, 6 May 2017 01:28:45 +0300
Subject: [PATCH 2/2] [VideoIUA] Add new extractor

---
 youtube_dl/extractor/videoiua.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/youtube_dl/extractor/videoiua.py b/youtube_dl/extractor/videoiua.py
index aefa15ad765..3f759134f8d 100644
--- a/youtube_dl/extractor/videoiua.py
+++ b/youtube_dl/extractor/videoiua.py
@@ -5,14 +5,14 @@
 
 
 class VideoIUAIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?video\.i\.ua/user/(?P<user>[0-9]+)/(?P<folder>[0-9]+)/(?P<id>[0-9]+)'
+    _VALID_URL = r'https?://(?:www\.)?video\.i\.ua/(user|channel)/((?P<user>[0-9]+)/(?P<folder>[0-9]+)|(?P<channel>[0-9]+))/(?P<id>[0-9]+)'
     _TEST = {
-        'url': 'http://video.i.ua/user/3698736/77516/459718/',
-        'md5': '7a9b4483dece501b69ac772156d85ce6',
+        'url': 'http://video.i.ua/channel/528/405379/',
+        'md5': 'c641d67f0b242f3ef8eebe683dbbce22',
         'info_dict': {
-            'id': '459718',
+            'id': '405379',
             'ext': 'mp4',
-            'title': u'Красавица на качелях...',
+            'title': 'Airbats 801 TTS 03 of 07',
             'thumbnail': r're:^https?://.*\.jpg$'
         }
     }