Compare commits

..

No commits in common. "master" and "v2.0.1" have entirely different histories.

2 changed files with 8 additions and 16 deletions

View File

@ -1,4 +1,4 @@
# vlc-mediaklikk-video # vlc-mediaklikk
VLC playlist parser for MédiaKlikk videos and video streams VLC playlist parser for MédiaKlikk videos and video streams
## Installation ## Installation
@ -22,10 +22,9 @@ Copy [mediaklikk-video.lua](mediaklikk-video.lua) to [VLC Lua playlist scripts](
* [mediaklikk.hu](https://www.mediaklikk.hu/) * [mediaklikk.hu](https://www.mediaklikk.hu/)
### Video streams ### Video streams
* [M1](https://hirado.hu/elo/m1) * [M1](https://www.mediaklikk.hu/m1-elo)
* [M2](https://www.mediaklikk.hu/m2-elo) * [M2](https://www.mediaklikk.hu/m2-elo)
* [M4 Sport](https://m4sport.hu/elo/mtv4live) * [M4](https://www.mediaklikk.hu/m4-elo)
* [M4 Sport +](https://m4sport.hu/elo/mtv4plus)
* [M5](https://www.mediaklikk.hu/m5-elo) * [M5](https://www.mediaklikk.hu/m5-elo)
* [Duna](https://www.mediaklikk.hu/duna-elo) * [Duna](https://www.mediaklikk.hu/duna-elo)
* [Duna World](https://www.mediaklikk.hu/duna-world-elo) * [Duna World](https://www.mediaklikk.hu/duna-world-elo)

View File

@ -19,16 +19,9 @@ end
function parse() function parse()
local pageSource = streams.readAll(vlc) local pageSource = streams.readAll(vlc)
if vlc.path:match('player%.mediaklikk%.hu') then
log.dbg('Player loaded, finding player options json')
local playerOptionsJson = pageSource:match('pl.setup%( (%b{}) %);') local playerOptionsJson = pageSource:match('pl.setup%( (%b{}) %);')
if not playerOptionsJson then if playerOptionsJson then
log.warn('Cannot find player options json') log.dbg('Found player options json, finding playlist items of type hls')
return nil
end
log.dbg('Finding playlist items of type hls')
local playerOptions = dkjson.decode(playerOptionsJson) local playerOptions = dkjson.decode(playerOptionsJson)
local playlistItems = tables.filter(playerOptions.playlist, function(playlistItem) local playlistItems = tables.filter(playerOptions.playlist, function(playlistItem)
@ -43,14 +36,14 @@ function parse()
return tables.map(playlistItems, function(playlistItem) return tables.map(playlistItems, function(playlistItem)
return { return {
path = playlistItem.file:gsub('^//', vlc.access .. '://'), path = vlc.access .. ':' .. playlistItem.file,
title = params.title, title = params.title,
arturl = params.bgimage arturl = params.bgimage
} }
end) end)
end end
log.dbg('Finding embedded players'); log.dbg('Cannot find player options json, finding embedded players');
local playerSetupJsons = tables.toArray(pageSource:gmatch('mtva_player_manager%.player%(document%.getElementById%("player_%d+_%d+"%), (%b{})%);')); local playerSetupJsons = tables.toArray(pageSource:gmatch('mtva_player_manager%.player%(document%.getElementById%("player_%d+_%d+"%), (%b{})%);'));