From fc5da638c0d2893fd36a2ce49d929171157a057d Mon Sep 17 00:00:00 2001
From: Eduard Urbach <e.urbach@gmail.com>
Date: Fri, 23 Mar 2018 03:29:56 +0100
Subject: [PATCH] Delete ServiceMatch caching

---
 pages/listimport/listimportkitsu/kitsu.go     |  9 +----
 .../listimportmyanimelist/myanimelist.go      | 10 +----
 .../add-mal-connections.go                    | 37 -------------------
 .../refresh-anilist-mappings.go}              |  4 +-
 4 files changed, 6 insertions(+), 54 deletions(-)
 delete mode 100644 patches/add-mal-connections/add-mal-connections.go
 rename patches/{import-anilist/import-anilist.go => refresh-anilist-mappings/refresh-anilist-mappings.go} (82%)

diff --git a/pages/listimport/listimportkitsu/kitsu.go b/pages/listimport/listimportkitsu/kitsu.go
index 6732e468..bcd398d7 100644
--- a/pages/listimport/listimportkitsu/kitsu.go
+++ b/pages/listimport/listimportkitsu/kitsu.go
@@ -112,16 +112,9 @@ func findAllMatches(library chan *kitsu.LibraryEntry) []*arn.KitsuMatch {
 			continue
 		}
 
-		var anime *arn.Anime
-		connection, err := arn.GetKitsuToAnime(item.Anime.ID)
-
-		if err == nil {
-			anime, _ = arn.GetAnime(connection.AnimeID)
-		}
-
 		matches = append(matches, &arn.KitsuMatch{
 			KitsuItem: item,
-			ARNAnime:  anime,
+			ARNAnime:  arn.FindKitsuAnime(item.Anime.ID),
 		})
 	}
 
diff --git a/pages/listimport/listimportmyanimelist/myanimelist.go b/pages/listimport/listimportmyanimelist/myanimelist.go
index f8d6ccb5..511f4928 100644
--- a/pages/listimport/listimportmyanimelist/myanimelist.go
+++ b/pages/listimport/listimportmyanimelist/myanimelist.go
@@ -99,19 +99,13 @@ func getMatches(ctx *aero.Context) ([]*arn.MyAnimeListMatch, string) {
 
 // findAllMatches returns all matches for the anime inside an anilist anime list.
 func findAllMatches(animeList *mal.AnimeList) []*arn.MyAnimeListMatch {
+	allAnime := arn.AllAnime()
 	matches := []*arn.MyAnimeListMatch{}
 
 	for _, item := range animeList.Items {
-		var anime *arn.Anime
-		connection, err := arn.GetMyAnimeListToAnime(item.AnimeID)
-
-		if err == nil {
-			anime, _ = arn.GetAnime(connection.AnimeID)
-		}
-
 		matches = append(matches, &arn.MyAnimeListMatch{
 			MyAnimeListItem: item,
-			ARNAnime:        anime,
+			ARNAnime:        arn.FindMyAnimeListAnime(item.AnimeID, allAnime),
 		})
 	}
 
diff --git a/patches/add-mal-connections/add-mal-connections.go b/patches/add-mal-connections/add-mal-connections.go
deleted file mode 100644
index 2f3a8057..00000000
--- a/patches/add-mal-connections/add-mal-connections.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package main
-
-import (
-	"strconv"
-
-	"github.com/animenotifier/arn"
-	"github.com/fatih/color"
-)
-
-func main() {
-	defer arn.Node.Close()
-
-	for anime := range arn.StreamAnime() {
-		malID := anime.GetMapping("myanimelist/anime")
-
-		if malID == "" {
-			continue
-		}
-
-		// Assure the string represents a number
-		malNum, _ := strconv.Atoi(malID)
-		normalizedID := strconv.Itoa(malNum)
-
-		if malID != normalizedID {
-			color.Red("%s does not match %d", malID, normalizedID)
-			continue
-		}
-
-		// Save
-		arn.DB.Set("MyAnimeListToAnime", malID, &arn.MyAnimeListToAnime{
-			AnimeID:   anime.ID,
-			ServiceID: malID,
-			Edited:    arn.DateTimeUTC(),
-			EditedBy:  "",
-		})
-	}
-}
diff --git a/patches/import-anilist/import-anilist.go b/patches/refresh-anilist-mappings/refresh-anilist-mappings.go
similarity index 82%
rename from patches/import-anilist/import-anilist.go
rename to patches/refresh-anilist-mappings/refresh-anilist-mappings.go
index 153d7279..c7d30e51 100644
--- a/patches/import-anilist/import-anilist.go
+++ b/patches/refresh-anilist-mappings/refresh-anilist-mappings.go
@@ -7,9 +7,11 @@ import (
 )
 
 func main() {
+	color.Yellow("Iterating through AniList anime to generate new mappings")
 	defer arn.Node.Close()
 
-	arn.PanicOnError(anilist.Authorize())
+	err := anilist.Authorize()
+	arn.PanicOnError(err)
 	color.Green(anilist.AccessToken)
 
 	allAnime := arn.AllAnime()