zik/lampac-ukraine
1
0
Fork 0
mirror of https://github.com/lampame/lampac-ukraine.git synced 2026-04-16 17:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(makhno): prioritize json data extraction in player parsing

Browse Source 
Reorder parsing logic to attempt JSON extraction first before falling back
to regex-based m3u8 and source tag matching. This ensures structured data
is preferred when available, with fallbacks for legacy formats.
This commit is contained in:
baliasnyifeliks 2026-02-03 20:44:13 +02:00
parent 5c22c91421
commit a2e018c1be
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Makhno/MakhnoInvoke.cs
View File

@ -252,28 +252,6 @@ namespace Makhno
}; };
} }
var m3u8Match = Regex.Match(html, @"(https?://[^""'\s>]+\.m3u8[^""'\s>]*)", RegexOptions.IgnoreCase);
if (m3u8Match.Success)
{
return new PlayerData
{
File = m3u8Match.Groups[1].Value,
Poster = null,
Voices = new List<Voice>()
};
}
var sourceMatch = Regex.Match(html, @"<source[^>]*src=[""']([^""']+)[""']", RegexOptions.IgnoreCase);
if (sourceMatch.Success)
{
return new PlayerData
{
File = sourceMatch.Groups[1].Value,
Poster = null,
Voices = new List<Voice>()
};
}
string jsonData = ExtractPlayerJson(html); string jsonData = ExtractPlayerJson(html);
if (jsonData == null) if (jsonData == null)
_onLog("Makhno ParsePlayerData: file array not found"); _onLog("Makhno ParsePlayerData: file array not found");
@ -291,6 +269,30 @@ namespace Makhno
}; };
} }
var m3u8Match = Regex.Match(html, @"(https?://[^""'\s>]+\.m3u8[^""'\s>]*)", RegexOptions.IgnoreCase);
if (m3u8Match.Success)
{
_onLog("Makhno ParsePlayerData: fallback m3u8 match");
return new PlayerData
{
File = m3u8Match.Groups[1].Value,
Poster = null,
Voices = new List<Voice>()
};
}
var sourceMatch = Regex.Match(html, @"<source[^>]*src=[""']([^""']+)[""']", RegexOptions.IgnoreCase);
if (sourceMatch.Success)
{
_onLog("Makhno ParsePlayerData: fallback source match");
return new PlayerData
{
File = sourceMatch.Groups[1].Value,
Poster = null,
Voices = new List<Voice>()
};
}
return null; return null;
} }
catch (Exception ex) catch (Exception ex)