oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/upnp: fix "upnp:class" parser

Browse Source 
"upnp:class" is an element, not an attribute of element "item".  This
fixes a regression from commit 65ebfb16
This commit is contained in:
Max Kellermann
2014-01-13 22:23:00 +01:00
parent 56a7fcf189
commit 85324f80fe
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/db/upnp/Directory.cxx
View File

@@ -104,12 +104,6 @@ protected:
const char *pid = GetAttribute(attrs, "parentID"); const char *pid = GetAttribute(attrs, "parentID");
if (pid != nullptr) if (pid != nullptr)
m_tobj.m_pid = pid; m_tobj.m_pid = pid;
const char *item_class_name =
GetAttribute(attrs, "upnp:class");
if (item_class_name != nullptr)
m_tobj.item_class =
ParseItemClass(item_class_name);
} }
break; break;
@@ -132,7 +126,8 @@ protected:
bool checkobjok() { bool checkobjok() {
if (m_tobj.m_id.empty() || m_tobj.m_pid.empty() || if (m_tobj.m_id.empty() || m_tobj.m_pid.empty() ||
m_tobj.m_title.empty() || m_tobj.m_title.empty() ||
m_tobj.item_class == UPnPDirObject::ItemClass::UNKNOWN) (m_tobj.type == UPnPDirObject::Type::ITEM &&
m_tobj.item_class == UPnPDirObject::ItemClass::UNKNOWN))
return false; return false;
return true; return true;
@@ -168,6 +163,11 @@ protected:
} }
break; break;
case 'u': case 'u':
if (m_path.back() == "upnp:class") {
m_tobj.item_class = ParseItemClass(str.c_str());
break;
}
for (auto i = upnptags; *i != nullptr; ++i) for (auto i = upnptags; *i != nullptr; ++i)
if (!m_path.back().compare(*i)) if (!m_path.back().compare(*i))
m_tobj.m_props[*i] += str; m_tobj.m_props[*i] += str;