[PVR] Fix for slow metadata updates from metaron

See: http://forum.kodi.tv/showthread.php?tid=210774
popcornmix · Jan 1, 2015 · 7db79de · 7db79de
1 parent a5bbb15
commit 7db79de
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 18 deletions.
diff --git a/xbmc/pvr/recordings/PVRRecording.cpp b/xbmc/pvr/recordings/PVRRecording.cpp
@@ -221,7 +221,7 @@ bool CPVRRecording::SetPlayCount(int count)
   return true;
 }
 
-void CPVRRecording::UpdateMetadata(void)
+void CPVRRecording::UpdateMetadata(CVideoDatabase &db)
 {
   if (m_bGotMetaData)
     return;
@@ -231,20 +231,14 @@ void CPVRRecording::UpdateMetadata(void)
 
   if (!supportsPlayCount || !supportsLastPlayed)
   {
-    CVideoDatabase db;
-    if (db.Open())
+    if (!supportsPlayCount)
     {
-      if (!supportsPlayCount)
-      {
-        CFileItem pFileItem(*this);
-        m_playCount = db.GetPlayCount(pFileItem);
-      }
-
-      if (!supportsLastPlayed)
-        db.GetResumeBookMark(m_strFileNameAndPath, m_resumePoint);
-
-      db.Close();
+       CFileItem pFileItem(*this);
+       m_playCount = db.GetPlayCount(pFileItem);
     }
+
+    if (!supportsLastPlayed)
+      db.GetResumeBookMark(m_strFileNameAndPath, m_resumePoint);
   }
 
   m_bGotMetaData = true;

diff --git a/xbmc/pvr/recordings/PVRRecording.h b/xbmc/pvr/recordings/PVRRecording.h
@@ -39,6 +39,8 @@
 #include "video/VideoInfoTag.h"
 #include "XBDateTime.h"
 
+class CVideoDatabase;
+
 namespace PVR
 {
   class CPVRRecording;
@@ -149,7 +151,7 @@ namespace PVR
      * @brief Get the resume point and play count from the database if the 
      * client doesn't handle it itself.
      */
-    void UpdateMetadata(void);
+    void UpdateMetadata(CVideoDatabase &db);
 
     /*!
      * @brief Update this tag with the contents of the given tag.

diff --git a/xbmc/pvr/recordings/PVRRecordings.cpp b/xbmc/pvr/recordings/PVRRecordings.cpp
@@ -105,6 +105,9 @@ void CPVRRecordings::GetSubDirectories(const std::string &strBase, CFileItemList
   std::string strUseBase = TrimSlashes(strBase);
   std::set<CFileItemPtr> unwatchedFolders;
 
+  CVideoDatabase db;
+  bool dbLoaded = db.Open();
+
   for (PVR_RECORDINGMAP_CITR it = m_recordings.begin(); it != m_recordings.end(); it++)
   {
     CPVRRecordingPtr current = it->second;
@@ -119,8 +122,9 @@ void CPVRRecordings::GetSubDirectories(const std::string &strBase, CFileItemList
       strFilePath = StringUtils::Format("pvr://recordings/%s/%s/", strUseBase.c_str(), strCurrent.c_str());
 
     CFileItemPtr pFileItem;
-    current->UpdateMetadata();
-
+    if (dbLoaded)
+      current->UpdateMetadata(db);
+
     if (!results->Contains(strFilePath))
     {
       pFileItem.reset(new CFileItem(strCurrent, true));
@@ -143,6 +147,8 @@ void CPVRRecordings::GetSubDirectories(const std::string &strBase, CFileItemList
     if (current->m_playCount == 0)
       unwatchedFolders.insert(pFileItem);
   }
+  if (dbLoaded)
+    db.Close();
 
   // Remove the watched overlay from folders containing unwatched entries
   for (std::set<CFileItemPtr>::iterator it = unwatchedFolders.begin(); it != unwatchedFolders.end(); ++it)
@@ -319,6 +325,9 @@ bool CPVRRecordings::GetDirectory(const std::string& strPath, CFileItemList &ite
     if (m_bGroupItems)
       GetSubDirectories(strDirectoryPath, &items);
 
+    CVideoDatabase db;
+    bool dbLoaded = db.Open();
+
     // get all files of the currrent directory or recursively all files starting at the current directory if in flatten mode
     for (PVR_RECORDINGMAP_CITR it = m_recordings.begin(); it != m_recordings.end(); it++)
     {
@@ -328,7 +337,8 @@ bool CPVRRecordings::GetDirectory(const std::string& strPath, CFileItemList &ite
       if (!IsDirectoryMember(strDirectoryPath, current->m_strDirectory))
         continue;
 
-      current->UpdateMetadata();
+      if (dbLoaded)
+        current->UpdateMetadata(db);
       CFileItemPtr pFileItem(new CFileItem(*current));
       pFileItem->SetLabel2(current->RecordingTimeAsLocalTime().GetAsLocalizedDateTime(true, false));
       pFileItem->m_dateTime = current->RecordingTimeAsLocalTime();
@@ -354,6 +364,8 @@ bool CPVRRecordings::GetDirectory(const std::string& strPath, CFileItemList &ite
 
       items.Add(pFileItem);
     }
+    if (dbLoaded)
+      db.Close();
 
     return true;
   }
@@ -364,10 +376,15 @@ bool CPVRRecordings::GetDirectory(const std::string& strPath, CFileItemList &ite
 void CPVRRecordings::GetAll(CFileItemList &items)
 {
   CSingleLock lock(m_critSection);
+
+  CVideoDatabase db;
+  bool dbLoaded = db.Open();
+
   for (PVR_RECORDINGMAP_CITR it = m_recordings.begin(); it != m_recordings.end(); it++)
   {
     CPVRRecordingPtr current = it->second;
-    current->UpdateMetadata();
+    if (dbLoaded)
+      current->UpdateMetadata(db);
 
     CFileItemPtr pFileItem(new CFileItem(*current));
     pFileItem->SetLabel2(current->RecordingTimeAsLocalTime().GetAsLocalizedDateTime(true, false));
@@ -377,6 +394,8 @@ void CPVRRecordings::GetAll(CFileItemList &items)
 
     items.Add(pFileItem);
   }
+  if (dbLoaded)
+    db.Close();
 }
 
 CFileItemPtr CPVRRecordings::GetById(unsigned int iId) const