X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fmoevideo.py;h=5a66302f6ec317f89c4153248565159ebd075010;hb=2bc43303031215436b201e656094b60ab3ec7e9e;hp=d2a73fdabfd52c727b8fa79067f68cae3117d796;hpb=5fb9077e8ca2e8bbab5f9e1c57747ff44296fe62;p=youtube-dl diff --git a/youtube_dl/extractor/moevideo.py b/youtube_dl/extractor/moevideo.py index d2a73fdab..5a66302f6 100644 --- 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(?:www\.)? - (?:moevideo\.net|playreplay\.net))/ + (?:(?:moevideo|playreplay|videochart)\.net))/ (?:video|framevideo)/(?P[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 {