Fixed a bug when searching by tmdb id

darkalfx · Mar 22, 2020 · a361e8a · a361e8a
1 parent d4e63e2
commit a361e8a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 11 deletions.
diff --git a/Requestrr.WebApi/ClientApp/package.json b/Requestrr.WebApi/ClientApp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Requestrr",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Requestrr is a server designed to faciliate the request of media through chat applications.",
   "main": "index.js",
   "author": "Darkalfx",

diff --git a/Requestrr.WebApi/ClientApp/src/components/Footers/AdminFooter.jsx b/Requestrr.WebApi/ClientApp/src/components/Footers/AdminFooter.jsx
@@ -29,7 +29,7 @@ class Footer extends React.Component {
           <Col xl="6">
             <div className="copyright text-center text-xl-left text-muted">
               © {new Date().getFullYear()}{" "}
-              Requestrr (v1.0.6)
+              Requestrr (v1.0.7)
             </div>
           </Col>
         </Row>

diff --git a/Requestrr.WebApi/ClientApp/src/components/Footers/AuthFooter.jsx b/Requestrr.WebApi/ClientApp/src/components/Footers/AuthFooter.jsx
@@ -31,7 +31,7 @@ class AuthFooter extends React.Component {
               <Col xl="6">
                 <div className="copyright text-center text-xl-left text-muted">
                   © {new Date().getFullYear()}{" "}
-                  Requestrr (v1.0.6)
+                  Requestrr (v1.0.7)
                 </div>
               </Col>
             </Row>

diff --git a/Requestrr.WebApi/RequestrrBot/ChatClients/Discord/DiscordHelpWorkFlow.cs b/Requestrr.WebApi/RequestrrBot/ChatClients/Discord/DiscordHelpWorkFlow.cs
@@ -45,7 +45,7 @@ public async Task HandleHelpAsync()
             if (!string.IsNullOrWhiteSpace(_discordSettings.MovieCommand))
             {
                 messageBuilder.AppendLine($"**{_discordSettings.CommandPrefix}{_discordSettings.MovieCommand}**");
-                messageBuilder.AppendLine($"**{_discordSettings.CommandPrefix}{_discordSettings.MovieCommand} tmdbid**");
+                messageBuilder.AppendLine($"**{_discordSettings.CommandPrefix}{_discordSettings.MovieCommand} tmdb**");
             }
 
             messageBuilder.AppendLine($"**{_discordSettings.CommandPrefix}help**");

diff --git a/Requestrr.WebApi/RequestrrBot/DownloadClients/Radarr/Radarr.cs b/Requestrr.WebApi/RequestrrBot/DownloadClients/Radarr/Radarr.cs
@@ -171,14 +171,33 @@ public async Task<Movie> SearchMovieAsync(int theMovieDbId)
             {
                 try
                 {
-                    var response = await HttpGetAsync($"{BaseURL}/movie/lookup/tmdb?tmdbId={theMovieDbId}");
-                    await response.ThrowIfNotSuccessfulAsync("RadarrMovieLookupByTmdbId failed", x => x.error);
+                    var response = await HttpGetAsync($"{BaseURL}/movie");
+                    await response.ThrowIfNotSuccessfulAsync("RadarrGetAllMovies failed", x => x.error);
 
                     var jsonResponse = await response.Content.ReadAsStringAsync();
-                    var jsonMovie = JsonConvert.DeserializeObject<JSONMovie>(jsonResponse);
+                    var allRadarrMoviesJson = JsonConvert.DeserializeObject<List<JSONMovie>>(jsonResponse).ToArray();
+
+                    var foundMovieJson = allRadarrMoviesJson.FirstOrDefault(x => x.tmdbId == theMovieDbId);
+
+                    response = await HttpGetAsync($"{BaseURL}/movie/lookup/tmdb?tmdbId={theMovieDbId}");
+                    await response.ThrowIfNotSuccessfulAsync("RadarrMovieLookupByTmdbId failed", x => x.error);
+
+                    jsonResponse = await response.Content.ReadAsStringAsync();
+                    var movieFoundByIdJson = JsonConvert.DeserializeObject<JSONMovie>(jsonResponse);
+
+                    if (foundMovieJson != null)
+                    {
+                        if (movieFoundByIdJson.tmdbId == theMovieDbId)
+                        {
+                            foundMovieJson.images = movieFoundByIdJson.images;
+                        }
+                    }
+                    else
+                    {
+                        foundMovieJson = movieFoundByIdJson;
+                    }
 
-                    var convertedMovie = Convert(jsonMovie);
-                    return convertedMovie?.TheMovieDbId == theMovieDbId.ToString() ? convertedMovie : null;
+                    return foundMovieJson != null ? Convert(foundMovieJson) : null;
                 }
                 catch (System.Exception ex)
                 {

diff --git a/Requestrr.WebApi/RequestrrBot/Movies/MovieRequestingWorkflow.cs b/Requestrr.WebApi/RequestrrBot/Movies/MovieRequestingWorkflow.cs
@@ -60,9 +60,9 @@ public async Task<IReadOnlyList<Movie>> SearchMoviesAsync(string movieName)
         {
             IReadOnlyList<Movie> movies = Array.Empty<Movie>();
 
-            if (movieName.Trim().ToLower().StartsWith("tmdbid"))
+            if (movieName.Trim().ToLower().StartsWith("tmdb"))
             {
-                var theMovieDbIdTextValue = movieName.ToLower().Split("tmdbid")[1]?.Trim();
+                var theMovieDbIdTextValue = movieName.ToLower().Split("tmdb")[1]?.Trim();
 
                 if (int.TryParse(theMovieDbIdTextValue, out var theMovieDbId))
                 {