From 1dc42a2c6a5a6f81f6bab70a7cd7d1ebb253e97b Mon Sep 17 00:00:00 2001 From: Lam Date: Mon, 20 Apr 2020 20:41:52 +0200 Subject: [PATCH] Revert "[einthusan] Add support for einthusan.com (closes #21748) (#21775)" This reverts commit 97d98a8b5950a496eba9837860d6dc137e21f2af. --- youtube_dl/extractor/einthusan.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/youtube_dl/extractor/einthusan.py b/youtube_dl/extractor/einthusan.py index 1fb00c9b0774..4485bf8c1a8a 100644 --- a/youtube_dl/extractor/einthusan.py +++ b/youtube_dl/extractor/einthusan.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import json -import re from .common import InfoExtractor from ..compat import ( @@ -19,7 +18,7 @@ class EinthusanIE(InfoExtractor): - _VALID_URL = r'https?://(?Peinthusan\.(?:tv|com))/movie/watch/(?P[^/?#&]+)' + _VALID_URL = r'https?://einthusan\.tv/movie/watch/(?P[^/?#&]+)' _TESTS = [{ 'url': 'https://einthusan.tv/movie/watch/9097/', 'md5': 'ff0f7f2065031b8a2cf13a933731c035', @@ -33,9 +32,6 @@ class EinthusanIE(InfoExtractor): }, { 'url': 'https://einthusan.tv/movie/watch/51MZ/?lang=hindi', 'only_matching': True, - }, { - 'url': 'https://einthusan.com/movie/watch/9097/', - 'only_matching': True, }] # reversed from jsoncrypto.prototype.decrypt() in einthusan-PGMovieWatcher.js @@ -45,9 +41,7 @@ def _decrypt(self, encrypted_data, video_id): )).decode('utf-8'), video_id) def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - host = mobj.group('host') - video_id = mobj.group('id') + video_id = self._match_id(url) webpage = self._download_webpage(url, video_id) @@ -59,7 +53,7 @@ def _real_extract(self, url): page_id = self._html_search_regex( ']+data-pageid="([^"]+)"', webpage, 'page ID') video_data = self._download_json( - 'https://%s/ajax/movie/watch/%s/' % (host, video_id), video_id, + 'https://einthusan.tv/ajax/movie/watch/%s/' % video_id, video_id, data=urlencode_postdata({ 'xEvent': 'UIVideoPlayer.PingOutcome', 'xJson': json.dumps({