Fixing build issues

This commit is contained in:
MichaelOultram 2015-07-27 23:00:32 +01:00
parent 4cfb1c19f9
commit 8604bae69c
3 changed files with 5 additions and 6 deletions

View file

@ -148,14 +148,11 @@ var dj = mumbledj{
cache: NewSongCache(),
}
var services []Service
// main primarily performs startup tasks. Grabs and parses commandline
// args, sets up the gumble client and its listeners, and then connects to the server.
func main() {
PerformStartupChecks()
services = []Service{new(Youtube)}
if currentUser, err := user.Current(); err == nil {
dj.homeDir = currentUser.HomeDir

View file

@ -48,3 +48,5 @@ type Playlist interface {
ID() string
Title() string
}
var services = []Service{YouTube{}}

View file

@ -33,12 +33,12 @@ type YouTube struct {
}
// Name of the service
func (y Youtube) ServiceName() string {
func (y YouTube) ServiceName() string {
return "Youtube"
}
// Checks to see if service will accept URL
func (y Youtube) URLRegex(url string) bool {
func (y YouTube) URLRegex(url string) bool {
youtubePatterns := []string{
`https?:\/\/www\.youtube\.com\/watch\?v=([\w-]+)(\&t=\d*m?\d*s?)?`,
`https?:\/\/youtube\.com\/watch\?v=([\w-]+)(\&t=\d*m?\d*s?)?`,
@ -62,7 +62,7 @@ func (y Youtube) URLRegex(url string) bool {
}
// Creates the requested song/playlist and adds to the queue
func (y Youtube) NewRequest(user *gumble.User, url string) {
func (y YouTube) NewRequest(user *gumble.User, url string) {
}