split AddCachedTexture into Add and SetCachedTextureValid, so that Ad…

…dCachedTexture can just delete and re-add to simplify queries
xbmc · May 2, 2012 · 6b1dc99 · 6b1dc99
1 parent baa48f7
commit 6b1dc99
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/xbmc/TextureCache.cpp b/xbmc/TextureCache.cpp
@@ -244,6 +244,12 @@ bool CTextureCache::IncrementUseCount(const CTextureDetails &details)
   return m_database.IncrementUseCount(details);
 }
 
+bool CTextureCache::SetCachedTextureValid(const CStdString &url, bool updateable)
+{
+  CSingleLock lock(m_databaseSection);
+  return m_database.SetCachedTextureValid(url, updateable);
+}
+
 bool CTextureCache::ClearCachedTexture(const CStdString &url, CStdString &cachedURL)
 {
   CSingleLock lock(m_databaseSection);
@@ -271,7 +277,10 @@ void CTextureCache::OnJobComplete(unsigned int jobID, bool success, CJob *job)
   if (strcmp(job->GetType(), "cacheimage") == 0 && success)
   {
     CTextureCacheJob *cacheJob = (CTextureCacheJob *)job;
-    AddCachedTexture(cacheJob->m_url, cacheJob->m_details);
+    if (cacheJob->m_oldHash == cacheJob->m_details.hash)
+      SetCachedTextureValid(cacheJob->m_url, cacheJob->m_details.updateable);
+    else
+      AddCachedTexture(cacheJob->m_url, cacheJob->m_details);
     // TODO: call back to the UI indicating that it can update it's image...
     if (g_advancedSettings.m_useDDSFanart && !cacheJob->m_details.file.empty())
       AddJob(new CTextureDDSJob(GetCachedPath(cacheJob->m_details.file)));

diff --git a/xbmc/TextureCache.h b/xbmc/TextureCache.h
@@ -199,6 +199,14 @@ class CTextureCache : public CJobQueue
    */
   bool IncrementUseCount(const CTextureDetails &details);
 
+  /*! \brief Set a previously cached texture as valid in the database
+   Thread-safe wrapper of CTextureDatabase::SetCachedTextureValid
+   \param image url of the original image
+   \param updateable whether this image should be checked for updates
+   \return true if successful, false otherwise.
+   */
+  bool SetCachedTextureValid(const CStdString &url, bool updateable);
+
   virtual void OnJobComplete(unsigned int jobID, bool success, CJob *job);
 
   CCriticalSection m_databaseSection;

diff --git a/xbmc/TextureDatabase.cpp b/xbmc/TextureDatabase.cpp
@@ -169,36 +169,26 @@ bool CTextureDatabase::GetCachedTexture(const CStdString &url, CTextureDetails &
   return false;
 }
 
+bool CTextureDatabase::SetCachedTextureValid(const CStdString &url, bool updateable)
+{
+  CStdString date = updateable ? CDateTime::GetCurrentDateTime().GetAsDBDateTime() : "";
+  CStdString sql = PrepareSQL("UPDATE texture SET lasthashcheck='%s' WHERE url='%s'", date.c_str(), url.c_str());
+  return ExecuteQuery(sql);
+}
+
 bool CTextureDatabase::AddCachedTexture(const CStdString &url, const CTextureDetails &details)
 {
   try
   {
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
 
-    CStdString cacheURL(details.file);
-    CStdString date = details.updateable ? CDateTime::GetCurrentDateTime().GetAsDBDateTime() : "";
+    CStdString sql = PrepareSQL("DELETE FROM texture WHERE url='%s'", url.c_str());
+    m_pDS->exec(sql.c_str());
 
-    CStdString sql = PrepareSQL("select id,cachedurl from texture where url='%s'", url.c_str());
-    m_pDS->query(sql.c_str());
-    if (!m_pDS->eof())
-    { // update
-      int textureID = m_pDS->fv(0).get_asInt();
-      if (cacheURL.IsEmpty())
-        cacheURL = m_pDS->fv(1).get_asString();
-      m_pDS->close();
-      if (!details.hash.empty())
-        sql = PrepareSQL("update texture set cachedurl='%s', usecount=1, lastusetime=CURRENT_TIMESTAMP, imagehash='%s', lasthashcheck='%s' where id=%u", cacheURL.c_str(), details.hash.c_str(), date.c_str(), textureID);
-      else
-        sql = PrepareSQL("update texture set cachedurl='%s', usecount=1, lastusetime=CURRENT_TIMESTAMP where id=%u", cacheURL.c_str(), textureID);
-      m_pDS->exec(sql.c_str());
-    }
-    else if (!cacheURL.IsEmpty())
-    { // add the texture
-      m_pDS->close();
-      sql = PrepareSQL("insert into texture (id, url, cachedurl, usecount, lastusetime, imagehash, lasthashcheck) values(NULL, '%s', '%s', 1, CURRENT_TIMESTAMP, '%s', '%s')", url.c_str(), cacheURL.c_str(), details.hash.c_str(), date.c_str());
-      m_pDS->exec(sql.c_str());
-    }
+    CStdString date = details.updateable ? CDateTime::GetCurrentDateTime().GetAsDBDateTime() : "";
+    sql = PrepareSQL("insert into texture (id, url, cachedurl, usecount, lastusetime, imagehash, lasthashcheck) values(NULL, '%s', '%s', 1, CURRENT_TIMESTAMP, '%s', '%s')", url.c_str(), details.file.c_str(), details.hash.c_str(), date.c_str());
+    m_pDS->exec(sql.c_str());
   }
   catch (...)
   {

diff --git a/xbmc/TextureDatabase.h b/xbmc/TextureDatabase.h
@@ -33,6 +33,7 @@ class CTextureDatabase : public CDatabase
 
   bool GetCachedTexture(const CStdString &originalURL, CTextureDetails &details);
   bool AddCachedTexture(const CStdString &originalURL, const CTextureDetails &details);
+  bool SetCachedTextureValid(const CStdString &originalURL, bool updateable);
   bool ClearCachedTexture(const CStdString &originalURL, CStdString &cacheFile);
   bool IncrementUseCount(const CTextureDetails &details);