[video] Fix resume of Non-Videodatabase items if 'play next video aut…

…omatically' is active.
Rechi · Dec 16, 2024 · abfa810 · abfa810
1 parent 757de49
commit abfa810
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 0 deletions.
diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp
@@ -2293,6 +2293,18 @@ bool CFileItem::LoadDetails()
     return false;
   }
 
+  if (GetProperty("IsVideoFolder").asBoolean(false))
+  {
+    const std::shared_ptr<CFileItem> loadedItem{VIDEO::UTILS::LoadVideoFilesFolderInfo(*this)};
+    if (loadedItem)
+    {
+      UpdateInfo(*loadedItem);
+      return true;
+    }
+    CLog::LogF(LOGERROR, "Error filling video files folder item details (path={})", GetPath());
+    return false;
+  }
+
   //! @todo add support for other types on demand.
   CLog::LogF(LOGDEBUG, "Unsupported item type (path={})", GetPath());
   return false;

diff --git a/xbmc/video/VideoUtils.cpp b/xbmc/video/VideoUtils.cpp
@@ -239,4 +239,45 @@ ResumeInformation GetStackPartResumeInformation(const CFileItem& item, unsigned
   return resumeInfo;
 }
 
+std::shared_ptr<CFileItem> LoadVideoFilesFolderInfo(const CFileItem& folder)
+{
+  CVideoDatabase db;
+  if (!db.Open())
+  {
+    CLog::LogF(LOGERROR, "Cannot open VideoDatabase");
+    return {};
+  }
+
+  CFileItemList items;
+  XFILE::CDirectory::GetDirectory(folder.GetDynPath(), items, "", XFILE::DIR_FLAG_DEFAULTS);
+
+  db.GetPlayCounts(items.GetPath(), items);
+
+  std::shared_ptr<CFileItem> loadedItem{std::make_shared<CFileItem>(folder)};
+  loadedItem->SetProperty("total", 0);
+  loadedItem->SetProperty("watched", 0);
+  loadedItem->SetProperty("unwatched", 0);
+  loadedItem->SetProperty("inprogress", 0);
+
+  for (const auto& item : items)
+  {
+    if (item->HasVideoInfoTag())
+    {
+      loadedItem->IncrementProperty("total", 1);
+      if (item->GetVideoInfoTag()->GetPlayCount() == 0)
+      {
+        loadedItem->IncrementProperty("unwatched", 1);
+      }
+      else
+      {
+        loadedItem->IncrementProperty("watched", 1);
+      }
+      if (item->GetVideoInfoTag()->GetResumePoint().IsPartWay())
+      {
+        loadedItem->IncrementProperty("inprogress", 1);
+      }
+    }
+  }
+  return loadedItem;
+}
 } // namespace KODI::VIDEO::UTILS
diff --git a/xbmc/video/VideoUtils.h b/xbmc/video/VideoUtils.h
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <memory>
 #include <string>
 
 class CFileItem;
@@ -64,4 +65,11 @@ ResumeInformation GetItemResumeInformation(const CFileItem& item);
  */
 ResumeInformation GetStackPartResumeInformation(const CFileItem& item, unsigned int partNumber);
 
+/*!
+ \brief For a given non-library folder containing video files, load info from the video database.
+ \param folder The folder to load
+ \return The item containing the folder including loaded info.
+ */
+std::shared_ptr<CFileItem> LoadVideoFilesFolderInfo(const CFileItem& folder);
+
 } // namespace KODI::VIDEO::UTILS
diff --git a/xbmc/video/guilib/VideoGUIUtils.cpp b/xbmc/video/guilib/VideoGUIUtils.cpp
@@ -220,6 +220,9 @@ void CAsyncGetItemsForPlaylist::GetItemsForPlaylist(const std::shared_ptr<CFileI
           content = "files";
 
         items.SetContent(content);
+
+        // Get play counts and resume bookmarks for the items.
+        db.GetPlayCounts(items.GetPath(), items);
       }
     }
 
@@ -424,6 +427,7 @@ void PlayItem(
       }
 
       const auto parentItem = std::make_shared<CFileItem>(parentPath, true);
+      parentItem->SetProperty("IsVideoFolder", true);
       parentItem->LoadDetails();
       if (item->GetStartOffset() == STARTOFFSET_RESUME)
         parentItem->SetStartOffset(STARTOFFSET_RESUME);