Merge pull request #9145 from ksooo/pvr-fix-recordings-nonflat-view-2

[PVR] Recordings window: Fix recordings in nested folders not displayed
xbmc · Feb 16, 2016 · bc987ef · bc987ef
2 parents 0871790 + 999caa7
commit bc987ef
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 42 deletions.
diff --git a/xbmc/pvr/recordings/PVRRecordingsPath.cpp b/xbmc/pvr/recordings/PVRRecordingsPath.cpp
@@ -33,7 +33,32 @@ const std::string CPVRRecordingsPath::PATH_DELETED_RECORDINGS = "pvr://recording
 
 CPVRRecordingsPath::CPVRRecordingsPath(const std::string &strPath)
 {
-  Init(strPath);
+  std::string strVarPath(TrimSlashes(strPath));
+  const std::vector<std::string> segments = URIUtils::SplitPath(strVarPath);
+
+  m_bValid  = ((segments.size() >= 3) && // at least pvr://recordings/[active|deleted]
+               StringUtils::StartsWith(strVarPath, "pvr://") &&
+               (segments.at(1) == "recordings") &&
+               ((segments.at(2) == "active") || (segments.at(2) == "deleted")));
+  m_bRoot   = (m_bValid && (segments.size() == 3));
+  m_bActive = (m_bValid && (segments.at(2) == "active"));
+
+  if (m_bRoot)
+    strVarPath.append("/");
+  else
+  {
+    size_t paramStart = m_path.find(", TV");
+    if (paramStart == std::string::npos)
+      m_directoryPath = strVarPath.substr(m_bActive ? PATH_ACTIVE_RECORDINGS.size() : PATH_DELETED_RECORDINGS.size());
+    else
+    {
+      size_t dirStart = m_bActive ? PATH_ACTIVE_RECORDINGS.size() : PATH_DELETED_RECORDINGS.size();
+      m_directoryPath = strVarPath.substr(dirStart, paramStart - dirStart);
+      m_params = strVarPath.substr(paramStart);
+    }
+  }
+
+  m_path = strVarPath;
 }
 
 CPVRRecordingsPath::CPVRRecordingsPath(bool bDeleted)
@@ -53,9 +78,9 @@ CPVRRecordingsPath::CPVRRecordingsPath(bool bDeleted,
   m_bRoot(false),
   m_bActive(!bDeleted)
 {
-  std::string strDirectoryN;
-  if (!strDirectory.empty() && strDirectory != "/")
-    strDirectoryN = StringUtils::Format("%s/", strDirectory.c_str());
+  std::string strDirectoryN(TrimSlashes(strDirectory));
+  if (!strDirectoryN.empty())
+    strDirectoryN = StringUtils::Format("%s/", strDirectoryN.c_str());
 
   std::string strTitleN(strTitle);
   StringUtils::Replace(strTitleN, '/', ' ');
@@ -89,46 +114,10 @@ CPVRRecordingsPath::CPVRRecordingsPath(bool bDeleted,
   m_path   = StringUtils::Format("pvr://recordings/%s/%s%s", bDeleted ? "deleted" : "active", m_directoryPath.c_str(), m_params.c_str());
 }
 
-void CPVRRecordingsPath::Init(const std::string &strPath)
-{
-  std::string strVarPath(strPath);
-  URIUtils::RemoveSlashAtEnd(strVarPath);
-
-  const std::vector<std::string> segments = URIUtils::SplitPath(strVarPath);
-
-  m_bValid  = ((segments.size() >= 3) && // at least pvr://recordings/[active|deleted]
-               (segments.at(1) == "recordings") &&
-               ((segments.at(2) == "active") || (segments.at(2) == "deleted")));
-  m_bRoot   = (m_bValid && (segments.size() == 3));
-  m_bActive = (m_bValid && (segments.at(2) == "active"));
-
-  if (m_bRoot)
-    strVarPath.append("/");
-  else
-  {
-    size_t paramStart = m_path.find(", TV");
-    if (paramStart == std::string::npos)
-      m_directoryPath = strVarPath.substr(m_bActive ? PATH_ACTIVE_RECORDINGS.size(): PATH_DELETED_RECORDINGS.size());
-    else
-    {
-      size_t dirStart = m_bActive ? PATH_ACTIVE_RECORDINGS.size(): PATH_DELETED_RECORDINGS.size();
-      m_directoryPath = strVarPath.substr(dirStart, paramStart - dirStart);
-      m_params = strVarPath.substr(paramStart);
-    }
-  }
-
-  m_path = strVarPath;
-}
-
 std::string CPVRRecordingsPath::GetSubDirectoryPath(const std::string &strPath) const
 {
   std::string strReturn;
-
-  std::string strUsePath(strPath);
-  while (!strUsePath.empty() && strUsePath.at(0) == '/')
-    strUsePath.erase(0, 1);
-
-  URIUtils::RemoveSlashAtEnd(strUsePath);
+  std::string strUsePath(TrimSlashes(strPath));
 
   /* adding "/" to make sure that base matches the complete folder name and not only parts of it */
   if (!m_directoryPath.empty() && (strUsePath.size() <= m_directoryPath.size() || !StringUtils::StartsWith(strUsePath, m_directoryPath + "/")))
@@ -165,17 +154,45 @@ const std::string CPVRRecordingsPath::GetTitle() const
 
 void CPVRRecordingsPath::AppendSegment(const std::string &strSegment)
 {
+  if (!m_bValid || strSegment.empty() || strSegment == "/")
+    return;
+
+  std::string strVarSegment(TrimSlashes(strSegment));
+
+  if (!m_directoryPath.empty() && m_directoryPath.back() != '/')
+    m_directoryPath.push_back('/');
+
   m_directoryPath += strSegment;
 
   size_t paramStart = m_path.find(", TV");
   if (paramStart == std::string::npos)
   {
+    if (!m_path.empty() && m_path.back() != '/')
+      m_path.push_back('/');
+
     // append the segment
     m_path += strSegment;
   }
   else
   {
+    if (m_path.back() != '/')
+      m_path.insert(paramStart, "/");
+
     // insert the segment between end of current directory path and parameters
     m_path.insert(paramStart, strSegment);
   }
+
+  m_bRoot = false;
+}
+
+std::string CPVRRecordingsPath::TrimSlashes(const std::string &strString)
+{
+  std::string strTrimmed(strString);
+  while (!strTrimmed.empty() && strTrimmed.front() == '/')
+    strTrimmed.erase(0, 1);
+
+  while (!strTrimmed.empty() && strTrimmed.back() == '/')
+    strTrimmed.pop_back();
+
+  return strTrimmed;
 }
diff --git a/xbmc/pvr/recordings/PVRRecordingsPath.h b/xbmc/pvr/recordings/PVRRecordingsPath.h
@@ -55,7 +55,7 @@ namespace PVR
     void AppendSegment(const std::string &strSegment);
 
   private:
-    void Init(const std::string &strPath);
+    static std::string TrimSlashes(const std::string &strString);
 
     bool m_bValid;
     bool m_bRoot;