From cdfb66657a038413631bae0f69f96c06d784c637 Mon Sep 17 00:00:00 2001
From: Eduard Urbach <e.urbach@gmail.com>
Date: Wed, 28 Aug 2019 18:37:09 +0900
Subject: [PATCH] Updated episode refresh

---
 arn/Anime.go       | 10 ++++++----
 arn/EpisodeList.go |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/arn/Anime.go b/arn/Anime.go
index f24ee877..a4e6cbe3 100644
--- a/arn/Anime.go
+++ b/arn/Anime.go
@@ -403,7 +403,7 @@ func (anime *Anime) RefreshEpisodes() error {
 		return err
 	}
 
-	episodes.Merge(shoboiEpisodes)
+	episodes = episodes.Merge(shoboiEpisodes)
 
 	// AnimeTwist
 	twistEpisodes, err := anime.TwistEpisodes()
@@ -412,7 +412,7 @@ func (anime *Anime) RefreshEpisodes() error {
 		return err
 	}
 
-	episodes.Merge(twistEpisodes)
+	episodes = episodes.Merge(twistEpisodes)
 
 	// Count number of available episodes
 	newAvailableCount := episodes.AvailableCount()
@@ -487,8 +487,10 @@ func (anime *Anime) RefreshEpisodes() error {
 	// Save new episode ID list
 	episodeIDs := make([]string, len(episodes))
 
-	for index := range episodes {
-		episodeIDs[index] = episodes[index].ID
+	for index, episode := range episodes {
+		episodeIDs[index] = episode.ID
+		episode.AnimeID = anime.ID
+		episode.Save()
 	}
 
 	anime.EpisodeIDs = episodeIDs
diff --git a/arn/EpisodeList.go b/arn/EpisodeList.go
index d0d49381..130834dd 100644
--- a/arn/EpisodeList.go
+++ b/arn/EpisodeList.go
@@ -28,7 +28,7 @@ func (episodes EpisodeList) Find(episodeNumber int) (*Episode, int) {
 }
 
 // Merge combines the data of both episode lists to one.
-func (episodes EpisodeList) Merge(b EpisodeList) {
+func (episodes EpisodeList) Merge(b EpisodeList) EpisodeList {
 	for index, episode := range b {
 		if index >= len(episodes) {
 			episodes = append(episodes, episode)
@@ -36,6 +36,8 @@ func (episodes EpisodeList) Merge(b EpisodeList) {
 			episodes[index].Merge(episode)
 		}
 	}
+
+	return episodes
 }
 
 // HumanReadable returns a text representation of the anime episodes.