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

Added many more braces for multiline if's, Improved .crypto command quite a bit and applied locale-specific format

Browse Source
This commit is contained in:
Kwoth
2022-02-04 06:00:17 +01:00
parent f77f2f433f
commit eda38e64d1
129 changed files with 635 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,7 @@ public class RadioResolver : IRadioResolver
if (query.Contains(".pls"))
//File1=http://armitunes.com:8000/
//Regex.Match(query)
{
try
{
var m = _plsRegex.Match(file);
@@ -55,6 +56,7 @@ public class RadioResolver : IRadioResolver
Log.Warning("Failed reading .pls:\n{PlsFile}", file);
return null;
}
}
if (query.Contains(".m3u"))
/*
@@ -62,6 +64,7 @@ public class RadioResolver : IRadioResolver
C:\xxx4xx\xxxxxx3x\xx2xxxx\xx.mp3
C:\xxx5xx\x6xxxxxx\x7xxxxx\xx.mp3
*/
{
try
{
var m = _m3URegex.Match(file);
@@ -73,9 +76,11 @@ public class RadioResolver : IRadioResolver
Log.Warning("Failed reading .m3u:\n{M3uFile}", file);
return null;
}
}
if (query.Contains(".asx"))
//<ref href="http://armitunes.com:8000"/>
{
try
{
var m = _asxRegex.Match(file);
@@ -87,6 +92,7 @@ public class RadioResolver : IRadioResolver
Log.Warning("Failed reading .asx:\n{AsxFile}", file);
return null;
}
}
if (query.Contains(".xspf"))
/*
@@ -95,6 +101,7 @@ public class RadioResolver : IRadioResolver
<trackList>
<track><location>file:///mp3s/song_1.mp3</location></track>
*/
{
try
{
var m = _xspfRegex.Match(file);
@@ -106,6 +113,7 @@ public class RadioResolver : IRadioResolver
Log.Warning("Failed reading .xspf:\n{XspfFile}", file);
return null;
}
}
return query;
}

2
src/NadekoBot/Modules/Music/_Common/Resolvers/YtdlYoutubeResolver.cs
View File

@@ -205,9 +205,7 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
yield return info;
}
else
{
data += Environment.NewLine;
}
}
await _trackCacher.CachePlaylistTrackIdsAsync(playlistId, MusicPlatform.Youtube, trackIds);