0.12.0-17 Misc fixes

backend/src/services/omdbService.js

@@ -37,6 +37,22 @@ function sleep(ms) {
 }
 
 class OmdbService {
+  mapSearchResults(data) {
+    if (!data || typeof data !== 'object') {
+      return [];
+    }
+    if (data.Response === 'False' || !Array.isArray(data.Search)) {
+      return [];
+    }
+    return data.Search.map((item) => ({
+      title: item.Title,
+      year: item.Year,
+      imdbId: item.imdbID,
+      type: item.Type,
+      poster: item.Poster
+    }));
+  }
+
   async requestJson(url, meta = {}, options = {}) {
     const timeoutMs = normalizeOmdbTimeoutMs(options?.timeoutMs);
     const maxAttempts = Math.max(1, Math.trunc(Number(options?.maxAttempts || OMDB_MAX_ATTEMPTS)));
@@ -89,10 +105,26 @@ class OmdbService {
   }
 
   async search(query) {
-    if (!query || query.trim().length === 0) {
+    const normalizedQuery = String(query || '').trim();
+    if (!normalizedQuery) {
       return [];
     }
-    logger.info('search:start', { query });
+    logger.info('search:start', { query: normalizedQuery });
+
+    // Allow direct IMDb-ID lookups in the search field (useful for History remapping).
+    const imdbLike = normalizedQuery.toLowerCase();
+    if (/^tt\d{6,12}$/.test(imdbLike)) {
+      const byId = await this.fetchByImdbId(imdbLike);
+      return byId
+        ? [{
+            title: byId.title,
+            year: byId.year != null ? String(byId.year) : null,
+            imdbId: byId.imdbId,
+            type: byId.type,
+            poster: byId.poster
+          }]
+        : [];
+    }
 
     const settings = await settingsService.getSettingsMap();
     const apiKey = settings.omdb_api_key;
@@ -101,28 +133,47 @@ class OmdbService {
     }
     const timeoutMs = normalizeOmdbTimeoutMs(settings.omdb_timeout_ms);
 
-    const type = settings.omdb_default_type || 'movie';
-    const url = new URL(OMDB_BASE_URL);
-    url.searchParams.set('apikey', apiKey);
-    url.searchParams.set('s', query.trim());
-    url.searchParams.set('type', type);
+    const configuredType = String(settings.omdb_default_type || 'movie').trim().toLowerCase() || 'movie';
+    const requestSearch = async (type = null) => {
+      const url = new URL(OMDB_BASE_URL);
+      url.searchParams.set('apikey', apiKey);
+      url.searchParams.set('s', normalizedQuery);
+      if (type) {
+        url.searchParams.set('type', type);
+      }
+      const data = await this.requestJson(
+        url,
+        { query: normalizedQuery, action: 'search', type: type || null },
+        { timeoutMs }
+      );
+      return {
+        data,
+        results: this.mapSearchResults(data)
+      };
+    };
 
-    const data = await this.requestJson(url, { query, action: 'search' }, { timeoutMs });
-    if (!data || typeof data !== 'object') {
+    let { data, results } = await requestSearch(configuredType);
+    if (results.length === 0 && configuredType) {
+      logger.info('search:fallback-no-type', {
+        query: normalizedQuery,
+        configuredType,
+        response: data?.Response || null,
+        error: data?.Error || null
+      });
+      ({ data, results } = await requestSearch(null));
+    }
+
+    if (results.length === 0) {
+      logger.warn('search:no-results', {
+        query: normalizedQuery,
+        response: data?.Response || null,
+        error: data?.Error || null,
+        configuredType
+      });
       return [];
     }
-    if (data.Response === 'False' || !Array.isArray(data.Search)) {
-      logger.warn('search:no-results', { query, response: data.Response, error: data.Error });
-      return [];
-    }
-    const results = data.Search.map((item) => ({
-      title: item.Title,
-      year: item.Year,
-      imdbId: item.imdbID,
-      type: item.Type,
-      poster: item.Poster
-    }));
-    logger.info('search:done', { query, count: results.length });
+
+    logger.info('search:done', { query: normalizedQuery, count: results.length, configuredType });
     return results;
   }