Merge pull request #561 from Seregy/dev
Fixed youtube time argument, closes #363
This commit is contained in:
commit
1cec241709
@ -297,10 +297,22 @@ namespace NadekoBot.Modules.Music.Classes
|
|||||||
|
|
||||||
if (video == null) // do something with this error
|
if (video == null) // do something with this error
|
||||||
throw new Exception("Could not load any video elements based on the query.");
|
throw new Exception("Could not load any video elements based on the query.");
|
||||||
var m = Regex.Match(query, @"\?t=(?<t>\d*)");
|
|
||||||
|
var m = Regex.Match(query, @"\?t=((?<h>\d*)h)?((?<m>\d*)m)?((?<s>\d*)s?)?");
|
||||||
int gotoTime = 0;
|
int gotoTime = 0;
|
||||||
if (m.Captures.Count > 0)
|
if (m.Captures.Count > 0)
|
||||||
int.TryParse(m.Groups["t"].ToString(), out gotoTime);
|
{
|
||||||
|
int hours;
|
||||||
|
int minutes;
|
||||||
|
int seconds;
|
||||||
|
|
||||||
|
int.TryParse(m.Groups["h"].ToString(), out hours);
|
||||||
|
int.TryParse(m.Groups["m"].ToString(), out minutes);
|
||||||
|
int.TryParse(m.Groups["s"].ToString(), out seconds);
|
||||||
|
|
||||||
|
gotoTime = hours * 60 * 60 + minutes * 60 + seconds;
|
||||||
|
}
|
||||||
|
|
||||||
var song = new Song(new SongInfo
|
var song = new Song(new SongInfo
|
||||||
{
|
{
|
||||||
Title = video.Title.Substring(0, video.Title.Length - 10), // removing trailing "- You Tube"
|
Title = video.Title.Substring(0, video.Title.Length - 10), // removing trailing "- You Tube"
|
||||||
|
Loading…
Reference in New Issue
Block a user