X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fnovamov.py;h=837c915595777c7688665d00344a7a1eaa75dc1c;hb=ff51983e1563db08734e43a07d5671a517f99ef6;hp=0605c0e0d131b591e8da32dcc20a24073d85199a;hpb=33d152b6cc04bfdf658691dbf12c1d976cfa0ba3;p=youtube-dl

diff --git a/youtube_dl/extractor/novamov.py b/youtube_dl/extractor/novamov.py
index 0605c0e0d..837c91559 100644
--- a/youtube_dl/extractor/novamov.py
+++ b/youtube_dl/extractor/novamov.py
@@ -94,20 +94,20 @@ class NovaMovIE(InfoExtractor):
         }
 
 
-class MovShareIE(NovaMovIE):
-    IE_NAME = 'movshare'
-    IE_DESC = 'MovShare'
+class WholeCloudIE(NovaMovIE):
+    IE_NAME = 'wholecloud'
+    IE_DESC = 'WholeCloud'
 
-    _VALID_URL = NovaMovIE._VALID_URL_TEMPLATE % {'host': 'movshare\.(?:net|sx|ag)'}
+    _VALID_URL = NovaMovIE._VALID_URL_TEMPLATE % {'host': '(?:wholecloud\.net|movshare\.(?:net|sx|ag))'}
 
-    _HOST = 'www.movshare.net'
+    _HOST = 'www.wholecloud.net'
 
     _FILE_DELETED_REGEX = r'>This file no longer exists on our servers.<'
     _TITLE_REGEX = r'<strong>Title:</strong> ([^<]+)</p>'
     _DESCRIPTION_REGEX = r'<strong>Description:</strong> ([^<]+)</p>'
 
     _TEST = {
-        'url': 'http://www.movshare.net/video/559e28be54d96',
+        'url': 'http://www.wholecloud.net/video/559e28be54d96',
         'md5': 'abd31a2132947262c50429e1d16c1bfd',
         'info_dict': {
             'id': '559e28be54d96',
@@ -132,7 +132,7 @@ class NowVideoIE(NovaMovIE):
     _DESCRIPTION_REGEX = r'</h4>\s*<p>([^<]+)</p>'
 
     _TEST = {
-        'url': 'http://www.nowvideo.ch/video/0mw0yow7b6dxa',
+        'url': 'http://www.nowvideo.to/video/0mw0yow7b6dxa',
         'md5': 'f8fbbc8add72bd95b7850c6a02fc8817',
         'info_dict': {
             'id': '0mw0yow7b6dxa',
@@ -164,3 +164,17 @@ class VideoWeedIE(NovaMovIE):
             'description': ''
         },
     }
+
+
+class CloudTimeIE(NovaMovIE):
+    IE_NAME = 'cloudtime'
+    IE_DESC = 'CloudTime'
+
+    _VALID_URL = NovaMovIE._VALID_URL_TEMPLATE % {'host': 'cloudtime\.to'}
+
+    _HOST = 'www.cloudtime.to'
+
+    _FILE_DELETED_REGEX = r'>This file no longer exists on our servers.<'
+    _TITLE_REGEX = r'<div[^>]+class=["\']video_det["\'][^>]*>\s*<strong>([^<]+)</strong>'
+
+    _TEST = None