aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/db/UpnpDatabasePlugin.cxx24
-rw-r--r--src/db/upnp/Directory.cxx23
-rw-r--r--src/db/upnp/Object.hxx10
3 files changed, 33 insertions, 24 deletions
diff --git a/src/db/UpnpDatabasePlugin.cxx b/src/db/UpnpDatabasePlugin.cxx
index ca7bebc0e..258122200 100644
--- a/src/db/UpnpDatabasePlugin.cxx
+++ b/src/db/UpnpDatabasePlugin.cxx
@@ -40,7 +40,6 @@
#include "Log.hxx"
#include "SongFilter.hxx"
-#include <algorithm>
#include <string>
#include <vector>
#include <map>
@@ -210,19 +209,6 @@ UpnpDatabase::ReturnSong(Song *song) const
song->Free();
}
-/**
- * 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;
-}
-
// If uri is empty, we use the object's url instead. This happens
// when the target of a Visit() is a song, which only happens when
// "add"ing AFAIK. Visit() calls us with a null uri so that the url
@@ -528,7 +514,7 @@ UpnpDatabase::BuildPath(ContentDirectoryService *server,
if (!ReadNode(server, pid, dirent, error))
return false;
pid = dirent.m_pid.c_str();
- path = titleToPathElt(dirent.m_title) + (path.empty()? "" : "/" + path);
+ path = dirent.name + (path.empty()? "" : "/" + path);
}
path = std::string(server->getFriendlyName()) + "/" + path;
return true;
@@ -563,7 +549,7 @@ UpnpDatabase::Namei(ContentDirectoryService* server,
// Look for the name in the sub-container list
for (auto& dirent : dirbuf.m_containers) {
- if (!vpath[i].compare(titleToPathElt(dirent.m_title))) {
+ if (!vpath[i].compare(dirent.name)) {
objid = dirent.m_id; // Next readdir target
found = true;
if (i == vpath.size() - 1) {
@@ -581,7 +567,7 @@ UpnpDatabase::Namei(ContentDirectoryService* server,
// Path elt was not a container, look at the items list
for (auto& dirent : dirbuf.m_items) {
- if (!vpath[i].compare(titleToPathElt(dirent.m_title))) {
+ if (!vpath[i].compare(dirent.name)) {
// If this is the last path elt, we found the target,
// else it does not exist
if (i == vpath.size() - 1) {
@@ -689,7 +675,7 @@ UpnpDatabase::VisitServer(ContentDirectoryService* server,
if (visit_directory) {
for (auto& dirent : dirbuf.m_containers) {
Directory d((selection.uri + "/" +
- titleToPathElt(dirent.m_title)).c_str(),
+ dirent.name).c_str(),
m_root);
if (!visit_directory(d, error))
return false;
@@ -709,7 +695,7 @@ UpnpDatabase::VisitServer(ContentDirectoryService* server,
std::string p;
if (!selection.recursive)
p = selection.uri + "/" +
- titleToPathElt(dirent.m_title);
+ dirent.name;
if (!visitSong(dirent, p.c_str(),
selection, visit_song, error))
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")) {
diff --git a/src/db/upnp/Object.hxx b/src/db/upnp/Object.hxx
index d158ab6f7..1346c15d4 100644
--- a/src/db/upnp/Object.hxx
+++ b/src/db/upnp/Object.hxx
@@ -52,6 +52,12 @@ public:
std::string m_id; // ObjectId
std::string m_pid; // Parent ObjectId
std::string url;
+
+ /**
+ * A copy of "dc:title" sanitized as a file name.
+ */
+ std::string name;
+
std::string m_title; // dc:title. Directory name for a container.
Type type;
ItemClass item_class;
@@ -71,8 +77,8 @@ public:
* @param[out] value
* @return true if found.
*/
- const char *getprop(const char *name) const {
- auto it = m_props.find(name);
+ const char *getprop(const char *_name) const {
+ auto it = m_props.find(_name);
if (it == m_props.end())
return nullptr;
return it->second.c_str();