From a0f3b16c9e04ff15966b2921821655355d12e336 Mon Sep 17 00:00:00 2001 From: JustAnotherArchivist Date: Sun, 25 Jul 2021 18:07:52 +0000 Subject: [PATCH] Handle youtu.be case variations and port numbers --- youtube-extract | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube-extract b/youtube-extract index 556bd12..08ab149 100755 --- a/youtube-extract +++ b/youtube-extract @@ -18,7 +18,7 @@ if any(x in sys.argv for x in ['--help', '-h', '-?', 'help']): mode = sys.argv[1] if len(sys.argv) >= 2 else 'massage' # Only one slash before so it still matches inside URLs when slashes were collapsed. -domainPattern = re.compile(r'/(www\.|m\.)?(youtube\.(com|de|fr|co\.uk|it|es|at|pt|gr|hu|ro|pl|dk|no|se|fi|ee|lt|lv|ru|by|cz|sk|si|rs|hr|ca)|(music|gaming)\.youtube\.com|(es|uk|pl|ru|it|jp|br)\.youtube\.com|youtube-nocookie\.com)/', re.IGNORECASE) +domainPattern = re.compile(r'/(www\.|m\.)?(youtube\.(com|de|fr|co\.uk|it|es|at|pt|gr|hu|ro|pl|dk|no|se|fi|ee|lt|lv|ru|by|cz|sk|si|rs|hr|ca)|(music|gaming)\.youtube\.com|(es|uk|pl|ru|it|jp|br)\.youtube\.com|youtube-nocookie\.com)(:\d+)?/', re.IGNORECASE) if mode == 'removenonyt': @@ -69,7 +69,7 @@ videoPattern = '|'.join([ r'/www\.youtube\.com/e(mbed)?/(?!videoseries\?)[0-9A-Za-z_-]{11}', r'/www\.youtube\.com/embed/?\?(.*&)?v=[0-9A-Za-z_-]{11}', # Shortener - r'/youtu\.be/[0-9A-Za-z_-]{11}', + r'/(?i:youtu\.be)(:\d+)?/[0-9A-Za-z_-]{11}', # Old (Flash) embeds r'/www\.youtube\.com/v/[0-9A-Za-z_-]{11}', # Redirects from links in video descriptions