containers/mumbledj
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed youtube offset for reals this time

Browse source
This commit is contained in:
MichaelOultram 2015-09-26 17:37:19 +01:00
parent d2d75f093d
commit ac77547957
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
service_youtube.go
View file

@ -88,8 +88,8 @@ func (yt YouTube) NewSong(user *gumble.User, id, offset string, playlist Playlis
title: title, title: title,
id: id, id: id,
url: "https://youtu.be/" + id, url: "https://youtu.be/" + id,
offset: int(yt.parseTime(offset).Seconds()), offset: int(yt.parseTime(offset, `t\=(?P<days>\d+d)?(?P<hours>\d+h)?(?P<minutes>\d+m)?(?P<seconds>\d+s)?`).Seconds()),
duration: int(yt.parseTime(duration).Seconds()), duration: int(yt.parseTime(duration, `P(?P<days>\d+D)?T(?P<hours>\d+H)?(?P<minutes>\d+M)?(?P<seconds>\d+S)?`).Seconds()),
thumbnail: thumbnail, thumbnail: thumbnail,
format: "m4a", format: "m4a",
skippers: make([]string, 0), skippers: make([]string, 0),
@ -104,10 +104,10 @@ func (yt YouTube) NewSong(user *gumble.User, id, offset string, playlist Playlis
} }
// parseTime converts from the string youtube returns to a time.Duration // parseTime converts from the string youtube returns to a time.Duration
func (yt YouTube) parseTime(duration string) time.Duration { func (yt YouTube) parseTime(duration, regex string) time.Duration {
var days, hours, minutes, seconds, totalSeconds int64 var days, hours, minutes, seconds, totalSeconds int64
if duration != "" { if duration != "" {
timestampExp := regexp.MustCompile(`P(?P<days>\d+D)?T(?P<hours>\d+H)?(?P<minutes>\d+M)?(?P<seconds>\d+S)?`) timestampExp := regexp.MustCompile(regex)
timestampMatch := timestampExp.FindStringSubmatch(strings.ToUpper(duration)) timestampMatch := timestampExp.FindStringSubmatch(strings.ToUpper(duration))
timestampResult := make(map[string]string) timestampResult := make(map[string]string)
for i, name := range timestampExp.SubexpNames() { for i, name := range timestampExp.SubexpNames() {