Some final tweaks for #32

Ombi-app · Apr 5, 2016 · f3cca9f · f3cca9f
1 parent 5e5fe1f
commit f3cca9f
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 28 deletions.
diff --git a/PlexRequests.Core/StatusChecker.cs b/PlexRequests.Core/StatusChecker.cs
@@ -26,8 +26,6 @@
 #endregion
 using System;
 using System.Linq;
-using System.Reflection;
-using System.Runtime.Versioning;
 using System.Threading.Tasks;
 
 using Octokit;
@@ -62,7 +60,10 @@ public StatusModel GetStatus()
             };
 
             var latestRelease = GetLatestRelease();
-
+            if (latestRelease.Result == null)
+            {
+                return new StatusModel { Version = "Unknown" };
+            }
             var latestVersionArray = latestRelease.Result.Name.Split(new[] { 'v' }, StringSplitOptions.RemoveEmptyEntries);
             var latestVersion = latestVersionArray.Length > 1 ? latestVersionArray[1] : string.Empty;
 

diff --git a/PlexRequests.UI/Helpers/HeadphonesSender.cs b/PlexRequests.UI/Helpers/HeadphonesSender.cs
@@ -111,40 +111,44 @@ private async Task<bool> AddArtist(RequestedModel request)
                     return false;
                 }
             }
-            var addedArtist = index.FirstOrDefault(x => x.ArtistID == request.ArtistId);
-            var artistName = addedArtist?.ArtistName ?? string.Empty;
-            while (artistName.Contains("Fetch failed"))
+
+            counter = 0;
+            var artistStatus = index.Where(x => x.ArtistID == request.ArtistId).Select(x => x.Status).FirstOrDefault();
+            while (artistStatus != "Active")
             {
                 Thread.Sleep(WaitTime);
-                await Api.RefreshArtist(Settings.ApiKey, Settings.FullUri, request.ArtistId);
-
+                counter++;
+                Log.Trace("Artist status {1}. Counter = {0}", counter, artistStatus);
                 index = await Api.GetIndex(Settings.ApiKey, Settings.FullUri);
-
-                artistName = index?.FirstOrDefault(x => x.ArtistID == request.ArtistId)?.ArtistName ?? string.Empty;
+                artistStatus = index.Where(x => x.ArtistID == request.ArtistId).Select(x => x.Status).FirstOrDefault();
                 if (counter > CounterMax)
                 {
-                    Log.Trace("Artist fetch has failed. Counter = {0}. Returning false", counter);
-                    Log.Warn("Artist in headphones fetch has failed, we have tried refreshing the artist but no luck.");
+                    Log.Trace("Artist status is still not active. Counter = {0}. Returning false", counter);
+                    Log.Warn("The artist status is still not Active. We have waited long enough, seems to be a big delay in headphones.");
                     return false;
                 }
             }
 
+            var addedArtist = index.FirstOrDefault(x => x.ArtistID == request.ArtistId);
+            var artistName = addedArtist?.ArtistName ?? string.Empty;
             counter = 0;
-            var artistStatus = index.Where(x => x.ArtistID == request.ArtistId).Select(x => x.Status).FirstOrDefault();
-            while (artistStatus != "Active")
+            while (artistName.Contains("Fetch failed"))
             {
                 Thread.Sleep(WaitTime);
-                counter++;
-                Log.Trace("Artist status {1}. Counter = {0}", counter, artistStatus);
+                await Api.RefreshArtist(Settings.ApiKey, Settings.FullUri, request.ArtistId);
+
                 index = await Api.GetIndex(Settings.ApiKey, Settings.FullUri);
-                artistStatus = index.Where(x => x.ArtistID == request.ArtistId).Select(x => x.Status).FirstOrDefault();
+
+                artistName = index?.FirstOrDefault(x => x.ArtistID == request.ArtistId)?.ArtistName ?? string.Empty;
+                counter++;
                 if (counter > CounterMax)
                 {
-                    Log.Trace("Artist status is still not active. Counter = {0}. Returning false", counter);
-                    Log.Warn("The artist status is still not Active. We have waited long enough, seems to be a big delay in headphones.");
+                    Log.Trace("Artist fetch has failed. Counter = {0}. Returning false", counter);
+                    Log.Warn("Artist in headphones fetch has failed, we have tried refreshing the artist but no luck.");
                     return false;
                 }
             }
+
             return true;
         }
 

diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
@@ -502,24 +502,36 @@ private Response RequestAlbum(string releaseId)
 
 
             Log.Debug("This is a new request");
-
+            
             var albumInfo = MusicBrainzApi.GetAlbum(releaseId);
-            var img = GetMusicBrainzCoverArt(albumInfo.id);
-
-            Log.Trace("Album Details:");
-            Log.Trace(albumInfo.DumpJson());
-            Log.Trace("CoverArt Details:");
-            Log.Trace(img.DumpJson());
-
             DateTime release;
             DateTimeHelper.CustomParse(albumInfo.ReleaseEvents?.FirstOrDefault()?.date, out release);
 
             var artist = albumInfo.ArtistCredits?.FirstOrDefault()?.artist;
             if (artist == null)
             {
-                return Response.AsJson(new JsonResponseModel {Result = false, Message = "We could not find the artist on MusicBrainz. Please try again later or contact your admin"});
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "We could not find the artist on MusicBrainz. Please try again later or contact your admin" });
             }
 
+            var alreadyInPlex = CheckIfTitleExistsInPlex(albumInfo.title, release.ToString("yyyy"), artist.name, PlexType.Music);
+
+            if (alreadyInPlex)
+            {
+                return Response.AsJson(new JsonResponseModel
+                {
+                    Result = false,
+                    Message = $"{albumInfo.title} is already in Plex!"
+                });
+            }
+
+            var img = GetMusicBrainzCoverArt(albumInfo.id);
+
+            Log.Trace("Album Details:");
+            Log.Trace(albumInfo.DumpJson());
+            Log.Trace("CoverArt Details:");
+            Log.Trace(img.DumpJson());
+
+
             var model = new RequestedModel
             {
                 Title = albumInfo.title,
@@ -559,6 +571,7 @@ private Response RequestAlbum(string releaseId)
 
                 var sender = new HeadphonesSender(HeadphonesApi, hpSettings, RequestService);
                 sender.AddAlbum(model);
+                model.Approved = true;
                 RequestService.AddRequest(model);
 
                 return