From 36066dd3ee3f90c3feb136ec4c85a03ece5b8585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Sun, 6 Dec 2015 09:42:00 +0600 Subject: [PATCH] [movshare] Rename to wholecloud --- youtube_dl/extractor/__init__.py | 2 +- youtube_dl/extractor/novamov.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index ed85d0ee5..3db5cd6d9 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -424,7 +424,7 @@ from .nova import NovaIE from .novamov import ( NovaMovIE, - MovShareIE, + WholeCloudIE, NowVideoIE, VideoWeedIE, CloudTimeIE, diff --git a/youtube_dl/extractor/novamov.py b/youtube_dl/extractor/novamov.py index 53d656f9d..bbbb8fe58 100644 --- a/youtube_dl/extractor/novamov.py +++ b/youtube_dl/extractor/novamov.py @@ -94,20 +94,20 @@ def extract_filekey(default=NO_DEFAULT): } -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'Title: ([^<]+)

' _DESCRIPTION_REGEX = r'Description: ([^<]+)

' _TEST = { - 'url': 'http://www.movshare.net/video/559e28be54d96', + 'url': 'http://www.wholecloud.net/video/559e28be54d96', 'md5': 'abd31a2132947262c50429e1d16c1bfd', 'info_dict': { 'id': '559e28be54d96',