From fb9fab7961695aa434961490fde9c6a0e8ef73ad Mon Sep 17 00:00:00 2001
From: Deluan <github@deluan.com>
Date: Tue, 22 Mar 2016 10:28:13 -0400
Subject: [PATCH] Re-enabling skip detection

---
 api/media_annotation.go | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/api/media_annotation.go b/api/media_annotation.go
index 21da2c5a..3457105f 100644
--- a/api/media_annotation.go
+++ b/api/media_annotation.go
@@ -31,35 +31,34 @@ func (c *MediaAnnotationController) Scrobble() {
 	username := c.ParamString("u")
 
 	beego.Debug("Scrobbling ids:", ids, "times:", times, "submission:", submission)
-	for i := range ids {
+	for i, id := range ids {
 		var t time.Time
 		if len(times) > 0 {
 			t = times[i]
 		} else {
 			t = time.Now()
 		}
-		// TODO Fix skipped songs
-		//skip, err := c.scrobbler.DetectSkipped(playerId, id, submission)
-		//if err != nil {
-		//	beego.Error("Error detecting skip:", err)
-		//}
-		//if skip {
-		//	beego.Info("Skipped previous song")
-		//}
+		skip, err := c.scrobbler.DetectSkipped(playerId, id, submission)
+		if err != nil {
+			beego.Error("Error detecting skip:", err)
+		}
+		if skip {
+			beego.Info("Skipped previous song")
+		}
 		if submission {
-			mf, err := c.scrobbler.Register(playerId, ids[i], t)
+			mf, err := c.scrobbler.Register(playerId, id, t)
 			if err != nil {
-				beego.Error("Error scrobbling:", err)
+				beego.Error("Error scrobbling", id, "-", err)
 				continue
 			}
-			beego.Info(fmt.Sprintf(`Scrobbled (%s) "%s" at %v`, ids[i], mf.Title, t))
+			beego.Info(fmt.Sprintf(`Scrobbled (%s) "%s" at %v`, id, mf.Title, t))
 		} else {
-			mf, err := c.scrobbler.NowPlaying(playerId, ids[i], username, playerName)
+			mf, err := c.scrobbler.NowPlaying(playerId, id, username, playerName)
 			if err != nil {
-				beego.Error("Error setting", ids[i], "as current song:", err)
+				beego.Error("Error setting", id, "as current song:", err)
 				continue
 			}
-			beego.Info(fmt.Sprintf(`Current Song (%s) "%s" at %v`, ids[i], mf.Title, t))
+			beego.Info(fmt.Sprintf(`Now Playing (%s) "%s" at %v`, id, mf.Title, t))
 		}
 	}
 	response := c.NewEmpty()