From 5b0d10037623a1271a182078a05b2a6e1f70e2b3 Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Wed, 1 Apr 2020 18:15:51 -0700
Subject: [PATCH] acidcow_ver_pull

---
 youtube_dl/extractor/acidcow.py | 18 +-----------------
 youtube_dl/extractor/sonuma.py  | 23 -----------------------
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 youtube_dl/extractor/sonuma.py

diff --git a/youtube_dl/extractor/acidcow.py b/youtube_dl/extractor/acidcow.py
index 28e6459f6..3f8f9bb16 100644
--- a/youtube_dl/extractor/acidcow.py
+++ b/youtube_dl/extractor/acidcow.py
@@ -9,12 +9,7 @@ class acidcowIE(InfoExtractor):
     This class should be used to handle videos. Another class (TODO) will be
     used to implement playlists or other content.
     """
-    # _VALID_URL = r'https?://app.matter.online/tracks/((?P<id>\d+)-(?P<title>\S+))/?'
-    # VALID_URL = r'https?://acidcow.com/video/([0-9]+-(?P<title>\S+))/?'
-    # # r'https://cdn.acidcow.com/pics/%s/video/(\S+)' % video_id, video_id
-    # r'<video src="https://cdn.acidcow.com/pics/([0-9]+/(?P<title>\S+))"/>',
 
-    # _VALID_URL = r'https?://acidcow\.com/video/[0-9]+\S+'
     _VALID_URL = r'https?://acidcow\.com/video/(?P<id>\d+)-\S+'
 
     _TESTS = {
@@ -24,24 +19,13 @@ class acidcowIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        '''
-        webpage = self._download_webpage(
-            r'https://cdn\.acidcow\.com/pics/[0-9]+/video/\S', video_id
-        )
-        '''
+
         webpage = self._download_webpage(
             url, video_id
         )
 
         title = self._html_search_regex(r'<title>(.+?)</title>', webpage, 'title')
-        '''
-        download_url = self._html_search_regex(
 
-            r'<video src="https://cdn\.acidcow\.com/pics/[0-9]+/video/\S+" .+',
-
-            webpage, "download_url"
-        )
-        '''
         download_url = self._html_search_regex(
 
             r'(https://cdn\.acidcow\.com/pics/[0-9]+/video/\S+\.mp4)',
diff --git a/youtube_dl/extractor/sonuma.py b/youtube_dl/extractor/sonuma.py
deleted file mode 100644
index a0b8e56b7..000000000
--- a/youtube_dl/extractor/sonuma.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from .common import InfoExtractor
-
-class sonumaIE(InfoExtractor):
-
-
-	_VALID_URL=r'(?:https?://)?(?:www\.)?sonuma\.be/archive/'
-
-	def _real_extract(self, url):
-		video_id=self._match_id(url)
-		webpage = self._download_webpage("https://www.sonuma.be/archive/%s/"% video_id, video_id)
-		title = self._html_search_regex(r'<h1>(.+?)</h1>', webpage, 'title')
-
-		download_url=self._html_search_regex(
-			r'https://vod.infomaniak.com/redirect/sonumasa_2_vod/web2-39166/copy-32/d611823b-d693-29b6-e040'
-			r'-010a07647b9b.mp4?sKey=2faa94b1da19002ca8b8abe944a7ecc8', webpage, "title")
-		return{
-		'id':video_id,
-		'title':title,
-		'description': self._og_search_description(webpage),
-		}