diff options
Diffstat (limited to 'src/SongPrint.cxx')
| -rw-r--r-- | src/SongPrint.cxx | 92 |
1 files changed, 73 insertions, 19 deletions
diff --git a/src/SongPrint.cxx b/src/SongPrint.cxx index ea164d02b..c2501d037 100644 --- a/src/SongPrint.cxx +++ b/src/SongPrint.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2013 The Music Player Daemon Project + * Copyright (C) 2003-2014 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -19,35 +19,61 @@ #include "config.h" #include "SongPrint.hxx" -#include "Song.hxx" -#include "Directory.hxx" +#include "db/LightSong.hxx" +#include "storage/StorageInterface.hxx" +#include "DetachedSong.hxx" #include "TimePrint.hxx" #include "TagPrint.hxx" -#include "Mapper.hxx" -#include "Client.hxx" +#include "client/Client.hxx" #include "util/UriUtil.hxx" -void -song_print_uri(Client &client, const Song &song) +#define SONG_FILE "file: " + +static void +song_print_uri(Client &client, const char *uri, bool base) { - if (song.IsInDatabase() && !song.parent->IsRoot()) { - client_printf(client, "%s%s/%s\n", SONG_FILE, - song.parent->GetPath(), song.uri); + std::string allocated; + + if (base) { + uri = PathTraitsUTF8::GetBase(uri); } else { - const char *uri = song.uri; - const std::string allocated = uri_remove_auth(uri); +#ifdef ENABLE_DATABASE + const Storage *storage = client.GetStorage(); + if (storage != nullptr) { + const char *suffix = storage->MapToRelativeUTF8(uri); + if (suffix != nullptr) + uri = suffix; + } +#endif + + allocated = uri_remove_auth(uri); if (!allocated.empty()) uri = allocated.c_str(); - - client_printf(client, "%s%s\n", SONG_FILE, - map_to_relative_path(uri)); } + + client_printf(client, "%s%s\n", SONG_FILE, uri); } void -song_print_info(Client &client, const Song &song) +song_print_uri(Client &client, const LightSong &song, bool base) { - song_print_uri(client, song); + if (!base && song.directory != nullptr) { + client_printf(client, "%s%s/%s\n", SONG_FILE, + song.directory, song.uri); + } else + song_print_uri(client, song.uri, base); +} + +void +song_print_uri(Client &client, const DetachedSong &song, bool base) +{ + song_print_uri(client, song.GetURI(), base); +} + +void +song_print_info(Client &client, const LightSong &song, bool base) +{ + song_print_uri(client, song, base); if (song.end_ms > 0) client_printf(client, "Range: %u.%03u-%u.%03u\n", @@ -63,6 +89,34 @@ song_print_info(Client &client, const Song &song) if (song.mtime > 0) time_print(client, "Last-Modified", song.mtime); - if (song.tag != nullptr) - tag_print(client, *song.tag); + tag_print(client, *song.tag); +} + +void +song_print_info(Client &client, const DetachedSong &song, bool base) +{ + song_print_uri(client, song, base); + + const unsigned start_ms = song.GetStartMS(); + const unsigned end_ms = song.GetEndMS(); + + if (end_ms > 0) + client_printf(client, "Range: %u.%03u-%u.%03u\n", + start_ms / 1000, + start_ms % 1000, + end_ms / 1000, + end_ms % 1000); + else if (start_ms > 0) + client_printf(client, "Range: %u.%03u-\n", + start_ms / 1000, + start_ms % 1000); + + if (song.GetLastModified() > 0) + time_print(client, "Last-Modified", song.GetLastModified()); + + tag_print_values(client, song.GetTag()); + + double duration = song.GetDuration(); + if (duration >= 0) + client_printf(client, "Time: %u\n", unsigned(duration + 0.5)); } |