aboutsummaryrefslogtreecommitdiffstats
path: root/src/db/UpnpDatabasePlugin.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-01-23 00:17:38 +0100
committerMax Kellermann <max@duempel.org>2014-01-23 00:17:38 +0100
commit77070f5ab9f5e6391cbc34aebc473da264a79dc3 (patch)
treebacf3904e0ad76c354c6470caf60c9c4ae80a58e /src/db/UpnpDatabasePlugin.cxx
parent8d5f7160ac2eedc03c298223a1d32284e4889e91 (diff)
downloadmpd-77070f5ab9f5e6391cbc34aebc473da264a79dc3.tar.gz
mpd-77070f5ab9f5e6391cbc34aebc473da264a79dc3.tar.xz
mpd-77070f5ab9f5e6391cbc34aebc473da264a79dc3.zip
db/upnp: move code to VisitItem()
Diffstat (limited to '')
-rw-r--r--src/db/UpnpDatabasePlugin.cxx117
1 files changed, 56 insertions, 61 deletions
diff --git a/src/db/UpnpDatabasePlugin.cxx b/src/db/UpnpDatabasePlugin.cxx
index b6a1456c3..74782a4c6 100644
--- a/src/db/UpnpDatabasePlugin.cxx
+++ b/src/db/UpnpDatabasePlugin.cxx
@@ -518,6 +518,51 @@ UpnpDatabase::Namei(const ContentDirectoryService &server,
}
}
+static bool
+VisitItem(const UPnPDirObject &object, const char *uri,
+ const DatabaseSelection &selection,
+ VisitSong visit_song, VisitPlaylist visit_playlist,
+ Error &error)
+{
+ assert(object.type == UPnPDirObject::Type::ITEM);
+
+ switch (object.item_class) {
+ case UPnPDirObject::ItemClass::MUSIC:
+ return !visit_song ||
+ visitSong(object, uri,
+ selection, visit_song, error);
+
+ case UPnPDirObject::ItemClass::PLAYLIST:
+ if (visit_playlist) {
+ /* Note: I've yet to see a
+ playlist item (playlists
+ seem to be usually handled
+ as containers, so I'll
+ decide what to do when I
+ see one... */
+ }
+
+ return true;
+
+ case UPnPDirObject::ItemClass::UNKNOWN:
+ return true;
+ }
+
+ assert(false);
+ gcc_unreachable();
+}
+
+static bool
+VisitItem(const UPnPDirObject &object, const std::string &uri,
+ const DatabaseSelection &selection,
+ VisitSong visit_song, VisitPlaylist visit_playlist,
+ Error &error)
+{
+ return VisitItem(object, uri.c_str(),
+ selection, visit_song, visit_playlist,
+ error);
+}
+
// vpath is a parsed and writeable version of selection.uri. There is
// really just one path parameter.
bool
@@ -572,31 +617,10 @@ UpnpDatabase::VisitServer(const ContentDirectoryService &server,
: selection.uri.c_str();
if (tdirent.type == UPnPDirObject::Type::ITEM) {
- // Target is a song. Not too sure we ever get there actually, maybe
- // this is always catched by the special uri test above.
- switch (tdirent.item_class) {
- case UPnPDirObject::ItemClass::MUSIC:
- if (visit_song)
- return visitSong(std::move(tdirent),
- base_uri,
- selection, visit_song,
- error);
- break;
-
- case UPnPDirObject::ItemClass::PLAYLIST:
- if (visit_playlist) {
- /* Note: I've yet to see a playlist
- item (playlists seem to be usually
- handled as containers, so I'll decide
- what to do when I see one... */
- }
- break;
-
- case UPnPDirObject::ItemClass::UNKNOWN:
- break;
- }
-
- return true;
+ return VisitItem(tdirent, base_uri,
+ selection,
+ visit_song, visit_playlist,
+ error);
}
/* Target was a a container. Visit it. We could read slices
@@ -625,42 +649,13 @@ UpnpDatabase::VisitServer(const ContentDirectoryService &server,
break;
case UPnPDirObject::Type::ITEM:
- switch (dirent.item_class) {
- case UPnPDirObject::ItemClass::MUSIC:
- if (visit_song) {
- /* We identify songs by giving
- them a special path. The Id
- is enough to fetch them
- from the server anyway. */
-
- std::string p;
- if (!selection.recursive)
- p = PathTraitsUTF8::Build(base_uri,
- dirent.name.c_str());
-
- if (!visitSong(std::move(dirent),
- p.c_str(),
- selection, visit_song, error))
- return false;
- }
-
- break;
-
- case UPnPDirObject::ItemClass::PLAYLIST:
- if (visit_playlist) {
- /* Note: I've yet to see a
- playlist item (playlists
- seem to be usually handled
- as containers, so I'll
- decide what to do when I
- see one... */
- }
-
- break;
-
- case UPnPDirObject::ItemClass::UNKNOWN:
- break;
- }
+ if (!VisitItem(dirent,
+ PathTraitsUTF8::Build(base_uri,
+ dirent.name.c_str()),
+ selection,
+ visit_song, visit_playlist,
+ error))
+ return false;
}
}