aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorksooo <3226626+ksooo@users.noreply.github.com>2024-06-26 23:14:39 +0200
committerksooo <3226626+ksooo@users.noreply.github.com>2024-06-27 18:20:52 +0200
commit14aac683c8efcd7e3ce0672ddf446bf5c4e22706 (patch)
tree888d236c8f4a83a5716f694a8c469b0a7e962216
parent8a90f175f53fa3f86415e6a376aed54d244cad0e (diff)
[video] GUIDialogVideoBookmarks: Use correct item path to write and read bookmarks.
-rw-r--r--xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp20
1 files changed, 4 insertions, 16 deletions
diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
index 344b0b5a07..f97c8c1d21 100644
--- a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
+++ b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
@@ -188,10 +188,7 @@ void CGUIDialogVideoBookmarks::Delete(int item)
{
CVideoDatabase videoDatabase;
videoDatabase.Open();
- std::string path(g_application.CurrentFile());
- if (g_application.CurrentFileItem().HasProperty("original_listitem_url") &&
- !URIUtils::IsVideoDb(g_application.CurrentFileItem().GetProperty("original_listitem_url").asString()))
- path = g_application.CurrentFileItem().GetProperty("original_listitem_url").asString();
+ const std::string path{g_application.CurrentFileItem().GetDynPath()};
videoDatabase.ClearBookMarkOfFile(path, m_bookmarks[item], m_bookmarks[item].type);
videoDatabase.Close();
CUtil::DeleteVideoDatabaseDirectoryCache();
@@ -205,10 +202,7 @@ void CGUIDialogVideoBookmarks::OnRefreshList()
std::vector<CFileItemPtr> items;
// open the d/b and retrieve the bookmarks for the current movie
- m_filePath = g_application.CurrentFile();
- if (g_application.CurrentFileItem().HasProperty("original_listitem_url") &&
- !URIUtils::IsVideoDb(g_application.CurrentFileItem().GetProperty("original_listitem_url").asString()))
- m_filePath = g_application.CurrentFileItem().GetProperty("original_listitem_url").asString();
+ m_filePath = g_application.CurrentFileItem().GetDynPath();
CVideoDatabase videoDatabase;
videoDatabase.Open();
@@ -355,10 +349,7 @@ void CGUIDialogVideoBookmarks::ClearBookmarks()
{
CVideoDatabase videoDatabase;
videoDatabase.Open();
- std::string path = g_application.CurrentFile();
- if (g_application.CurrentFileItem().HasProperty("original_listitem_url") &&
- !URIUtils::IsVideoDb(g_application.CurrentFileItem().GetProperty("original_listitem_url").asString()))
- path = g_application.CurrentFileItem().GetProperty("original_listitem_url").asString();
+ const std::string path{g_application.CurrentFileItem().GetDynPath()};
videoDatabase.ClearBookMarksOfFile(path, CBookmark::STANDARD);
videoDatabase.ClearBookMarksOfFile(path, CBookmark::RESUME);
videoDatabase.ClearBookMarksOfFile(path, CBookmark::EPISODE);
@@ -471,10 +462,7 @@ bool CGUIDialogVideoBookmarks::AddBookmark(CVideoInfoTag* tag)
videoDatabase.AddBookMarkForEpisode(*tag, bookmark);
else
{
- std::string path = g_application.CurrentFile();
- if (g_application.CurrentFileItem().HasProperty("original_listitem_url") &&
- !URIUtils::IsVideoDb(g_application.CurrentFileItem().GetProperty("original_listitem_url").asString()))
- path = g_application.CurrentFileItem().GetProperty("original_listitem_url").asString();
+ const std::string path{g_application.CurrentFileItem().GetDynPath()};
videoDatabase.AddBookMarkToFile(path, bookmark, CBookmark::STANDARD);
}
videoDatabase.Close();