diff --git a/CMakeLists.txt b/CMakeLists.txt index 1dffeed..a46353e 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 mfapi/apicalls/folder_delete.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 mfapi/apicalls/device_get_status.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(mediafire-shell mfshell/main.c mfshell/mfshell.c mfshell/commands/folder.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 mfshell/config.c mfshell/options.c) +add_executable(mediafire-shell mfshell/main.c mfshell/mfshell.c mfshell/commands/folder.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 mfshell/commands/status.c mfshell/config.c mfshell/options.c) set_target_properties(mediafire-shell PROPERTIES COMPILE_FLAGS "-Wall -Wextra -Werror") target_link_libraries(mediafire-shell curl ssl crypto jansson mfapi mfutils) diff --git a/fuse/main.c b/fuse/main.c index 884dbdb..88f7bb4 100644 --- a/fuse/main.c +++ b/fuse/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Bryan Christ + * Copyright (C) 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 diff --git a/mfapi/apicalls.h b/mfapi/apicalls.h index 8bf5a70..ffecf3f 100644 --- a/mfapi/apicalls.h +++ b/mfapi/apicalls.h @@ -55,4 +55,6 @@ int mfconn_api_user_get_session_token(mfconn * conn, int mfconn_api_folder_delete(mfconn * conn, const char *folderkey); +int mfconn_api_device_get_status(mfconn * conn); + #endif diff --git a/mfapi/apicalls/device_get_status.c b/mfapi/apicalls/device_get_status.c new file mode 100644 index 0000000..b0928ec --- /dev/null +++ b/mfapi/apicalls/device_get_status.c @@ -0,0 +1,78 @@ +/* + * 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 "../../utils/json.h" +#include "../mfconn.h" +#include "../apicalls.h" // IWYU pragma: keep + +static int _decode_device_get_status(mfhttp * conn, void *data); + +int mfconn_api_device_get_status(mfconn * conn) +{ + const char *api_call; + int retval; + mfhttp *http; + + // char *rx_buffer; + + if (conn == NULL) + return -1; + + api_call = mfconn_create_signed_get(conn, 0, "device/get_status.php", + "?response_format=json"); + + http = http_create(); + retval = http_get_buf(http, api_call, _decode_device_get_status, NULL); + http_destroy(http); + + free((void *)api_call); + + return retval; +} + +static int _decode_device_get_status(mfhttp * conn, void *data) +{ + json_error_t error; + json_t *root; + json_t *node; + json_t *device_revision; + + if (data != NULL) + return -1; + + root = http_parse_buf_json(conn, 0, &error); + + node = json_object_by_path(root, "response"); + + device_revision = json_object_get(node, "device_revision"); + if (device_revision != NULL) + printf("device_revision: %s\n\r", json_string_value(device_revision)); + + printf("\n\r"); + + if (root != NULL) + json_decref(root); + + return 0; +} diff --git a/mfapi/apicalls/user_get_info.c b/mfapi/apicalls/user_get_info.c index e1937a5..4925135 100644 --- a/mfapi/apicalls/user_get_info.c +++ b/mfapi/apicalls/user_get_info.c @@ -40,7 +40,7 @@ int mfconn_api_user_get_info(mfconn * conn) return -1; api_call = mfconn_create_signed_get(conn, 0, "user/get_info.php", - "&response_format=json"); + "?response_format=json"); http = http_create(); retval = http_get_buf(http, api_call, _decode_user_get_info, NULL); diff --git a/mfshell/commands.h b/mfshell/commands.h index 8a9071a..f1ae324 100644 --- a/mfshell/commands.h +++ b/mfshell/commands.h @@ -73,4 +73,7 @@ int mfshell_cmd_whoami(mfshell * mfshell, int argc, int mfshell_cmd_rmdir(mfshell * mfshell, int argc, char *const argv[]); +int mfshell_cmd_status(mfshell * mfshell, int argc, + char *const argv[]); + #endif diff --git a/mfshell/commands/status.c b/mfshell/commands/status.c new file mode 100644 index 0000000..469dc5e --- /dev/null +++ b/mfshell/commands/status.c @@ -0,0 +1,46 @@ +/* + * 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 "../../mfapi/apicalls.h" +#include "../mfshell.h" +#include "../../mfapi/folder.h" +#include "../../mfapi/mfconn.h" +#include "../commands.h" // IWYU pragma: keep + +int mfshell_cmd_status(mfshell * mfshell, int argc, char *const argv[]) +{ + (void)argv; + int retval; + + if (mfshell == NULL) + return -1; + + if (argc != 1) { + fprintf(stderr, "Invalid number of arguments\n"); + return -1; + } + + // then files + retval = mfconn_api_device_get_status(mfshell->conn); + mfconn_update_secret_key(mfshell->conn); + + return retval; +} diff --git a/mfshell/mfshell.c b/mfshell/mfshell.c index 7b74054..a2f0bc8 100644 --- a/mfshell/mfshell.c +++ b/mfshell/mfshell.c @@ -50,6 +50,7 @@ struct mfcmd commands[] = { mfshell_cmd_links}, {"get", "[quickkey]", "download a file", mfshell_cmd_get}, {"rmdir", "[folderkey]", "remove directory", mfshell_cmd_rmdir}, + {"status", "", "device status", mfshell_cmd_status}, {NULL, NULL, NULL, NULL} };