Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

video: fix false positive identification of pvr recordings #9141

Merged
merged 1 commit into from
Feb 15, 2016
Merged

video: fix false positive identification of pvr recordings #9141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 47 additions & 42 deletions xbmc/video/windows/GUIWindowVideoBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,63 +1127,68 @@ bool CGUIWindowVideoBase::OnPlayMedia(int iItem, const std::string &player)
CLog::Log(LOGDEBUG, "%s %s", __FUNCTION__, CURL::GetRedacted(item.GetPath()).c_str());


CPVRRecordingsPath path(item.GetPath());
if (path.IsValid() && path.IsActive())
// TODO: delete entire block in v18
// m_strStreamURL is deprecated
if (item.IsPVR())
{
if (!g_PVRManager.IsStarted())
return false;

/* For recordings we check here for a available stream URL */
CFileItemPtr tag = g_PVRRecordings->GetByPath(item.GetPath());
if (tag && tag->HasPVRRecordingInfoTag() && !tag->GetPVRRecordingInfoTag()->m_strStreamURL.empty())
CPVRRecordingsPath path(item.GetPath());
if (path.IsValid() && path.IsActive())
{
std::string stream = tag->GetPVRRecordingInfoTag()->m_strStreamURL;

/* Isolate the folder from the filename */
size_t found = stream.find_last_of("/");
if (found == std::string::npos)
found = stream.find_last_of("\\");
if (!g_PVRManager.IsStarted())
return false;

if (found != std::string::npos)
/* For recordings we check here for a available stream URL */
CFileItemPtr tag = g_PVRRecordings->GetByPath(item.GetPath());
if (tag && tag->HasPVRRecordingInfoTag() && !tag->GetPVRRecordingInfoTag()->m_strStreamURL.empty())
{
/* Check here for asterix at the begin of the filename */
if (stream[found+1] == '*')
{
/* Create a "stack://" url with all files matching the extension */
std::string ext = URIUtils::GetExtension(stream);
std::string dir = stream.substr(0, found).c_str();
std::string stream = tag->GetPVRRecordingInfoTag()->m_strStreamURL;

CFileItemList items;
CDirectory::GetDirectory(dir, items);
items.Sort(SortByFile, SortOrderAscending);
/* Isolate the folder from the filename */
size_t found = stream.find_last_of("/");
if (found == std::string::npos)
found = stream.find_last_of("\\");

std::vector<int> stack;
for (int i = 0; i < items.Size(); ++i)
if (found != std::string::npos)
{
/* Check here for asterix at the begin of the filename */
if (stream[found+1] == '*')
{
if (URIUtils::HasExtension(items[i]->GetPath(), ext))
stack.push_back(i);
/* Create a "stack://" url with all files matching the extension */
std::string ext = URIUtils::GetExtension(stream);
std::string dir = stream.substr(0, found).c_str();

CFileItemList items;
CDirectory::GetDirectory(dir, items);
items.Sort(SortByFile, SortOrderAscending);

std::vector<int> stack;
for (int i = 0; i < items.Size(); ++i)
{
if (URIUtils::HasExtension(items[i]->GetPath(), ext))
stack.push_back(i);
}

if (stack.size() > 0)
{
/* If we have a stack change the path of the item to it */
CStackDirectory dir;
std::string stackPath = dir.ConstructStackPath(items, stack);
item.SetPath(stackPath);
}
}

if (stack.size() > 0)
else
{
/* If we have a stack change the path of the item to it */
CStackDirectory dir;
std::string stackPath = dir.ConstructStackPath(items, stack);
item.SetPath(stackPath);
/* If no asterix is present play only the given stream URL */
item.SetPath(stream);
}
}
else
{
/* If no asterix is present play only the given stream URL */
item.SetPath(stream);
CLog::Log(LOGERROR, "CGUIWindowTV: Can't open recording, no valid filename!");
CGUIDialogOK::ShowAndGetInput(CVariant{19033}, CVariant{19036});
return false;
}
}
else
{
CLog::Log(LOGERROR, "CGUIWindowTV: Can't open recording, no valid filename!");
CGUIDialogOK::ShowAndGetInput(CVariant{19033}, CVariant{19036});
return false;
}
}
}

Expand Down