db/upnp/Object: add attribute "name"

Call titleToPathElt() only once for each object.

1 files changed, 20 insertions, 3 deletions

diff --git a/src/db/upnp/Directory.cxx b/src/db/upnp/Directory.cxx
index 3b75eceda..ba759837d 100644
--- a/src/db/upnp/Directory.cxx
+++ b/src/db/upnp/Directory.cxx
@@ -22,6 +22,7 @@
 #include "Util.hxx"
 #include "Expat.hxx"
 
+#include <algorithm>
 #include <string>
 #include <vector>
 
@@ -58,6 +59,19 @@ ParseDuration(const std::string &duration)
 }
 
 /**
+ * Transform titles to turn '/' into '_' to make them acceptable path
+ * elements. There is a very slight risk of collision in doing
+ * this. Twonky returns directory names (titles) like 'Artist/Album'.
+ */
+gcc_pure
+static std::string
+titleToPathElt(std::string s)
+{
+	std::replace(s.begin(), s.end(), '/', '_');
+	return s;
+}
+
+/**
  * An XML parser which builds directory contents from DIDL lite input.
  */
 class UPnPDirParser final : public CommonExpatParser {
@@ -125,7 +139,7 @@ protected:
 
 	bool checkobjok() {
 		if (m_tobj.m_id.empty() || m_tobj.m_pid.empty() ||
-		    m_tobj.m_title.empty() ||
+		    m_tobj.name.empty() ||
 		    (m_tobj.type == UPnPDirObject::Type::ITEM &&
 		     m_tobj.item_class == UPnPDirObject::ItemClass::UNKNOWN))
 			return false;
@@ -154,8 +168,11 @@ protected:
 		trimstring(str);
 		switch (m_path.back()[0]) {
 		case 'd':
-			if (!m_path.back().compare("dc:title"))
-				m_tobj.m_title += str;
+			if (!m_path.back().compare("dc:title")) {
+				m_tobj.m_title = str;
+				m_tobj.name = titleToPathElt(str);
+			}
+
 			break;
 		case 'r':
 			if (!m_path.back().compare("res")) {