From a678b247db95f21a439f7abc54e56deba3167f85 Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Sun, 8 Mar 2020 19:20:26 -0700
Subject: [PATCH 01/18] Yash commit Sonuma

---
 youtube_dl/extractor/extractors.py |  1 +
 youtube_dl/extractor/sonuma.py     | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 youtube_dl/extractor/sonuma.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 64d1fa251..105a0864b 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -1032,6 +1032,7 @@ from .southpark import (
     SouthParkEsIE,
     SouthParkNlIE
 )
+from .sonuma import sonumaIE
 from .spankbang import (
     SpankBangIE,
     SpankBangPlaylistIE,
diff --git a/youtube_dl/extractor/sonuma.py b/youtube_dl/extractor/sonuma.py
new file mode 100644
index 000000000..eea3a4cb7
--- /dev/null
+++ b/youtube_dl/extractor/sonuma.py
@@ -0,0 +1,20 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+from .common import InfoExtractor
+
+class sonumaIE(InfoExtractor):
+
+	_VALID_URL=r'(?:https?://)?(?:www\.)?sonuma\.be/archive/[a-z-0-9]*'
+
+	def _real_extract(self,url):
+		video_id=self._match_id(url)
+		webpage = self._download_webpage("https://www.sonuma.be/archive/"+video_id)
+		title = self._html_search_regex(r'<h1>(.+?)</h1>', webpage, 'title')
+
+
+		return{
+		'id':video_id,
+		'title':title,
+		'description': self._og_search_description(webpage),
+		}
\ No newline at end of file

From 47c434ba41ecbdca8067b7aab5e2d8fbbd3d9d98 Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Sun, 8 Mar 2020 20:12:34 -0700
Subject: [PATCH 02/18] yash version 2

---
 youtube_dl/extractor/sonuma.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/youtube_dl/extractor/sonuma.py b/youtube_dl/extractor/sonuma.py
index eea3a4cb7..91decd56c 100644
--- a/youtube_dl/extractor/sonuma.py
+++ b/youtube_dl/extractor/sonuma.py
@@ -5,16 +5,17 @@ from .common import InfoExtractor
 
 class sonumaIE(InfoExtractor):
 
-	_VALID_URL=r'(?:https?://)?(?:www\.)?sonuma\.be/archive/[a-z-0-9]*'
+	_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/"+video_id)
+		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")
 		return{
 		'id':video_id,
 		'title':title,
 		'description': self._og_search_description(webpage),
-		}
\ No newline at end of file
+		}

From 62b725f4609109eaa28396b01dfcaa566d85634b Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Sun, 8 Mar 2020 20:16:06 -0700
Subject: [PATCH 03/18] yash ver3

---
 youtube_dl/extractor/sonuma.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/sonuma.py b/youtube_dl/extractor/sonuma.py
index 91decd56c..43776f958 100644
--- a/youtube_dl/extractor/sonuma.py
+++ b/youtube_dl/extractor/sonuma.py
@@ -9,7 +9,7 @@ class sonumaIE(InfoExtractor):
 
 	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)
+		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(

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 04/18] 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,

From 70d05cf06279a629d57b6e55fd1fbbf18792c94c Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Sun, 29 Mar 2020 20:17:58 -0700
Subject: [PATCH 05/18] acidcow_ver_1.1

---
 youtube_dl/extractor/acidcow.py    | 1 -
 youtube_dl/extractor/extractors.py | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/youtube_dl/extractor/acidcow.py b/youtube_dl/extractor/acidcow.py
index b023d747f..d6b87f0c8 100644
--- a/youtube_dl/extractor/acidcow.py
+++ b/youtube_dl/extractor/acidcow.py
@@ -34,4 +34,3 @@ class acidcowIE(InfoExtractor):
             '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 5565a316a..36f9e646d 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -18,6 +18,7 @@ from .acast import (
     ACastIE,
     ACastChannelIE,
 )
+from .acidcow import acidcowIE
 from .adn import ADNIE
 from .adobeconnect import AdobeConnectIE
 from .adobetv import (
@@ -1033,7 +1034,7 @@ from .southpark import (
     SouthParkNlIE
 )
 from .sonuma import sonumaIE
-from .acidcow import acidcowIE
+
 from .spankbang import (
     SpankBangIE,
     SpankBangPlaylistIE,

From 2ad5716d153a623d50f1a0e611a284795ccfd0ca Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Sun, 29 Mar 2020 21:54:05 -0700
Subject: [PATCH 06/18] acidcow_ver_1.1

---
 youtube_dl/extractor/acidcow.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/youtube_dl/extractor/acidcow.py b/youtube_dl/extractor/acidcow.py
index d6b87f0c8..be3a1b100 100644
--- a/youtube_dl/extractor/acidcow.py
+++ b/youtube_dl/extractor/acidcow.py
@@ -10,7 +10,11 @@ class acidcowIE(InfoExtractor):
     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+))/?'
+    # 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+'
     _TESTS = {
         # TODO: Implement
 
@@ -19,12 +23,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/%s/video/(\S+)' % video_id, video_id
+            r'https?://cdn\.acidcow\.com/pics/[0-9]+/video/\S', 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+))"/>',
+
+            r'<video src="https?://cdn\.acidcow\.com/pics/[0-9]+/video/\S+" .+',
 
             webpage, "download_url"
         )

From 1e3504703d1ec237701add4d91b0cace4027b2b7 Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Mon, 30 Mar 2020 20:42:50 -0700
Subject: [PATCH 07/18] acidcow_ver_1.2

---
 youtube_dl/extractor/acidcow.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/acidcow.py b/youtube_dl/extractor/acidcow.py
index be3a1b100..717d0761f 100644
--- a/youtube_dl/extractor/acidcow.py
+++ b/youtube_dl/extractor/acidcow.py
@@ -14,7 +14,9 @@ class acidcowIE(InfoExtractor):
     # # 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/[0-9]+\S+'
+    _VALID_URL = r'https?://acidcow\.com/video/(?P<id>\d+)-\S+'
+
     _TESTS = {
         # TODO: Implement
 

From 5b1094e71946f9a011ae827c7a7278a2b6ba262c Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Mon, 30 Mar 2020 20:55:00 -0700
Subject: [PATCH 08/18] acidcow_ver_1.3

---
 youtube_dl/extractor/acidcow.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/youtube_dl/extractor/acidcow.py b/youtube_dl/extractor/acidcow.py
index 717d0761f..ff19fbe9c 100644
--- a/youtube_dl/extractor/acidcow.py
+++ b/youtube_dl/extractor/acidcow.py
@@ -25,13 +25,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
+            r'https://cdn\.acidcow\.com/pics/[0-9]+/video/\S', 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+" .+',
+            r'<video src="https://cdn\.acidcow\.com/pics/[0-9]+/video/\S+" .+',
 
             webpage, "download_url"
         )

From 1893ea55903831b2430fbd90ffaf45234eb1b9b0 Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Mon, 30 Mar 2020 21:30:15 -0700
Subject: [PATCH 09/18] acidcow_ver_1.4

---
 youtube_dl/extractor/acidcow.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/youtube_dl/extractor/acidcow.py b/youtube_dl/extractor/acidcow.py
index ff19fbe9c..896197a16 100644
--- a/youtube_dl/extractor/acidcow.py
+++ b/youtube_dl/extractor/acidcow.py
@@ -24,9 +24,14 @@ 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(
+            "https://acidcow.com/video/116642-that_was_really_close.html", video_id
+        )
 
         title = self._html_search_regex(r'<title>(.+?)</title>', webpage, 'title')
         download_url = self._html_search_regex(

From 646e6fe600de8732247b504ba6eac0fd62b9201a Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Mon, 30 Mar 2020 21:34:02 -0700
Subject: [PATCH 10/18] acidcow_ver_1.5

---
 youtube_dl/extractor/acidcow.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/youtube_dl/extractor/acidcow.py b/youtube_dl/extractor/acidcow.py
index 896197a16..af8356051 100644
--- a/youtube_dl/extractor/acidcow.py
+++ b/youtube_dl/extractor/acidcow.py
@@ -34,13 +34,20 @@ class acidcowIE(InfoExtractor):
         )
 
         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+',
+
+            webpage, "download_url"
+        )
         return {
             'id': video_id,
             'url': download_url,

From 87f7f552b6c0391447b3e418ecd9be504857a946 Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Mon, 30 Mar 2020 21:41:23 -0700
Subject: [PATCH 11/18] acidcow_ver_1.6

---
 youtube_dl/extractor/acidcow.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/acidcow.py b/youtube_dl/extractor/acidcow.py
index af8356051..f1c514f90 100644
--- a/youtube_dl/extractor/acidcow.py
+++ b/youtube_dl/extractor/acidcow.py
@@ -44,7 +44,7 @@ class acidcowIE(InfoExtractor):
         '''
         download_url = self._html_search_regex(
 
-            r'<https://cdn\.acidcow\.com/pics/[0-9]+/video/\S+',
+            r'https://cdn\.acidcow\.com/pics/[0-9]+/video/\S+',
 
             webpage, "download_url"
         )

From 93399278c44278cb265c15f3d7fc8f097bd5ccf0 Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Tue, 31 Mar 2020 18:26:19 -0700
Subject: [PATCH 12/18] acidcow_ver_1.6

---
 youtube_dl/extractor/acidcow.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/acidcow.py b/youtube_dl/extractor/acidcow.py
index f1c514f90..4f40890e2 100644
--- a/youtube_dl/extractor/acidcow.py
+++ b/youtube_dl/extractor/acidcow.py
@@ -30,7 +30,7 @@ class acidcowIE(InfoExtractor):
         )
         '''
         webpage = self._download_webpage(
-            "https://acidcow.com/video/116642-that_was_really_close.html", video_id
+            "https://acidcow.com/video/", video_id
         )
 
         title = self._html_search_regex(r'<title>(.+?)</title>', webpage, 'title')

From 3efa8c95533d0818196c58ca5a8ea61416f410ed Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Tue, 31 Mar 2020 19:37:54 -0700
Subject: [PATCH 13/18] acidcow_ver_1.7

---
 youtube_dl/extractor/acidcow.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/youtube_dl/extractor/acidcow.py b/youtube_dl/extractor/acidcow.py
index 4f40890e2..598695ae3 100644
--- a/youtube_dl/extractor/acidcow.py
+++ b/youtube_dl/extractor/acidcow.py
@@ -30,7 +30,7 @@ class acidcowIE(InfoExtractor):
         )
         '''
         webpage = self._download_webpage(
-            "https://acidcow.com/video/", video_id
+            "https://acidcow.com/video/116642-that_was_really_close.html", video_id
         )
 
         title = self._html_search_regex(r'<title>(.+?)</title>', webpage, 'title')
@@ -44,7 +44,7 @@ class acidcowIE(InfoExtractor):
         '''
         download_url = self._html_search_regex(
 
-            r'https://cdn\.acidcow\.com/pics/[0-9]+/video/\S+',
+            r'(https://cdn\.acidcow\.com/pics/[0-9]+/video/\S+\.mp4)',
 
             webpage, "download_url"
         )

From 76c8706c316cdab9ebc47e39121b27451c598daa Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Tue, 31 Mar 2020 22:09:36 -0700
Subject: [PATCH 14/18] acidcow_ver1.8

---
 youtube_dl/extractor/acidcow.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/acidcow.py b/youtube_dl/extractor/acidcow.py
index 598695ae3..28e6459f6 100644
--- a/youtube_dl/extractor/acidcow.py
+++ b/youtube_dl/extractor/acidcow.py
@@ -30,7 +30,7 @@ class acidcowIE(InfoExtractor):
         )
         '''
         webpage = self._download_webpage(
-            "https://acidcow.com/video/116642-that_was_really_close.html", video_id
+            url, video_id
         )
 
         title = self._html_search_regex(r'<title>(.+?)</title>', webpage, 'title')

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 15/18] 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),
-		}

From a6a1395a73e609963c42d3cbd18f7e10ab7146cd Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Wed, 1 Apr 2020 18:47:10 -0700
Subject: [PATCH 16/18] unnecessary configuration removed from extractor.py

---
 youtube_dl/extractor/extractors.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 36f9e646d..d0e9a858f 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -1033,7 +1033,6 @@ from .southpark import (
     SouthParkEsIE,
     SouthParkNlIE
 )
-from .sonuma import sonumaIE
 
 from .spankbang import (
     SpankBangIE,

From d878b8dd2b675c75ea52793507e805d928886fd3 Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Sat, 11 Apr 2020 22:21:09 -0700
Subject: [PATCH 17/18] Test added

---
 youtube_dl/extractor/acidcow.py | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/youtube_dl/extractor/acidcow.py b/youtube_dl/extractor/acidcow.py
index 3f8f9bb16..0e2a4edda 100644
--- a/youtube_dl/extractor/acidcow.py
+++ b/youtube_dl/extractor/acidcow.py
@@ -12,10 +12,30 @@ class acidcowIE(InfoExtractor):
 
     _VALID_URL = r'https?://acidcow\.com/video/(?P<id>\d+)-\S+'
 
-    _TESTS = {
-        # TODO: Implement
+    _TESTS = [{
+        'url': 'https://acidcow.com/video/118851-learning_to_follow_patterns_with_dad.html',
+        'info_dict': {
+            'id': '118851',
+            'ext': 'mp4',
+            'title': 'learning_to_follow_patterns_with_dad',
 
-    }
+        },
+    }, {
+        'url': 'https://acidcow.com/video/116642-that_was_really_close.html',
+        'info_dict': {
+            'id': '116642',
+            'ext': 'mp4',
+            'title': 'that_was_really_close',
+        },
+    },  {
+        'url': 'https://acidcow.com/video/118850-it_reminds_me_of_cars_scene.html',
+        'info_dict': {
+            'id': '118850',
+            'ext': 'mp4',
+            'title': 'it_reminds_me_of_cars_scene',
+        }
+
+    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)

From e4ef85b49bf70bab0ad8dfc2f85065fa4e6fad9f Mon Sep 17 00:00:00 2001
From: Dante <m.hussain@wsu.edu>
Date: Sun, 12 Apr 2020 11:30:15 -0700
Subject: [PATCH 18/18] corrected spaces in extractor.py

---
 youtube_dl/extractor/acidcow.py    | 2 +-
 youtube_dl/extractor/extractors.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/youtube_dl/extractor/acidcow.py b/youtube_dl/extractor/acidcow.py
index 0e2a4edda..6b7714846 100644
--- a/youtube_dl/extractor/acidcow.py
+++ b/youtube_dl/extractor/acidcow.py
@@ -27,7 +27,7 @@ class acidcowIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'that_was_really_close',
         },
-    },  {
+    }, {
         'url': 'https://acidcow.com/video/118850-it_reminds_me_of_cars_scene.html',
         'info_dict': {
             'id': '118850',
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index d0e9a858f..8e3f34b45 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -1033,7 +1033,6 @@ from .southpark import (
     SouthParkEsIE,
     SouthParkNlIE
 )
-
 from .spankbang import (
     SpankBangIE,
     SpankBangPlaylistIE,