Don't send IMDB on tv search if not supported

theotherp · Nov 13, 2024 · a4905d8 · a4905d8
1 parent d7be67a
commit a4905d8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/core/src/main/java/org/nzbhydra/indexers/Newznab.java b/core/src/main/java/org/nzbhydra/indexers/Newznab.java
@@ -326,8 +326,10 @@ protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchR
             Map<MediaIdType, String> params = new HashMap<>();
             boolean idConversionNeeded = isIdConversionNeeded(searchRequest);
             if (idConversionNeeded) {
+                debug("Will try to convert IDs if possible");
                 boolean canConvertAnyId = infoProvider.canConvertAny(searchRequest.getIdentifiers().keySet(), new HashSet<>(config.getSupportedSearchIds()));
                 if (canConvertAnyId) {
+                    debug("Can convert any of provided IDs {} to at least one of supported IDs {}", searchRequest.getIdentifiers().keySet(), config.getSupportedSearchIds());
                     try {
                         MediaInfo info = infoProvider.convert(searchRequest.getIdentifiers());
 
@@ -352,6 +354,7 @@ protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchR
                         if (info.getTvDbId().isPresent()) {
                             params.put(MediaIdType.TVDB, info.getTvDbId().get());
                         }
+                        debug("Available search IDs: {}", params);
                     } catch (InfoProviderException e) {
                         error("Error while converting search ID", e);
                     }
@@ -366,6 +369,10 @@ protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchR
 
             //Don't overwrite IDs provided by the calling instance, only add missing ones
             params.forEach((key, value) -> searchRequest.getIdentifiers().putIfAbsent(key, value));
+            if (searchRequest.getSearchType() == SearchType.TVSEARCH) {
+                //IMDB is not the same as TVIMDB
+                searchRequest.getIdentifiers().remove(MediaIdType.IMDB);
+            }
 
             for (Map.Entry<MediaIdType, String> entry : searchRequest.getIdentifiers().entrySet()) {
                 //We just add all IDs that we have (if the indexer supports them). Some indexers will find results under one ID but not the other
@@ -375,6 +382,7 @@ protected UriComponentsBuilder extendQueryUrlWithSearchIds(SearchRequest searchR
                 if (!config.getSupportedSearchIds().contains(entry.getKey())) {
                     continue;
                 }
+                debug("Using media type ID {}={}", entry.getKey(), entry.getValue());
                 componentsBuilder.queryParam(idTypeToParamValueMap.get(entry.getKey()), entry.getValue().replace("tt", ""));
             }
 

diff --git a/core/src/main/resources/changelog.yaml b/core/src/main/resources/changelog.yaml
@@ -4,6 +4,8 @@
     changes:
       -   type: "fix"
           text: "The status of downloads was not properly updated for sabnzbd downloads. Previously unmapped downloads will keep their wrong status in the history because it would be a pain to retroactively update them. See #968"
+      -   type: "fix"
+          text: "Do not use IMDB IDs for indexers that don't support them. This would happen when using the TV search function in the ID and selecting a result from the autocomplete."
     final: true
 -   version: "v7.10.0"
     date: "2024-11-12"

diff --git a/tests/system/src/test/java/org/nzbhydra/MediaInfoTest.java b/tests/system/src/test/java/org/nzbhydra/MediaInfoTest.java
@@ -55,7 +55,7 @@ public void shouldAutocompleteMovie() throws Exception {
         });
         Assertions.assertThat(checkCapsResponses).isNotEmpty();
         MediaInfoTO mediaInfoTO = checkCapsResponses.get(0);
-        Assertions.assertThat(mediaInfoTO.getImdbId()).isEqualTo("98");
+        Assertions.assertThat(mediaInfoTO.getTmdbId()).isEqualTo("98");
 
     }