From e45d0e883db3ac4f042460771a0b22289f1046fb Mon Sep 17 00:00:00 2001 From: josch Date: Sat, 20 Sep 2014 14:37:24 +0200 Subject: [PATCH] add rmdir shell command and folder_delete api call --- CMakeLists.txt | 4 +-- mfapi/apicalls.h | 2 ++ mfapi/apicalls/folder_delete.c | 51 ++++++++++++++++++++++++++++++++ mfshell/commands.h | 2 ++ mfshell/commands/rmdir.c | 54 ++++++++++++++++++++++++++++++++++ mfshell/mfshell.c | 1 + 6 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 mfapi/apicalls/folder_delete.c create mode 100644 mfshell/commands/rmdir.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cb98a8..0f6a42c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,13 +6,13 @@ project(mediafire-tools) # to feed iwyu during tests set(CMAKE_EXPORT_COMPILE_COMMANDS 1) -add_library(mfapi SHARED mfapi/mfconn.c mfapi/file.c mfapi/folder.c mfapi/apicalls/file_get_info.c mfapi/apicalls/user_get_info.c mfapi/apicalls/file_get_links.c mfapi/apicalls/user_session.c mfapi/apicalls/folder_get_info.c mfapi/apicalls/folder_create.c mfapi/apicalls/folder_get_content.c) +add_library(mfapi SHARED mfapi/mfconn.c mfapi/file.c mfapi/folder.c mfapi/apicalls/file_get_info.c mfapi/apicalls/user_get_info.c mfapi/apicalls/file_get_links.c mfapi/apicalls/user_session.c mfapi/apicalls/folder_get_info.c mfapi/apicalls/folder_create.c mfapi/apicalls/folder_get_content.c mfapi/apicalls/folder_delete.c) set_target_properties(mfapi PROPERTIES COMPILE_FLAGS "-Wall -Wextra -Werror") add_library(mfutils SHARED utils/http.c utils/json.c utils/strings.c utils/stringv.c) set_target_properties(mfutils PROPERTIES COMPILE_FLAGS "-Wall -Wextra -Werror") -add_executable(mfshell mfshell/main.c mfshell/mfshell.c mfshell/commands/auth.c mfshell/commands/chdir.c mfshell/commands/debug.c mfshell/commands/file.c mfshell/commands/get.c mfshell/commands/help.c mfshell/commands/host.c mfshell/commands/lcd.c mfshell/commands/links.c mfshell/commands/list.c mfshell/commands/lpwd.c mfshell/commands/mkdir.c mfshell/commands/pwd.c mfshell/commands/whoami.c) +add_executable(mfshell mfshell/main.c mfshell/mfshell.c mfshell/commands/auth.c mfshell/commands/chdir.c mfshell/commands/debug.c mfshell/commands/file.c mfshell/commands/get.c mfshell/commands/help.c mfshell/commands/host.c mfshell/commands/lcd.c mfshell/commands/links.c mfshell/commands/list.c mfshell/commands/lpwd.c mfshell/commands/mkdir.c mfshell/commands/pwd.c mfshell/commands/whoami.c mfshell/commands/rmdir.c) set_target_properties(mfshell PROPERTIES COMPILE_FLAGS "-Wall -Wextra -Werror") target_link_libraries(mfshell curl ssl crypto jansson mfapi mfutils) diff --git a/mfapi/apicalls.h b/mfapi/apicalls.h index 1f474be..935b92d 100644 --- a/mfapi/apicalls.h +++ b/mfapi/apicalls.h @@ -51,4 +51,6 @@ int mfconn_api_user_get_session_token(mfconn * conn, char *server, char **secret_time, char **session_token); +int mfconn_api_folder_delete(mfconn * conn, const char *folderkey); + #endif diff --git a/mfapi/apicalls/folder_delete.c b/mfapi/apicalls/folder_delete.c new file mode 100644 index 0000000..0826e6a --- /dev/null +++ b/mfapi/apicalls/folder_delete.c @@ -0,0 +1,51 @@ +/* + * 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 "../../utils/http.h" +#include "../mfconn.h" +#include "../apicalls.h" // IWYU pragma: keep + +int mfconn_api_folder_delete(mfconn * conn, const char *folderkey) +{ + char *api_call; + int retval; + mfhttp *http; + + if (conn == NULL) + return -1; + + if (folderkey == NULL) + return -1; + + if (strlen(folderkey) != 13) + return -1; + + api_call = mfconn_create_signed_get(conn, 0, "folder/delete.php", + "?folder_key=%s&response_format=json", + folderkey); + + http = http_create(); + retval = http_get_buf(http, api_call, NULL, NULL); + http_destroy(http); + + return retval; +} diff --git a/mfshell/commands.h b/mfshell/commands.h index 4540405..ef3c868 100644 --- a/mfshell/commands.h +++ b/mfshell/commands.h @@ -52,4 +52,6 @@ int mfshell_cmd_get(mfshell * mfshell, int argc, char **argv); int mfshell_cmd_whoami(mfshell * mfshell, int argc, char **argv); +int mfshell_cmd_rmdir(mfshell * mfshell, int argc, char **argv); + #endif diff --git a/mfshell/commands/rmdir.c b/mfshell/commands/rmdir.c new file mode 100644 index 0000000..36cda8a --- /dev/null +++ b/mfshell/commands/rmdir.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 "../../mfapi/apicalls.h" +#include "../mfshell.h" +#include "../../mfapi/mfconn.h" +#include "../commands.h" // IWYU pragma: keep + +int mfshell_cmd_rmdir(mfshell * mfshell, int argc, char **argv) +{ + int retval; + const char *folderkey; + + if (mfshell == NULL) + return -1; + + if (argc != 2) { + fprintf(stderr, "Invalid number of arguments\n"); + return -1; + } + + folderkey = argv[1]; + if (folderkey == NULL) + return -1; + + // check the lenght of the key + if (strlen(folderkey) != 13) { + return -1; + } + + retval = mfconn_api_folder_delete(mfshell->conn, folderkey); + mfconn_update_secret_key(mfshell->conn); + + return retval; +} diff --git a/mfshell/mfshell.c b/mfshell/mfshell.c index f91971f..ef11e84 100644 --- a/mfshell/mfshell.c +++ b/mfshell/mfshell.c @@ -46,6 +46,7 @@ struct mfcmd commands[] = { {"links", "[quickkey]", "show access urls for the file", mfshell_cmd_links}, {"get", "[quickkey]", "download a file", mfshell_cmd_get}, + {"rmdir", "[folderkey]", "remove directory", mfshell_cmd_rmdir}, {NULL, NULL, NULL, NULL} };