Merge remote-tracking branch 'Dineshs91/f4m-2.0'

[youtube-dl] / youtube_dl / extractor / moevideo.py

diff --git a/youtube_dl/extractor/moevideo.py b/youtube_dl/extractor/moevideo.py
index d2a73fdabfd52c727b8fa79067f68cae3117d796..5a66302f6ec317f89c4153248565159ebd075010 100644 (file)
--- a/youtube_dl/extractor/moevideo.py
+++ b/youtube_dl/extractor/moevideo.py
@@ -5,19 +5,21 @@ import json
 import re
 
 from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
+from ..compat import (
     compat_urllib_parse,
     compat_urllib_request,
+)
+from ..utils import (
+    ExtractorError,
     int_or_none,
 )
 
 
 class MoeVideoIE(InfoExtractor):
-    IE_DESC = 'moevideo.net and playreplay.net'
+    IE_DESC = 'LetitBit video services: moevideo.net, playreplay.net and videochart.net'
     _VALID_URL = r'''(?x)
         https?://(?P<host>(?:www\.)?
-        (?:moevideo\.net|playreplay\.net))/
+        (?:(?:moevideo|playreplay|videochart)\.net))/
         (?:video|framevideo)/(?P<id>[0-9]+\.[0-9A-Za-z]+)'''
     _API_URL = 'http://api.letitbit.net/'
     _API_KEY = 'tVL0gjqo5'
@@ -34,7 +36,7 @@ class MoeVideoIE(InfoExtractor):
                 'width': 540,
                 'height': 360,
                 'duration': 179,
-                'filesize_approx': 17822500,
+                'filesize': 17822500,
             }
         },
         {
@@ -49,8 +51,9 @@ class MoeVideoIE(InfoExtractor):
                 'width': 480,
                 'height': 296,
                 'duration': 6027,
-                'filesize_approx': 588257923,
-            }
+                'filesize': 588257923,
+            },
+            'skip': 'Video has been removed',
         },
     ]
 
@@ -99,7 +102,7 @@ class MoeVideoIE(InfoExtractor):
             'url': video_url,
             'width': width,
             'height': height,
-            'filesize_approx': filesize,
+            'filesize': filesize,
         }]
 
         return {