From 46d03da3dd467502dd4034f9dd0bcc51ffe6b6b3 Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Sat, 28 Mar 2020 18:47:16 -0700
Subject: [PATCH] Sonuma and acidcow

---
 youtube_dl/extractor/acidcow.py    | 37 ++++++++++++++++++++++++++++++
 youtube_dl/extractor/extractors.py |  1 +
 youtube_dl/extractor/sonuma.py     |  6 +++--
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 youtube_dl/extractor/acidcow.py

diff --git a/youtube_dl/extractor/acidcow.py b/youtube_dl/extractor/acidcow.py
new file mode 100644
index 000000000..b023d747f
--- /dev/null
+++ b/youtube_dl/extractor/acidcow.py
@@ -0,0 +1,37 @@
+from __future__ import unicode_literals
+
+from .common import InfoExtractor
+
+
+class acidcowIE(InfoExtractor):
+    """
+    InfoExtractor for acid.cow
+    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+))/?'
+    _TESTS = {
+        # TODO: Implement
+
+    }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(
+            r'https://cdn.acidcow.com/pics/%s/video/(\S+)' % video_id, 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]+/(?P<title>\s+))"/>',
+
+            webpage, "download_url"
+        )
+
+        return {
+            'id': video_id,
+            'url': download_url,
+            'title': title
+        }
+-
\ No newline at end of file
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 105a0864b..5565a316a 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -1033,6 +1033,7 @@ from .southpark import (
     SouthParkNlIE
 )
 from .sonuma import sonumaIE
+from .acidcow import acidcowIE
 from .spankbang import (
     SpankBangIE,
     SpankBangPlaylistIE,
diff --git a/youtube_dl/extractor/sonuma.py b/youtube_dl/extractor/sonuma.py
index 43776f958..a0b8e56b7 100644
--- a/youtube_dl/extractor/sonuma.py
+++ b/youtube_dl/extractor/sonuma.py
@@ -5,15 +5,17 @@ from .common import InfoExtractor
 
 class sonumaIE(InfoExtractor):
 
+
 	_VALID_URL=r'(?:https?://)?(?:www\.)?sonuma\.be/archive/'
 
-	def _real_extract(self,url):
+	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-010a07647b9b.mp4?sKey=2faa94b1da19002ca8b8abe944a7ecc8',webpage,"title")
+			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,