From 18cca18ebed6d0cbdf9723f7e51854a9b17ef540 Mon Sep 17 00:00:00 2001
From: Eduard Urbach <e.urbach@gmail.com>
Date: Wed, 21 Mar 2018 05:15:03 +0100
Subject: [PATCH] Improved jobs

---
 jobs/jobs.go                                  |  4 +--
 jobs/kitsu-import-anime/kitsu-import-anime.go |  2 +-
 .../kitsu-import-mappings.go                  |  2 +-
 jobs/mal-import/mal-import.go                 |  2 +-
 jobs/refresh-osu/refresh-osu.go               | 32 ++++++++++++-------
 jobs/sync-shoboi/sync-shoboi.go               |  2 +-
 .../refresh-anime-average-color.go            |  2 +-
 .../refresh-anime-thumbnails.go               |  2 +-
 8 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/jobs/jobs.go b/jobs/jobs.go
index 53a87636..cc593c09 100644
--- a/jobs/jobs.go
+++ b/jobs/jobs.go
@@ -25,8 +25,8 @@ var colorPool = []*color.Color{
 
 var jobs = map[string]time.Duration{
 	"anime-ratings": 10 * time.Minute,
-	// "test":             1 * time.Hour,
-	"twist": 4 * time.Hour,
+	"test":          1 * time.Hour,
+	"twist":         4 * time.Hour,
 	// "refresh-episodes": 10 * time.Hour,
 	// "refresh-osu":      12 * time.Hour,
 	// "sync-anime":       12 * time.Hour,
diff --git a/jobs/kitsu-import-anime/kitsu-import-anime.go b/jobs/kitsu-import-anime/kitsu-import-anime.go
index 6653538f..dff51e4e 100644
--- a/jobs/kitsu-import-anime/kitsu-import-anime.go
+++ b/jobs/kitsu-import-anime/kitsu-import-anime.go
@@ -11,8 +11,8 @@ import (
 func main() {
 	color.Yellow("Importing Kitsu anime")
 
-	defer arn.Node.Close()
 	defer color.Green("Finished.")
+	defer arn.Node.Close()
 
 	// In case we refresh only one anime
 	if InvokeShellArgs() {
diff --git a/jobs/kitsu-import-mappings/kitsu-import-mappings.go b/jobs/kitsu-import-mappings/kitsu-import-mappings.go
index 373c093d..00ae7411 100644
--- a/jobs/kitsu-import-mappings/kitsu-import-mappings.go
+++ b/jobs/kitsu-import-mappings/kitsu-import-mappings.go
@@ -11,8 +11,8 @@ import (
 func main() {
 	color.Yellow("Importing Kitsu mappings")
 
-	defer arn.Node.Close()
 	defer color.Green("Finished.")
+	defer arn.Node.Close()
 
 	// Iterate over all mappings
 	for mapping := range kitsu.StreamMappings() {
diff --git a/jobs/mal-import/mal-import.go b/jobs/mal-import/mal-import.go
index a3ef1714..01266b9a 100644
--- a/jobs/mal-import/mal-import.go
+++ b/jobs/mal-import/mal-import.go
@@ -16,8 +16,8 @@ import (
 func main() {
 	color.Yellow("Importing MAL anime")
 
-	defer arn.Node.Close()
 	defer color.Green("Finished.")
+	defer arn.Node.Close()
 
 	// readFile("../mal-download/files/anime-31240.html")
 
diff --git a/jobs/refresh-osu/refresh-osu.go b/jobs/refresh-osu/refresh-osu.go
index 04639099..691304a8 100644
--- a/jobs/refresh-osu/refresh-osu.go
+++ b/jobs/refresh-osu/refresh-osu.go
@@ -7,26 +7,34 @@ import (
 	"github.com/fatih/color"
 )
 
+var ticker = time.NewTicker(500 * time.Millisecond)
+
 func main() {
 	color.Yellow("Refreshing osu information")
+
+	defer color.Green("Finished.")
 	defer arn.Node.Close()
 
-	ticker := time.NewTicker(500 * time.Millisecond)
-
 	for user := range arn.StreamUsers() {
-		// Get osu info
-		if user.RefreshOsuInfo() == nil {
-			arn.PrettyPrint(user.Accounts.Osu)
-
-			// Fetch user again to prevent writing old data
-			updatedUser, _ := arn.GetUser(user.ID)
-			updatedUser.Accounts.Osu = user.Accounts.Osu
-			updatedUser.Save()
+		if user.Accounts.Osu.Nick == "" {
+			continue
 		}
 
+		// Fetch new info
+		err := user.RefreshOsuInfo()
+
+		if err != nil {
+			color.Red(err.Error())
+			continue
+		}
+
+		// Log it
+		arn.PrettyPrint(user.Accounts.Osu)
+
+		// Save in database
+		user.Save()
+
 		// Wait for rate limiter
 		<-ticker.C
 	}
-
-	color.Green("Finished.")
 }
diff --git a/jobs/sync-shoboi/sync-shoboi.go b/jobs/sync-shoboi/sync-shoboi.go
index 5a3adae0..6c95f184 100644
--- a/jobs/sync-shoboi/sync-shoboi.go
+++ b/jobs/sync-shoboi/sync-shoboi.go
@@ -116,5 +116,5 @@ func search(anime *arn.Anime, title string) {
 	}
 
 	// This will start a goroutine that saves the anime
-	anime.SetMapping("shoboi/anime", shoboi.TID, "")
+	anime.SetMapping("shoboi/anime", shoboi.TID)
 }
diff --git a/patches/refresh-anime-average-color/refresh-anime-average-color.go b/patches/refresh-anime-average-color/refresh-anime-average-color.go
index f2eeecc6..4ec5fd18 100644
--- a/patches/refresh-anime-average-color/refresh-anime-average-color.go
+++ b/patches/refresh-anime-average-color/refresh-anime-average-color.go
@@ -16,8 +16,8 @@ import (
 func main() {
 	color.Yellow("Updating anime image average colors")
 
-	defer arn.Node.Close()
 	defer color.Green("Finished.")
+	defer arn.Node.Close()
 
 	// Parse flags
 	var animeID string
diff --git a/patches/refresh-anime-thumbnails/refresh-anime-thumbnails.go b/patches/refresh-anime-thumbnails/refresh-anime-thumbnails.go
index 3525575b..6ae05e29 100644
--- a/patches/refresh-anime-thumbnails/refresh-anime-thumbnails.go
+++ b/patches/refresh-anime-thumbnails/refresh-anime-thumbnails.go
@@ -14,8 +14,8 @@ import (
 func main() {
 	color.Yellow("Updating anime thumbnails")
 
-	defer arn.Node.Close()
 	defer color.Green("Finished.")
+	defer arn.Node.Close()
 
 	// Parse flags
 	var animeID string