From 9fa57892790ce205634f6a7c83de2b9e52ab5284 Mon Sep 17 00:00:00 2001
From: Remita Amine <remitamine@gmail.com>
Date: Sun, 14 Aug 2016 19:04:23 +0100
Subject: [PATCH] [viceland] fix info extraction(closes #8799)

---
 youtube_dl/extractor/uplynk.py   | 11 +++++++----
 youtube_dl/extractor/viceland.py |  7 +++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/youtube_dl/extractor/uplynk.py b/youtube_dl/extractor/uplynk.py
index a6a685c9d..4313bc9cb 100644
--- a/youtube_dl/extractor/uplynk.py
+++ b/youtube_dl/extractor/uplynk.py
@@ -26,8 +26,8 @@ class UplynkIE(InfoExtractor):
         },
     }
 
-    def _real_extract(self, url):
-        path, external_id, video_id, session_id = re.match(self._VALID_URL, url).groups()
+    def _extract_uplynk_info(self, uplynk_content_url):
+        path, external_id, video_id, session_id = re.match(UplynkIE._VALID_URL, uplynk_content_url).groups()
         display_id = video_id or external_id
         formats = self._extract_m3u8_formats('http://content.uplynk.com/%s.m3u8' % path, display_id, 'mp4')
         if session_id:
@@ -49,8 +49,11 @@ class UplynkIE(InfoExtractor):
             'formats': formats,
         }
 
+    def _real_extract(self, url):
+        return self._extract_uplynk_info(url)
+
 
-class UplynkPreplayIE(InfoExtractor):
+class UplynkPreplayIE(UplynkIE):
     _VALID_URL = r'https?://.*?\.uplynk\.com/preplay2?/(?P<path>ext/[0-9a-f]{32}/(?P<external_id>[^/?&]+)|(?P<id>[0-9a-f]{32}))\.json'
 
     def _real_extract(self, url):
@@ -61,4 +64,4 @@ class UplynkPreplayIE(InfoExtractor):
         session_id = preplay.get('sid')
         if session_id:
             content_url += '?pbs=' + session_id
-        return self.url_result(content_url, 'Uplynk')
+        return self._extract_uplynk_info(content_url)
diff --git a/youtube_dl/extractor/viceland.py b/youtube_dl/extractor/viceland.py
index c66e8eb95..f72294b51 100644
--- a/youtube_dl/extractor/viceland.py
+++ b/youtube_dl/extractor/viceland.py
@@ -25,6 +25,13 @@ class VicelandIE(AdobePass):
         'info_dict': {
             'id': '57608447973ee7705f6fbd4e',
             'ext': 'mp4',
+            'title': 'CYBERWAR (Trailer)',
+            'description': 'Tapping into the geopolitics of hacking and surveillance, Ben Makuch travels the world to meet with hackers, government officials, and dissidents to investigate the ecosystem of cyberwarfare.',
+            'age_limit': 14,
+            'timestamp': 1466008539,
+            'upload_date': '20160615',
+            'uploader_id': '11',
+            'uploader': 'Viceland',
         },
         'params': {
             # m3u8 download