Drop thumb type from (most) movies, shows, seasons + sets + fixes

language/English/strings.po

@@ -9156,9 +9156,7 @@ msgctxt "#20434"
 msgid "Sets"
 msgstr ""
 
-msgctxt "#20435"
-msgid "Set movieset thumb"
-msgstr ""
+#empty string with id 20435
 
 msgctxt "#20436"
 msgid "Export actor thumbs?"
@@ -9240,9 +9238,7 @@ msgctxt "#20455"
 msgid "Listeners"
 msgstr ""
 
-msgctxt "#20456"
-msgid "Set movieset fanart"
-msgstr ""
+#empty string with id 20456
 
 msgctxt "#20457"
 msgid "Movie set"

xbmc/DatabaseManager.cpp

@@ -54,6 +54,9 @@ void CDatabaseManager::Initialize(bool addonsOnly)
   if (addonsOnly)
     return;
   CLog::Log(LOGDEBUG, "%s, updating databases...", __FUNCTION__);
+
+  // NOTE: Order here is important. In particular, CTextureDatabase has to be updated
+  //       before CVideoDatabase.
   { CViewDatabase db; UpdateDatabase(db); }
   { CTextureDatabase db; UpdateDatabase(db); }
   { CMusicDatabase db; UpdateDatabase(db, &g_advancedSettings.m_databaseMusic); }

xbmc/GUIInfoManager.cpp

@@ -3136,13 +3136,13 @@ CStdString CGUIInfoManager::GetImage(int info, int contextWindow, CStdString *fa
   {
     CGUIWindow *window = GetWindowWithCondition(contextWindow, WINDOW_CONDITION_IS_MEDIA_WINDOW);
     if (window)
-      return ((CGUIMediaWindow *)window)->CurrentDirectory().GetArt("tvshowthumb");
+      return ((CGUIMediaWindow *)window)->CurrentDirectory().GetArt("tvshow.thumb");
   }
   else if (info == CONTAINER_SEASONTHUMB)
   {
     CGUIWindow *window = GetWindowWithCondition(contextWindow, WINDOW_CONDITION_IS_MEDIA_WINDOW);
     if (window)
-      return ((CGUIMediaWindow *)window)->CurrentDirectory().GetArt("seasonthumb");
+      return ((CGUIMediaWindow *)window)->CurrentDirectory().GetArt("season.thumb");
   }
   else if (info == LISTITEM_THUMB || info == LISTITEM_ICON || info == LISTITEM_ACTUAL_ICON ||
           info == LISTITEM_OVERLAY || info == LISTITEM_RATING || info == LISTITEM_STAR_RATING)

xbmc/TextureCache.cpp

@@ -72,21 +72,19 @@ bool CTextureCache::IsCachedImage(const CStdString &url) const
 
 bool CTextureCache::HasCachedImage(const CStdString &url)
 {
-  CStdString cachedHash;
-  CStdString cachedImage(GetCachedImage(url, cachedHash));
+  CTextureDetails details;
+  CStdString cachedImage(GetCachedImage(url, details));
   return (!cachedImage.IsEmpty() && cachedImage != url);
 }
 
-CStdString CTextureCache::GetCachedImage(const CStdString &image, CStdString &cachedHash, bool trackUsage)
+CStdString CTextureCache::GetCachedImage(const CStdString &image, CTextureDetails &details, bool trackUsage)
 {
-  cachedHash.clear();
   CStdString url = UnwrapImageURL(image);
 
   if (IsCachedImage(url))
     return url;
 
   // lookup the item in the database
-  CTextureDetails details;
   if (GetCachedTexture(url, details))
   {
     if (trackUsage)
@@ -136,9 +134,9 @@ bool CTextureCache::CanCacheImageURL(const CURL &url)
 
 CStdString CTextureCache::CheckCachedImage(const CStdString &url, bool returnDDS, bool &needsRecaching)
 {
-  CStdString cachedHash;
-  CStdString path(GetCachedImage(url, cachedHash, true));
-  needsRecaching = !cachedHash.IsEmpty();
+  CTextureDetails details;
+  CStdString path(GetCachedImage(url, details, true));
+  needsRecaching = !details.hash.empty();
   if (!path.IsEmpty())
   {
     if (!needsRecaching && returnDDS && !URIUtils::IsInPath(url, "special://skin/")) // TODO: should skin images be .dds'd (currently they're not necessarily writeable)
@@ -156,16 +154,25 @@ CStdString CTextureCache::CheckCachedImage(const CStdString &url, bool returnDDS
 
 void CTextureCache::BackgroundCacheImage(const CStdString &url)
 {
-  CStdString cacheHash;
-  CStdString path(GetCachedImage(url, cacheHash));
-  if (!path.IsEmpty() && cacheHash.IsEmpty())
+  CTextureDetails details;
+  CStdString path(GetCachedImage(url, details));
+  if (!path.IsEmpty() && details.hash.empty())
     return; // image is already cached and doesn't need to be checked further
 
   // needs (re)caching
-  AddJob(new CTextureCacheJob(UnwrapImageURL(url), cacheHash));
+  AddJob(new CTextureCacheJob(UnwrapImageURL(url), details.hash));
+}
+
+bool CTextureCache::CacheImage(const CStdString &image, CTextureDetails &details)
+{
+  CStdString path = GetCachedImage(image, details);
+  if (path.empty()) // not cached
+    path = CacheImage(image, NULL, &details);
+
+  return !path.empty();
 }
 
-CStdString CTextureCache::CacheImage(const CStdString &image, CBaseTexture **texture)
+CStdString CTextureCache::CacheImage(const CStdString &image, CBaseTexture **texture, CTextureDetails *details)
 {
   CStdString url = UnwrapImageURL(image);
   CSingleLock lock(m_processingSection);
@@ -177,6 +184,8 @@ CStdString CTextureCache::CacheImage(const CStdString &image, CBaseTexture **tex
     CTextureCacheJob job(url);
     bool success = job.CacheTexture(texture);
     OnCachingComplete(success, &job);
+    if (success && details)
+      *details = job.m_details;
     return success ? GetCachedPath(job.m_details.file) : "";
   }
   lock.Leave();
@@ -191,8 +200,10 @@ CStdString CTextureCache::CacheImage(const CStdString &image, CBaseTexture **tex
         break;
     }
   }
-  CStdString cachedHash;
-  return GetCachedImage(url, cachedHash, true);
+  CTextureDetails tempDetails;
+  if (!details)
+    details = &tempDetails;
+  return GetCachedImage(url, *details, true);
 }
 
 void CTextureCache::ClearCachedImage(const CStdString &url, bool deleteSource /*= false */)
@@ -315,8 +326,8 @@ void CTextureCache::OnJobProgress(unsigned int jobID, unsigned int progress, uns
 
 bool CTextureCache::Export(const CStdString &image, const CStdString &destination, bool overwrite)
 {
-  CStdString cachedHash;
-  CStdString cachedImage(GetCachedImage(image, cachedHash));
+  CTextureDetails details;
+  CStdString cachedImage(GetCachedImage(image, details));
   if (!cachedImage.IsEmpty())
   {
     CStdString dest = destination + URIUtils::GetExtension(cachedImage);
@@ -332,8 +343,8 @@ bool CTextureCache::Export(const CStdString &image, const CStdString &destinatio
 
 bool CTextureCache::Export(const CStdString &image, const CStdString &destination)
 {
-  CStdString cachedHash;
-  CStdString cachedImage(GetCachedImage(image, cachedHash));
+  CTextureDetails details;
+  CStdString cachedImage(GetCachedImage(image, details));
   if (!cachedImage.IsEmpty())
   {
     if (CFile::Cache(cachedImage, destination))

xbmc/TextureCache.h

@@ -87,10 +87,19 @@ class CTextureCache : public CJobQueue
 
    \param image url of the image to cache
    \param texture [out] the loaded image
+   \param details [out] details of the cached image
    \return cached url of this image
    \sa CTextureCacheJob::CacheTexture
    */
-  CStdString CacheImage(const CStdString &url, CBaseTexture **texture = NULL);
+  CStdString CacheImage(const CStdString &url, CBaseTexture **texture = NULL, CTextureDetails *details = NULL);
+
+  /*! \brief Cache an image to image cache if not already cached, returning the image details.
+   \param image url of the image to cache.
+   \param details [out] the image details.
+   \return true if the image is in the cache, false otherwise.
+   \sa CTextureCacheJob::CacheTexture
+   */
+  bool CacheImage(const CStdString &image, CTextureDetails &details);
 
   /*! \brief Check whether an image is in the cache
    Note: If the image url won't normally be cached (eg a skin image) this function will return false.
@@ -172,12 +181,12 @@ class CTextureCache : public CJobQueue
 
   /*! \brief retrieve the cached version of the given image (if it exists)
    \param image url of the image
-   \param cacheHash [out] set to the hash of the cached image if it needs checking
+   \param details [out] the details of the texture.
    \param trackUsage whether this call should track usage of the image (defaults to false)
    \return cached url of this image, empty if none exists
-   \sa ClearCachedImage
+   \sa ClearCachedImage, CTextureDetails
    */
-  CStdString GetCachedImage(const CStdString &image, CStdString &cacheHash, bool trackUsage = false);
+  CStdString GetCachedImage(const CStdString &image, CTextureDetails &details, bool trackUsage = false);
 
   /*! \brief Get an image from the database
    Thread-safe wrapper of CTextureDatabase::GetCachedTexture

xbmc/dialogs/GUIDialogContextMenu.h

@@ -80,7 +80,7 @@ enum CONTEXT_BUTTON { CONTEXT_BUTTON_CANCELLED = 0,
                       CONTEXT_BUTTON_SCAN,
                       CONTEXT_BUTTON_STOP_SCANNING,
                       CONTEXT_BUTTON_SET_ARTIST_THUMB,
-                      CONTEXT_BUTTON_SET_SEASON_THUMB,
+                      CONTEXT_BUTTON_SET_SEASON_ART,
                       CONTEXT_BUTTON_NOW_PLAYING,
                       CONTEXT_BUTTON_CANCEL_PARTYMODE,
                       CONTEXT_BUTTON_MARK_WATCHED,
@@ -109,11 +109,10 @@ enum CONTEXT_BUTTON { CONTEXT_BUTTON_CANCELLED = 0,
                       CONTEXT_BUTTON_GROUP_MANAGER,
                       CONTEXT_BUTTON_CHANNEL_MANAGER,
                       CONTEXT_BUTTON_FILTER,
-                      CONTEXT_BUTTON_SET_MOVIESET_THUMB,
+                      CONTEXT_BUTTON_SET_MOVIESET_ART,
                       CONTEXT_BUTTON_BEGIN,
                       CONTEXT_BUTTON_END,
                       CONTEXT_BUTTON_FIND,
-                      CONTEXT_BUTTON_SET_MOVIESET_FANART,
                       CONTEXT_BUTTON_DELETE_PLUGIN,
                       CONTEXT_BUTTON_SORTASC,
                       CONTEXT_BUTTON_SORTBY,

xbmc/guilib/GUIListItem.cpp

@@ -119,11 +119,11 @@ void CGUIListItem::SetArt(const std::string &type, const std::string &url)
   }
 }
 
-void CGUIListItem::SetArt(const ArtMap &art)
+void CGUIListItem::SetArt(const ArtMap &art, bool setFallback /* = true */)
 {
   m_art = art;
   // ensure that the fallback "thumb" is available
-  if (m_art.find("thumb") == m_art.end())
+  if (setFallback && m_art.find("thumb") == m_art.end())
   {
     if (HasArt("poster"))
       m_art["thumb"] = m_art["poster"];

xbmc/guilib/GUIListItem.h

@@ -85,9 +85,10 @@ class CGUIListItem
 
   /*! \brief set artwork for an item
    \param art a type:url map for artwork
+   \param setFallback whether to set the "thumb" fallback, defaults to true.
    \sa GetArt
    */
-  void SetArt(const ArtMap &art);
+  void SetArt(const ArtMap &art, bool setFallback = true);
 
   /*! \brief append artwork to an item
    \param art a type:url map for artwork

xbmc/interfaces/json-rpc/VideoLibrary.cpp

@@ -527,7 +527,7 @@ JSONRPC_STATUS CVideoLibrary::SetTVShowDetails(const CStdString &method, ITransp
   std::map<std::string, std::string> artwork;
   videodatabase.GetArtForItem(infos.m_iDbId, infos.m_type, artwork);
 
-  std::map<int, std::string> seasonArt;
+  std::map<int, std::map<std::string, std::string> > seasonArt;
   videodatabase.GetTvShowSeasonArt(infos.m_iDbId, seasonArt);
 
   int playcount = infos.m_playCount;

xbmc/utils/EdenVideoArtUpdater.cpp

@@ -93,8 +93,9 @@ void CEdenVideoArtUpdater::Process()
     if (!db.GetArtForItem(item->GetVideoInfoTag()->m_iDbId, item->GetVideoInfoTag()->m_type, artwork))
     {
       CStdString art = CVideoInfoScanner::GetImage(item.get(), true, item->GetVideoInfoTag()->m_basePath != item->GetPath(), "thumb");
-      if (!art.empty() && CacheTexture(art, cachedThumb))
-        artwork.insert(make_pair("thumb", art));
+      std::string type;
+      if (!art.empty() && CacheTexture(art, cachedThumb, type))
+        artwork.insert(make_pair(type, art));
 
       art = CVideoInfoScanner::GetFanart(item.get(), true);
       if (!art.empty() && CacheTexture(art, cachedFanart))
@@ -125,8 +126,9 @@ void CEdenVideoArtUpdater::Process()
     if (!db.GetArtForItem(item->GetVideoInfoTag()->m_iDbId, item->GetVideoInfoTag()->m_type, artwork))
     {
       CStdString art = CVideoInfoScanner::GetImage(item.get(), true, item->GetVideoInfoTag()->m_basePath != item->GetPath(), "thumb");
-      if (!art.empty() && CacheTexture(art, cachedThumb))
-        artwork.insert(make_pair("thumb", art));
+      std::string type;
+      if (!art.empty() && CacheTexture(art, cachedThumb, type))
+        artwork.insert(make_pair(type, art));
 
       art = CVideoInfoScanner::GetFanart(item.get(), true);
       if (!art.empty() && CacheTexture(art, cachedFanart))
@@ -157,8 +159,9 @@ void CEdenVideoArtUpdater::Process()
     if (!db.GetArtForItem(item->GetVideoInfoTag()->m_iDbId, item->GetVideoInfoTag()->m_type, artwork))
     {
       CStdString art = CVideoInfoScanner::GetImage(item.get(), true, false, "thumb");
-      if (!art.empty() && CacheTexture(art, cachedThumb))
-        artwork.insert(make_pair("thumb", art));
+      std::string type;
+      if (!art.empty() && CacheTexture(art, cachedThumb, type))
+        artwork.insert(make_pair(type, art));
 
       art = CVideoInfoScanner::GetFanart(item.get(), true);
       if (!art.empty() && CacheTexture(art, cachedFanart))
@@ -170,19 +173,21 @@ void CEdenVideoArtUpdater::Process()
     }
 
     // now season art...
-    map<int, string> seasons;
-    CVideoInfoScanner::GetSeasonThumbs(*item->GetVideoInfoTag(), seasons, true);
-    for (map<int, string>::const_iterator j = seasons.begin(); j != seasons.end(); ++j)
+    map<int, map<string, string> > seasons;
+    vector<string> artTypes; artTypes.push_back("thumb");
+    CVideoInfoScanner::GetSeasonThumbs(*item->GetVideoInfoTag(), seasons, artTypes, true);
+    for (map<int, map<string, string> >::const_iterator j = seasons.begin(); j != seasons.end(); ++j)
     {
+      if (j->second.empty())
+        continue;
       int idSeason = db.AddSeason(item->GetVideoInfoTag()->m_iDbId, j->first);
-      if (!db.GetArtForItem(idSeason, "season", "thumb").empty())
+      map<string, string> seasonArt;
+      if (idSeason > -1 && !db.GetArtForItem(idSeason, "season", seasonArt))
       {
         std::string cachedSeason = GetCachedSeasonThumb(j->first, item->GetVideoInfoTag()->m_strPath);
-        if (CacheTexture(j->second, cachedSeason))
-        {
-          if (idSeason > -1)
-            db.SetArtForItem(idSeason, "season", "thumb", j->second);
-        }
+        std::string type;
+        if (CacheTexture(j->second.begin()->second, cachedSeason, type))
+          db.SetArtForItem(idSeason, "season", type, j->second.begin()->second);
       }
     }
 
@@ -267,13 +272,20 @@ void CEdenVideoArtUpdater::Process()
 }
 
 bool CEdenVideoArtUpdater::CacheTexture(const std::string &originalUrl, const std::string &cachedFile)
+{
+  std::string type;
+  return CacheTexture(originalUrl, cachedFile, type);
+}
+
+bool CEdenVideoArtUpdater::CacheTexture(const std::string &originalUrl, const std::string &cachedFile, std::string &type)
 {
   if (!CFile::Exists(cachedFile))
     return false;
 
   CTextureDetails details;
-  details.updateable = false;;
+  details.updateable = false;
   details.hash = "NOHASH";
+  type = "thumb"; // unknown art type
 
   CBaseTexture *texture = CTextureCacheJob::LoadImage(cachedFile, 0, 0, "");
   if (texture)
@@ -290,6 +302,7 @@ bool CEdenVideoArtUpdater::CacheTexture(const std::string &originalUrl, const st
     {
       details.width = width;
       details.height = height;
+      type = CVideoInfoScanner::GetArtTypeFromSize(details.width, details.height);
       delete texture;
       m_textureDB.AddCachedTexture(originalUrl, details);
       return true;

xbmc/utils/EdenVideoArtUpdater.h

@@ -39,7 +39,9 @@ class CEdenVideoArtUpdater : CThread
   /*! \brief Caches the texture from oldCachedFile as if it came from originalUrl into the texture cache.
    \param originalUrl the url that we think the oldCachedFile came from.
    \param oldCachedFile the old cached file
+   \param type [out] the type of art (poster/banner/thumb)
    */
+  bool CacheTexture(const std::string &originalUrl, const std::string &cachedFile, std::string &type);
   bool CacheTexture(const std::string &originalUrl, const std::string &oldCachedFile);
 
   CStdString GetCachedActorThumb(const CFileItem &item);

xbmc/utils/RecentlyAddedJob.cpp

@@ -135,7 +135,7 @@ bool CRecentlyAddedJob::UpdateVideo()
         seasonThumb = videodatabase.GetArtForItem(item->GetVideoInfoTag()->m_iIdSeason, "season", "thumb");
 
       home->SetProperty("LatestEpisode." + value + ".Thumb"         , item->GetArt("thumb"));
-      home->SetProperty("LatestEpisode." + value + ".ShowThumb"     , item->GetArt("tvshowthumb"));
+      home->SetProperty("LatestEpisode." + value + ".ShowThumb"     , item->GetArt("tvshow.thumb"));
       home->SetProperty("LatestEpisode." + value + ".SeasonThumb"   , seasonThumb);
       home->SetProperty("LatestEpisode." + value + ".Fanart"        , item->GetArt("fanart"));
     }