diff --git a/CMakeLists.txt b/CMakeLists.txt index b1fd111..138b75b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,7 @@ add_library(mfapi SHARED mfapi/apicalls/file_get_info.c mfapi/apicalls/user_get_info.c mfapi/apicalls/file_get_links.c + mfapi/apicalls/file_delete.c mfapi/apicalls/user_session.c mfapi/apicalls/folder_get_info.c mfapi/apicalls/folder_create.c @@ -55,6 +56,7 @@ add_executable(mediafire-shell mfshell/commands/pwd.c mfshell/commands/whoami.c mfshell/commands/rmdir.c + mfshell/commands/rm.c mfshell/commands/status.c mfshell/commands/changes.c mfshell/config.c diff --git a/mfapi/apicalls.h b/mfapi/apicalls.h index ddfddda..c9ff7b2 100644 --- a/mfapi/apicalls.h +++ b/mfapi/apicalls.h @@ -76,6 +76,8 @@ int mfconn_api_user_get_session_token(mfconn * conn, int mfconn_api_folder_delete(mfconn * conn, const char *folderkey); +int mfconn_api_file_delete(mfconn * conn, const char *quickkey); + int mfconn_api_device_get_status(mfconn * conn, uint64_t * revision); diff --git a/mfapi/apicalls/file_delete.c b/mfapi/apicalls/file_delete.c new file mode 100644 index 0000000..091b497 --- /dev/null +++ b/mfapi/apicalls/file_delete.c @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2013 Bryan Christ + * 2014 Johannes Schauer + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2, as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include +#include +#include + +#include "../../utils/http.h" +#include "../mfconn.h" +#include "../apicalls.h" // IWYU pragma: keep + +int mfconn_api_file_delete(mfconn * conn, const char *quickkey) +{ + const char *api_call; + int retval; + mfhttp *http; + + if (conn == NULL) + return -1; + + if (quickkey == NULL) + return -1; + + if (strlen(quickkey) != 15) + return -1; + + api_call = mfconn_create_signed_get(conn, 0, "file/delete.php", + "?quick_key=%s&response_format=json", + quickkey); + + http = http_create(); + retval = http_get_buf(http, api_call, NULL, NULL); + http_destroy(http); + + free((void *)api_call); + + return retval; +} diff --git a/mfshell/commands.h b/mfshell/commands.h index c1ce321..8f7536f 100644 --- a/mfshell/commands.h +++ b/mfshell/commands.h @@ -73,6 +73,9 @@ int mfshell_cmd_whoami(mfshell * mfshell, int argc, int mfshell_cmd_rmdir(mfshell * mfshell, int argc, char *const argv[]); +int mfshell_cmd_rm(mfshell * mfshell, int argc, + char *const argv[]); + int mfshell_cmd_status(mfshell * mfshell, int argc, char *const argv[]); diff --git a/mfshell/commands/rm.c b/mfshell/commands/rm.c new file mode 100644 index 0000000..89199d1 --- /dev/null +++ b/mfshell/commands/rm.c @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2013 Bryan Christ + * 2014 Johannes Schauer + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2, as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include +#include + +#include "../../mfapi/apicalls.h" +#include "../mfshell.h" +#include "../../mfapi/mfconn.h" +#include "../commands.h" // IWYU pragma: keep + +int mfshell_cmd_rm(mfshell * mfshell, int argc, char *const argv[]) +{ + int retval; + const char *quickkey; + + if (mfshell == NULL) + return -1; + + if (mfshell->conn == NULL) { + fprintf(stderr, "conn is NULL\n"); + return -1; + } + + if (argc != 2) { + fprintf(stderr, "Invalid number of arguments\n"); + return -1; + } + + quickkey = argv[1]; + if (quickkey == NULL) + return -1; + + // check the lenght of the key + if (strlen(quickkey) != 15) { + return -1; + } + + retval = mfconn_api_file_delete(mfshell->conn, quickkey); + mfconn_update_secret_key(mfshell->conn); + + return retval; +} diff --git a/mfshell/mfshell.c b/mfshell/mfshell.c index 119a1e0..c6b6114 100644 --- a/mfshell/mfshell.c +++ b/mfshell/mfshell.c @@ -53,6 +53,7 @@ struct mfcmd commands[] = { mfshell_cmd_links}, {"get", "[quickkey]", "download a file", mfshell_cmd_get}, {"rmdir", "[folderkey]", "remove directory", mfshell_cmd_rmdir}, + {"rm", "[quickkey]", "remove file", mfshell_cmd_rm}, {"status", "", "device status", mfshell_cmd_status}, {"changes", "", "device changes (default: 0)", mfshell_cmd_changes},