Merge pull request xbmc#24645 from CrystalP/fix-parentmovie-properties

[video] fill GUIListItem properties with streamdetails for the hybrid…
Memphiz · Feb 6, 2024 · ca059b3 · ca059b3
2 parents 827936d + 6c02f3f
commit ca059b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/xbmc/video/VideoManagerTypes.h b/xbmc/video/VideoManagerTypes.h
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <string>
+
 enum class VideoAssetTypeOwner
 {
   UNKNOWN = -1,
@@ -33,6 +35,7 @@ static constexpr int VIDEO_VERSION_ID_BEGIN = 40400;
 static constexpr int VIDEO_VERSION_ID_END = 40800;
 static constexpr int VIDEO_VERSION_ID_DEFAULT = VIDEO_VERSION_ID_BEGIN;
 static constexpr int VIDEO_VERSION_ID_ALL = 0;
+static const std::string VIDEODB_PATH_VERSION_ID_ALL{"videodb://movies/videoversions/0"};
 
 struct VideoAssetInfo
 {

diff --git a/xbmc/video/VideoThumbLoader.cpp b/xbmc/video/VideoThumbLoader.cpp
@@ -559,7 +559,9 @@ std::string CVideoThumbLoader::GetEmbeddedThumbURL(const CFileItem &item)
 
 void CVideoThumbLoader::DetectAndAddMissingItemData(CFileItem &item)
 {
-  if (item.m_bIsFolder) return;
+  // @todo remove exception for hybrid movie/folder of versions
+  if (item.m_bIsFolder && !StringUtils::StartsWith(item.GetPath(), VIDEODB_PATH_VERSION_ID_ALL))
+    return;
 
   if (item.HasVideoInfoTag())
   {