From 1525dadc8dd0b8d5882e9ff41682bd54cd852687 Mon Sep 17 00:00:00 2001
From: theychx <boomingzooming@gmail.com>
Date: Mon, 28 Aug 2017 21:35:57 +0200
Subject: [PATCH 1/3] [vidme:user] Fix extraction when username contains dash
 or underscore

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

diff --git a/youtube_dl/extractor/vidme.py b/youtube_dl/extractor/vidme.py
index a7971d72e..0e69ff5ce 100644
--- a/youtube_dl/extractor/vidme.py
+++ b/youtube_dl/extractor/vidme.py
@@ -263,7 +263,7 @@ class VidmeListBaseIE(InfoExtractor):
 
 class VidmeUserIE(VidmeListBaseIE):
     IE_NAME = 'vidme:user'
-    _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z]{6,})(?!/likes)(?:[^\da-zA-Z]|$)'
+    _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z_-]{6,})(?!/likes)(?:[^\da-zA-Z]|$)'
     _API_ITEM = 'list'
     _TITLE = 'Videos'
     _TEST = {
@@ -278,7 +278,7 @@ class VidmeUserIE(VidmeListBaseIE):
 
 class VidmeUserLikesIE(VidmeListBaseIE):
     IE_NAME = 'vidme:user:likes'
-    _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z]{6,})/likes'
+    _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z_-]{6,})/likes'
     _API_ITEM = 'likes'
     _TITLE = 'Likes'
     _TEST = {

From dc973bbca17ad4c13cb13922c3c3019b9634b24a Mon Sep 17 00:00:00 2001
From: theychx <boomingzooming@gmail.com>
Date: Thu, 31 Aug 2017 16:10:05 +0200
Subject: [PATCH 2/3] [vidme:user] Add additional tests

---
 youtube_dl/extractor/vidme.py | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/youtube_dl/extractor/vidme.py b/youtube_dl/extractor/vidme.py
index 0e69ff5ce..eb2d266b2 100644
--- a/youtube_dl/extractor/vidme.py
+++ b/youtube_dl/extractor/vidme.py
@@ -266,14 +266,21 @@ class VidmeUserIE(VidmeListBaseIE):
     _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z_-]{6,})(?!/likes)(?:[^\da-zA-Z]|$)'
     _API_ITEM = 'list'
     _TITLE = 'Videos'
-    _TEST = {
-        'url': 'https://vid.me/EFARCHIVE',
+    _TESTS = [{
+        'url': 'https://vid.me/MasakoX',
         'info_dict': {
-            'id': '3834632',
-            'title': 'EFARCHIVE - %s' % _TITLE,
+            'id': '16112341',
+            'title': 'MasakoX - %s' % _TITLE,
         },
-        'playlist_mincount': 238,
-    }
+        'playlist_mincount': 191,
+    }, {
+        'url': 'https://vid.me/unsQuare_netWork',
+        'info_dict': {
+            'id': '16148757',
+            'title': 'unsQuare_netWork - %s' % _TITLE,
+        },
+        'playlist_mincount': 73,
+    }]
 
 
 class VidmeUserLikesIE(VidmeListBaseIE):
@@ -281,11 +288,18 @@ class VidmeUserLikesIE(VidmeListBaseIE):
     _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z_-]{6,})/likes'
     _API_ITEM = 'likes'
     _TITLE = 'Likes'
-    _TEST = {
+    _TESTS = [{
         'url': 'https://vid.me/ErinAlexis/likes',
         'info_dict': {
             'id': '6483530',
             'title': 'ErinAlexis - %s' % _TITLE,
         },
         'playlist_mincount': 415,
-    }
+    }, {
+        'url': 'https://vid.me/Kaleidoscope-Ish/likes',
+        'info_dict': {
+            'id': '16908594',
+            'title': 'Kaleidoscope-Ish - %s' % _TITLE,
+        },
+        'playlist_mincount': 43,
+    }]

From ce3a9a32357903a843b0434284331aab60e1919a Mon Sep 17 00:00:00 2001
From: theychx <boomingzooming@gmail.com>
Date: Sat, 2 Sep 2017 01:20:21 +0200
Subject: [PATCH 3/3] [vidme:user] Fix VALID_URL regex

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

diff --git a/youtube_dl/extractor/vidme.py b/youtube_dl/extractor/vidme.py
index eb2d266b2..39b65ed2f 100644
--- a/youtube_dl/extractor/vidme.py
+++ b/youtube_dl/extractor/vidme.py
@@ -263,7 +263,7 @@ class VidmeListBaseIE(InfoExtractor):
 
 class VidmeUserIE(VidmeListBaseIE):
     IE_NAME = 'vidme:user'
-    _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z_-]{6,})(?!/likes)(?:[^\da-zA-Z]|$)'
+    _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z_-]{6,})(?!/likes)(?:[^\da-zA-Z_-]|$)'
     _API_ITEM = 'list'
     _TITLE = 'Videos'
     _TESTS = [{