minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-11 09:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

- Renamed CustomReaction model to NadekoExpression

Browse Source 
- Used structured logging everywhere
This commit is contained in:
Kwoth
2022-01-04 07:35:55 +01:00
parent ef49030841
commit 3aa6a54b6e
30 changed files with 330 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/NadekoBot/Modules/Music/_Common/Resolvers/RadioResolveStrategy.cs
View File

@@ -5,10 +5,10 @@ namespace NadekoBot.Modules.Music.Resolvers;
public class RadioResolver : IRadioResolver
{
private readonly Regex plsRegex = new("File1=(?<url>.*?)\\n", RegexOptions.Compiled);
private readonly Regex m3uRegex = new("(?<url>^[^#].*)", RegexOptions.Compiled | RegexOptions.Multiline);
private readonly Regex asxRegex = new("<ref href=\"(?<url>.*?)\"", RegexOptions.Compiled);
private readonly Regex xspfRegex = new("<location>(?<url>.*?)</location>", RegexOptions.Compiled);
private readonly Regex _plsRegex = new("File1=(?<url>.*?)\\n", RegexOptions.Compiled);
private readonly Regex _m3URegex = new("(?<url>^[^#].*)", RegexOptions.Compiled | RegexOptions.Multiline);
private readonly Regex _asxRegex = new("<ref href=\"(?<url>.*?)\"", RegexOptions.Compiled);
private readonly Regex _xspfRegex = new("<location>(?<url>.*?)</location>", RegexOptions.Compiled);
public async Task<ITrackInfo> ResolveByQueryAsync(string query)
{
@@ -46,13 +46,13 @@ public class RadioResolver : IRadioResolver
//Regex.Match(query)
try
{
var m = plsRegex.Match(file);
var m = _plsRegex.Match(file);
var res = m.Groups["url"]?.ToString();
return res?.Trim();
}
catch
{
Log.Warning($"Failed reading .pls:\n{file}");
Log.Warning("Failed reading .pls:\n{PlsFile}", file);
return null;
}
@@ -64,13 +64,13 @@ public class RadioResolver : IRadioResolver
*/
try
{
var m = m3uRegex.Match(file);
var m = _m3URegex.Match(file);
var res = m.Groups["url"]?.ToString();
return res?.Trim();
}
catch
{
Log.Warning($"Failed reading .m3u:\n{file}");
Log.Warning("Failed reading .m3u:\n{M3uFile}", file);
return null;
}
@@ -78,13 +78,13 @@ public class RadioResolver : IRadioResolver
//<ref href="http://armitunes.com:8000"/>
try
{
var m = asxRegex.Match(file);
var m = _asxRegex.Match(file);
var res = m.Groups["url"]?.ToString();
return res?.Trim();
}
catch
{
Log.Warning($"Failed reading .asx:\n{file}");
Log.Warning("Failed reading .asx:\n{AsxFile}", file);
return null;
}
@@ -97,13 +97,13 @@ public class RadioResolver : IRadioResolver
*/
try
{
var m = xspfRegex.Match(file);
var m = _xspfRegex.Match(file);
var res = m.Groups["url"]?.ToString();
return res?.Trim();
}
catch
{
Log.Warning($"Failed reading .xspf:\n{file}");
Log.Warning("Failed reading .xspf:\n{XspfFile}", file);
return null;
}