Breaks applescript func into smaller funcs

- runAppleScript() returns a track instead of long string

Author: FrankKair

applescript.go

@@ -7,34 +7,74 @@ import (
 	"github.com/everdev/mack"
 )
 
-const isRunningCmd = `
-if it is running then 
-	return true 
-else 
-	return false 
-end if
-`
-const artistAndAlbumCmd = `
-set ctrack to ""
-set ctrack to ctrack & (current track's artist) & "-"
-set ctrack to ctrack & (current track's album)
-`
-
-// Runs AppleScript "tell" and returns string shaped Artist-Album
-func runAppleScript() (string, error) {
+// Runs AppleScript "tell" and returns a Track{artist, album}
+func runAppleScript() (Track, error) {
+	err := isRunning()
+	if err != nil {
+		return Track{}, err
+	}
+
+	artist, err := artist()
+	if err != nil {
+		return Track{}, err
+	}
+
+	album, err := album()
+	if err != nil {
+		return Track{}, err
+	}
+
+	track := newTrack(artist, album)
+	return track, nil
+}
+
+func isRunning() error {
+	const isRunningCmd = `
+	if it is running then
+		return true
+	else
+		return false
+	end if
+	`
+
 	isRunning, err := mack.Tell("Spotify", isRunningCmd)
 	if err != nil {
-		return "", errors.New("Could not exectute AppleScript properly")
+		return errors.New("Could not exectute AppleScript properly")
 	}
+
 	if isRunning == "false" {
-		return "", errors.New("Spotify is not running, please open the app")
+		return errors.New("Spotify is not running, please open the app")
+	}
+
+	return nil
+}
+
+func artist() (string, error) {
+	const artistCmd = `
+	set ctrack to ""
+	set ctrack to ctrack & (current track's artist)
+	`
+
+	artist, err := mack.Tell("Spotify", artistCmd)
+	if err != nil {
+		e := fmt.Sprintf("Could not exectute AppleScript properly: %s", err)
+		return "", errors.New(e)
 	}
 
-	output, err := mack.Tell("Spotify", artistAndAlbumCmd)
+	return artist, nil
+}
+
+func album() (string, error) {
+	const albumCmd = `
+	set ctrack to ""
+	set ctrack to ctrack & (current track's album)
+	`
+
+	album, err := mack.Tell("Spotify", albumCmd)
 	if err != nil {
 		e := fmt.Sprintf("Could not exectute AppleScript properly: %s", err)
 		return "", errors.New(e)
 	}
 
-	return output, nil
+	return album, nil
 }

main.go

@@ -6,13 +6,12 @@ import (
 )
 
 func main() {
-	output, err := runAppleScript()
+	track, err := runAppleScript()
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
 
-	track := newTrack(string(output))
 	info, err := getLastfmInfo(track)
 	if err != nil {
 		fmt.Println(err)

track.go

@@ -8,10 +8,7 @@ type Track struct {
 	Album  string
 }
 
-func newTrack(appleScriptInfo string) Track {
-	info := strings.Split(string(appleScriptInfo), "-")
-	artist := info[0]
-	album := info[1]
+func newTrack(artist, album string) Track {
 	albumTitle := cleanAlbumTitle(album)
 	return Track{artist, albumTitle}
 }