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

ClientFile: move client_allow_file() into the Client class

Browse Source
This commit is contained in:
Max Kellermann
2014-02-02 13:59:07 +01:00
parent 8cf4fb53aa
commit a8e52ad89f
7 changed files with 19 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/command/FileCommands.cxx
View File

@@ -22,7 +22,6 @@
#include "CommandError.hxx"
#include "protocol/Ack.hxx"
#include "protocol/Result.hxx"
#include "client/ClientFile.hxx"
#include "client/Client.hxx"
#include "util/CharUtil.hxx"
#include "util/UriUtil.hxx"
@@ -122,7 +121,7 @@ handle_read_comments(Client &client, gcc_unused int argc, char *argv[])
}
Error error;
if (!client_allow_file(client, path_fs, error))
if (!client.AllowFile(path_fs, error))
return print_error(client, error);
} else if (uri_has_scheme(uri)) {
return read_stream_comments(client, uri);

3
src/command/OtherCommands.cxx
View File

@@ -41,7 +41,6 @@
#include "Permission.hxx"
#include "PlaylistFile.hxx"
#include "db/PlaylistVector.hxx"
#include "client/ClientFile.hxx"
#include "client/Client.hxx"
#include "Partition.hxx"
#include "Instance.hxx"
@@ -143,7 +142,7 @@ handle_lsinfo(Client &client, int argc, char *argv[])
}
Error error;
if (!client_allow_file(client, path_fs, error))
if (!client.AllowFile(path_fs, error))
return print_error(client, error);
DetachedSong song(path_utf8);

5
src/command/QueueCommands.cxx
View File

@@ -25,7 +25,6 @@
#include "db/Selection.hxx"
#include "Playlist.hxx"
#include "PlaylistPrint.hxx"
#include "client/ClientFile.hxx"
#include "client/Client.hxx"
#include "Partition.hxx"
#include "protocol/ArgParser.hxx"
@@ -56,7 +55,7 @@ handle_add(Client &client, gcc_unused int argc, char *argv[])
}
Error error;
if (!client_allow_file(client, path_fs, error))
if (!client.AllowFile(path_fs, error))
return print_error(client, error);
result = client.partition.AppendFile(path_utf8);
@@ -104,7 +103,7 @@ handle_addid(Client &client, int argc, char *argv[])
}
Error error;
if (!client_allow_file(client, path_fs, error))
if (!client.AllowFile(path_fs, error))
return print_error(client, error);
result = client.partition.AppendFile(path_utf8, &added_id);