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

command/{Queue,File}Commands: drop "file:///" prefix for absolute paths

Browse Source 
Requiring this prefix makes the client's intention very clear, but it
was too hard to understand why this prefix was needed.  Initially, my
intention was to differentiate from broken clients which prefix relate
URIs with a slash; once MPD allowed that.  In the past few years
however, MPD has disallowed that, and there was no significant
breakage (except for the "add /" special case which some clients
apparently still do).  So I figure it's about time to define that an
URI that begins with a slash points to an arbitrary file on the file
system.
This commit is contained in:
Max Kellermann
2015-02-09 07:55:06 +01:00
parent 60e6d1d61b
commit 676dfabc91
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/command/FileCommands.cxx
View File

@@ -202,11 +202,22 @@ read_file_comments(Client &client, const Path path_fs)
}
static const char *
translate_uri(const char *uri)
{
if (memcmp(uri, "file:///", 8) == 0)
/* drop the "file://", leave only an absolute path
(starting with a slash) */
return uri + 7;
return uri;
}
CommandResult
handle_read_comments(Client &client, ConstBuffer<const char *> args)
{
assert(args.size == 1);
const char *const uri = args.front();
const char *const uri = translate_uri(args.front());
if (memcmp(uri, "file:///", 8) == 0) {
/* read comments from arbitrary local file */

15
src/command/QueueCommands.cxx
View File

@@ -43,18 +43,13 @@
#include <string.h>
static const char *
translate_uri(Client &client, const char *uri)
translate_uri(const char *uri)
{
if (memcmp(uri, "file:///", 8) == 0)
/* drop the "file://", leave only an absolute path
(starting with a slash) */
return uri + 7;
if (PathTraitsUTF8::IsAbsolute(uri)) {
command_error(client, ACK_ERROR_NO_EXIST, "Malformed URI");
return nullptr;
}
return uri;
}
@@ -70,9 +65,7 @@ handle_add(Client &client, ConstBuffer<const char *> args)
here */
uri = "";
uri = translate_uri(client, uri);
if (uri == nullptr)
return CommandResult::ERROR;
uri = translate_uri(uri);
if (uri_has_scheme(uri) || PathTraitsUTF8::IsAbsolute(uri)) {
const SongLoader loader(client);
@@ -101,9 +94,7 @@ handle_add(Client &client, ConstBuffer<const char *> args)
CommandResult
handle_addid(Client &client, ConstBuffer<const char *> args)
{
const char *const uri = translate_uri(client, args.front());
if (uri == nullptr)
return CommandResult::ERROR;
const char *const uri = translate_uri(args.front());
const SongLoader loader(client);
Error error;