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

Soundcloud links with a time will be offset

Browse source
This commit is contained in:
MichaelOultram 2015-08-16 02:04:36 +01:00
parent 95ad3cf09b
commit c45b7c9435
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
service_soundcloud.go
View file

@ -5,6 +5,8 @@ import (
"fmt" "fmt"
"os" "os"
"strconv" "strconv"
"strings"
"time"
"github.com/jmoiron/jsonq" "github.com/jmoiron/jsonq"
"github.com/layeh/gumble/gumble" "github.com/layeh/gumble/gumble"
@ -61,15 +63,22 @@ func (sc SoundCloud) NewRequest(user *gumble.User, url string) (string, error) {
} }
} else { } else {
// SONG // SONG
return sc.NewSong(user, apiResponse, nil) // Calculating offset
offset := 0
timesplit := strings.Split(url, "#t=")
if timesplit.size == 2 {
offset = time.Duration(timesplit[1]).Seconds()
}
return sc.NewSong(user, apiResponse, offset, nil)
} }
} }
// NewSong creates a track and adds to the queue // NewSong creates a track and adds to the queue
func (sc SoundCloud) NewSong(user *gumble.User, trackData *jsonq.JsonQuery, playlist Playlist) (string, error) { func (sc SoundCloud) NewSong(user *gumble.User, trackData *jsonq.JsonQuery, offset int, playlist Playlist) (string, error) {
title, _ := trackData.String("title") title, _ := trackData.String("title")
id, _ := trackData.Int("id") id, _ := trackData.Int("id")
duration, _ := trackData.Int("duration") durationMS, _ := trackData.Int("duration")
url, _ := trackData.String("permalink_url") url, _ := trackData.String("permalink_url")
thumbnail, err := trackData.String("artwork_url") thumbnail, err := trackData.String("artwork_url")
if err != nil { if err != nil {
@ -78,14 +87,19 @@ func (sc SoundCloud) NewSong(user *gumble.User, trackData *jsonq.JsonQuery, play
thumbnail, _ = jsonq.NewQuery(userObj).String("avatar_url") thumbnail, _ = jsonq.NewQuery(userObj).String("avatar_url")
} }
if dj.conf.General.MaxSongDuration == 0 || (duration/1000) <= dj.conf.General.MaxSongDuration { // Check song is not longer than the MaxSongDuration
if dj.conf.General.MaxSongDuration == 0 || (durationMS/1000) <= dj.conf.General.MaxSongDuration {
duration, err = time.ParseDuration(strconv.Itoa(durationMS) + "ms")
duration = strings.NewReplacer("h", ":", "m", ":", "s", ":").Replace(duration.String())
song := &YouTubeSong{ song := &YouTubeSong{
id: strconv.Itoa(id), id: strconv.Itoa(id),
title: title, title: title,
url: url, url: url,
thumbnail: thumbnail, thumbnail: thumbnail,
submitter: user, submitter: user,
duration: strconv.Itoa(duration), duration: duration,
offset: offset,
format: "mp3", format: "mp3",
playlist: playlist, playlist: playlist,
skippers: make([]string, 0), skippers: make([]string, 0),