From db60cbb80acf3709e6d0756fffa42a87baf27973 Mon Sep 17 00:00:00 2001 From: Ricardo Constantino Date: Tue, 11 Jul 2017 23:40:40 +0100 Subject: ytdl_hook: actually load the script-opts Also, comma-separated list doesn't actually work, even quote-surrounded. Switch to using | instead. --- player/lua/ytdl_hook.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'player/lua/ytdl_hook.lua') diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua index b01bf68f30..72fa58774a 100644 --- a/player/lua/ytdl_hook.lua +++ b/player/lua/ytdl_hook.lua @@ -5,6 +5,7 @@ local options = require 'mp.options' local o = { exclude = "" } +options.read_options(o) local ytdl = { path = "youtube-dl", @@ -100,12 +101,12 @@ local function extract_chapters(data, video_length) end local function is_blacklisted(url) - if o.blacklist == "" then return false end + if o.exclude == "" then return false end if #ytdl.blacklisted == 0 then - local joined = o.blacklist - while joined:match(',?[^,]+') do - local _, e, domain = joined:find(',?([^,]+)') - table.insert(ytdl.blacklisted, domain) + local joined = o.exclude + while joined:match('%|?[^|]+') do + local _, e, substring = joined:find('%|?([^|]+)') + table.insert(ytdl.blacklisted, substring) joined = joined:sub(e+1) end end @@ -113,6 +114,7 @@ local function is_blacklisted(url) url = url:match('https?://(.+)') for _, exclude in ipairs(ytdl.blacklisted) do if url:match(exclude) then + msg.verbose('URL matches excluded substring. Skipping.') return true end end -- cgit v1.2.3