Index file for thumbnails

zoltanvb · zoltanvb · commit a5f1b609b69c · 2025-02-04T07:58:44.000+01:00
Add the function to retrieve an .index-extended file for thumbnail
repositories, similar to core updater. Use the list to determine
if the download should be attempted or not. For now, fall back to
previous method if index can not be retrieved.
diff --git a/core_updater_list.c b/core_updater_list.c
diff --git a/core_updater_list.h b/core_updater_list.h
@@ -32,6 +32,14 @@
 
 RETRO_BEGIN_DECLS
 
+/* Get core updater list */
+enum updater_list_status
+{
+   UPDATER_LIST_BEGIN = 0,
+   UPDATER_LIST_WAIT,
+   UPDATER_LIST_END
+};
+
 /* Defines all possible 'types' of core
  * updater list - corresponds to core
  * delivery method:
@@ -51,7 +59,7 @@ typedef struct
    unsigned year;
    unsigned month;
    unsigned day;
-} core_updater_list_date_t;
+} updater_list_date_t;
 
 /* Holds all info related to a core
  * file on the buildbot */
@@ -64,7 +72,7 @@ typedef struct
    char *display_name;
    char *description;
    struct string_list *licenses_list;
-   core_updater_list_date_t date;   /* unsigned alignment */
+   updater_list_date_t date;   /* unsigned alignment */
    uint32_t crc;
    bool is_experimental;
 } core_updater_list_entry_t;
@@ -73,6 +81,17 @@ typedef struct
  * members */
 typedef struct core_updater_list core_updater_list_t;
 
+
+typedef struct
+{
+   char *remote_filename;
+   char *local_filename;
+   updater_list_date_t date;   /* unsigned alignment */
+   uint32_t crc;
+} thumbnail_updater_list_entry_t;
+
+typedef struct thumbnail_updater_list thumbnail_updater_list_t;
+
 /**************************************/
 /* Initialisation / De-Initialisation */
 /**************************************/
@@ -89,6 +108,11 @@ void core_updater_list_reset(core_updater_list_t *core_list);
 /* Frees specified core updater list */
 void core_updater_list_free(core_updater_list_t *core_list);
 
+/* Thumbnail counterparts */
+thumbnail_updater_list_t *thumbnail_updater_list_init(const char *system);
+void thumbnail_updater_list_reset(thumbnail_updater_list_t *thumbnail_list);
+void thumbnail_updater_list_free(thumbnail_updater_list_t *thumbnail_list);
+
 /***************/
 /* Cached List */
 /***************/
@@ -104,6 +128,11 @@ core_updater_list_t *core_updater_list_get_cached(void);
 /* Frees cached core updater list */
 void core_updater_list_free_cached(void);
 
+/* Thumbnail counterparts */
+bool thumbnail_updater_list_init_cached(const char *system);
+thumbnail_updater_list_t *thumbnail_updater_list_get_cached(const char *system);
+bool thumbnail_updater_list_is_empty(const char* system);
+
 /***********/
 /* Getters */
 /***********/
@@ -140,6 +169,24 @@ bool core_updater_list_get_core(
       const char *local_core_path,
       const core_updater_list_entry_t **entry);
 
+/* Thumbnail equivalents */
+size_t thumbnail_updater_list_size(thumbnail_updater_list_t *thumbnail_list);
+
+bool thumbnail_updater_list_get_index(
+      thumbnail_updater_list_t *thumbnail_list,
+      size_t idx,
+      const thumbnail_updater_list_entry_t **entry);
+
+bool thumbnail_updater_list_get_filename(
+      thumbnail_updater_list_t *thumbnail_list,
+      const char *remote_filename,
+      const thumbnail_updater_list_entry_t **entry);
+
+bool thumbnail_updater_list_get_matching_file(
+      thumbnail_updater_list_t *thumbnail_list,
+      const char *local_thumbnail_path,
+      const thumbnail_updater_list_entry_t **entry);
+
 /***********/
 /* Setters */
 /***********/
@@ -165,6 +212,10 @@ bool core_updater_list_parse_pfd_data(
       const char *path_libretro_info,
       const struct string_list *pfd_cores);
 
+bool thumbnail_updater_list_parse_network_data(
+      thumbnail_updater_list_t *thumbnail_list,
+      const char *data, size_t len);
+
 RETRO_END_DECLS
 
 #endif
diff --git a/file_path_special.h b/file_path_special.h
@@ -75,7 +75,6 @@ RETRO_BEGIN_DECLS
 #define FILE_PATH_RETROACHIEVEMENTS_URL "http://i.retroachievements.org"
 #define FILE_PATH_LOBBY_LIBRETRO_URL "http://lobby.libretro.com/"
 #define FILE_PATH_CORE_THUMBNAILS_URL "http://thumbnails.libretro.com"
-#define FILE_PATH_CORE_THUMBNAILPACKS_URL "http://thumbnailpacks.libretro.com"
 #define FILE_PATH_SHADERS_GLSL_ZIP "shaders_glsl.zip"
 #define FILE_PATH_SHADERS_SLANG_ZIP "shaders_slang.zip"
 #define FILE_PATH_SHADERS_CG_ZIP "shaders_cg.zip"
diff --git a/gfx/gfx_thumbnail.c b/gfx/gfx_thumbnail.c
@@ -332,6 +332,7 @@ void gfx_thumbnail_request(
             {
                enum playlist_thumbnail_name_flags curr_flag;
                static char last_img_name[PATH_MAX_LENGTH] = {0};
+               const char *db_name = NULL;
                settings_t *settings                       = config_get_ptr();
                if (!playlist)
                   goto end;
@@ -372,7 +373,12 @@ void gfx_thumbnail_request(
                /* Trigger thumbnail download *
                 * Note: download will grab all 3 possible thumbnails, no matter
                 * what left/right thumbnails are set at the moment */
-               task_push_pl_entry_thumbnail_download(path_data->system, playlist,
+                if (!string_is_empty(path_data->content_db_name))
+                  db_name = path_data->content_db_name;
+               else
+                  db_name = path_data->system;
+
+               task_push_pl_entry_thumbnail_download(db_name, playlist,
                      (unsigned)idx, false, true);
             }
 #endif
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
@@ -15207,6 +15207,14 @@ MSG_HASH(
    MSG_NO_THUMBNAIL_DOWNLOAD_POSSIBLE,
    "All possible thumbnail downloads were already tried for this playlist entry."
    )
+MSG_HASH(
+   MSG_FETCHING_THUMBNAIL_LIST,
+   "Fetching list of thumbnails on server..."
+   )
+MSG_HASH(
+   MSG_THUMBNAIL_LIST_FAILED,
+   "Failed to retrieve thumbnail list!"
+   )
 MSG_HASH(
    MSG_PRESS_AGAIN_TO_QUIT,
    "Press again to quit..."
@@ -16690,4 +16698,4 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_GAME_AI,
    "Show the 'Game AI' option."
    )
-#endif
+#endif
diff --git a/msg_hash.h b/msg_hash.h
@@ -444,6 +444,8 @@ enum msg_hash_enums
    MSG_TOGGLE_CONTENT_METADATA,
    MSG_NO_THUMBNAIL_AVAILABLE,
    MSG_NO_THUMBNAIL_DOWNLOAD_POSSIBLE,
+   MSG_FETCHING_THUMBNAIL_LIST,
+   MSG_THUMBNAIL_LIST_FAILED,
    MSG_PRESS_AGAIN_TO_QUIT,
    MSG_BLUETOOTH_PAIRING_REMOVED,
    MSG_BLUETOOTH_SCAN_COMPLETE,
diff --git a/tasks/task_core_updater.c b/tasks/task_core_updater.c
@@ -37,6 +37,7 @@
 #include "../msg_hash.h"
 #include "../verbosity.h"
 #include "../core_updater_list.h"
+#include "../file_path_special.h"
 
 #if defined(ANDROID)
 #include "../file_path_special.h"
@@ -48,20 +49,12 @@
 #include "../menu/menu_driver.h"
 #endif
 
-/* Get core updater list */
-enum core_updater_list_status
-{
-   CORE_UPDATER_LIST_BEGIN = 0,
-   CORE_UPDATER_LIST_WAIT,
-   CORE_UPDATER_LIST_END
-};
-
 typedef struct core_updater_list_handle
 {
    core_updater_list_t* core_list;
    retro_task_t *http_task;
    http_transfer_data_t *http_data;
-   enum core_updater_list_status status;
+   enum updater_list_status status;
    bool refresh_menu;
    bool http_task_finished;
    bool http_task_complete;
@@ -299,7 +292,7 @@ static void task_core_updater_get_list_handler(retro_task_t *task)
 
    switch (list_handle->status)
    {
-      case CORE_UPDATER_LIST_BEGIN:
+      case UPDATER_LIST_BEGIN:
          {
             char buildbot_url[PATH_MAX_LENGTH];
             settings_t *settings         = config_get_ptr();
@@ -320,7 +313,7 @@ static void task_core_updater_get_list_handler(retro_task_t *task)
             fill_pathname_join_special(
                   buildbot_url,
                   net_buildbot_url,
-                  ".index-extended",
+                  FILE_PATH_INDEX_EXTENDED_URL,
                   sizeof(buildbot_url));
 
             tmp_url = strdup(buildbot_url);
@@ -351,10 +344,10 @@ static void task_core_updater_get_list_handler(retro_task_t *task)
                   cb_http_task_core_updater_get_list, transf);
 
             /* Start waiting for HTTP transfer to complete */
-            list_handle->status = CORE_UPDATER_LIST_WAIT;
+            list_handle->status = UPDATER_LIST_WAIT;
          }
          break;
-      case CORE_UPDATER_LIST_WAIT:
+      case UPDATER_LIST_WAIT:
          {
             /* If HTTP task is NULL, then it either finished
              * or an error occurred - in either case,
@@ -381,10 +374,10 @@ static void task_core_updater_get_list_handler(retro_task_t *task)
             /* Wait for task_push_http_transfer_file()
              * callback to trigger */
             if (list_handle->http_task_complete)
-               list_handle->status = CORE_UPDATER_LIST_END;
+               list_handle->status = UPDATER_LIST_END;
          }
          break;
-      case CORE_UPDATER_LIST_END:
+      case UPDATER_LIST_END:
          {
             settings_t *settings    = config_get_ptr();
 
@@ -479,7 +472,7 @@ void *task_push_get_core_updater_list(
    list_handle->http_task_complete = false;
    list_handle->http_task_success  = false;
    list_handle->http_data          = NULL;
-   list_handle->status             = CORE_UPDATER_LIST_BEGIN;
+   list_handle->status             = UPDATER_LIST_BEGIN;
 
    /* Concurrent downloads of the buildbot core listing
     * to the same core_updater_list_t object are not
diff --git a/tasks/task_pl_thumbnail_download.c b/tasks/task_pl_thumbnail_download.c
diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h
