Merge pull request #997 from tidusjar/dev

Dev

Ombi.Api/RadarrApi.cs

@@ -107,6 +107,11 @@ namespace Ombi.Api
                     var error = JsonConvert.DeserializeObject < RadarrError>(response.Content);
                     return new RadarrAddMovie {Error =  error};
                 }
+                if (response.Content.Contains("\"errorMessage\":"))
+                {
+                    var error = JsonConvert.DeserializeObject<List<SonarrError>>(response.Content).FirstOrDefault();
+                    return new RadarrAddMovie {Error = new RadarrError {message = error?.errorMessage}};
+                }
                 return JsonConvert.DeserializeObject < RadarrAddMovie>(response.Content);
             }
             catch (JsonSerializationException jse)

Ombi.Core/MovieSender.cs

@@ -111,7 +111,7 @@ namespace Ombi.Core
             if (!string.IsNullOrEmpty(result.Error?.message))
             {
                 Log.Error(result.Error.message);
-                return new MovieSenderResult { Result = false };
+                return new MovieSenderResult { Result = false, Error = true};
             }
             if (!string.IsNullOrEmpty(result.title))
             {

Ombi.Core/MovieSenderResult.cs

@@ -36,5 +36,7 @@ namespace Ombi.Core
         ///   <c>true</c> if [movie sending enabled]; otherwise, <c>false</c>.
         /// </value>
         public bool MovieSendingEnabled { get; set; }
+
+        public bool Error { get; set; }     
     }
 }

Ombi.UI/Modules/RequestsModule.cs

@@ -275,7 +275,7 @@ namespace Ombi.UI.Modules
                 Episodes = tv.Episodes.ToArray(),
                 RootFolders =  rootFolders.ToArray(),
                 HasRootFolders = rootFolders.Any(),
-                CurrentRootPath = GetRootPath(tv.RootFolderSelected, sonarrSettings).Result
+                CurrentRootPath = sonarrSettings.Enabled ? GetRootPath(tv.RootFolderSelected, sonarrSettings).Result : null
             }).ToList();
 
             return Response.AsJson(viewModel);
@@ -292,7 +292,9 @@ namespace Ombi.UI.Modules
             {
                 return r.path;
             }
-            return string.Empty;
+
+            // Return default path
+            return rootFoldersResult.FirstOrDefault(x => x.id.Equals(int.Parse(sonarrSettings.RootPath)))?.path ?? string.Empty;
         }
 
         private async Task<Response> GetAlbumRequests()

Ombi.UI/Modules/SearchModule.cs

@@ -789,7 +789,17 @@ namespace Ombi.UI.Modules
                     if (result.Result)
                     {
                         return await AddRequest(model, settings,
-                                    $"{fullMovieName} {Resources.UI.Search_SuccessfullyAdded}");
+                            $"{fullMovieName} {Resources.UI.Search_SuccessfullyAdded}");
+                    }
+                    if (result.Error)
+
+                    {
+                        return
+                            Response.AsJson(new JsonResponseModel
+                            {
+                                Message = "Could not add movie, please contract your administrator",
+                                Result = false
+                            });
                     }
                     if (!result.MovieSendingEnabled)
                     {