mfshell: add changes command, mfapi: add device/get_changes

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 mfapi/apicalls/device_get_status.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 mfapi/apicalls/device_get_changes.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/commands/status.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/commands/changes.c mfshell/config.c mfshell/options.c)
 set_target_properties(mediafire-shell PROPERTIES COMPILE_FLAGS "-Wall -Wextra -Werror")
 set_target_properties(mediafire-shell PROPERTIES LINK_FLAGS "-Wl,--no-as-needed")
 target_link_libraries(mediafire-shell curl ssl crypto jansson mfapi mfutils)

mfapi/apicalls.h

@@ -55,6 +55,8 @@ 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);
+int             mfconn_api_device_get_status(mfconn * conn, uint64_t *revision);
+
+int             mfconn_api_device_get_changes(mfconn * conn, uint64_t revision);
 
 #endif

mfapi/apicalls/device_get_changes.c

@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2013 Bryan Christ <bryan.christ@mediafire.com>
+ *               2014 Johannes Schauer <j.schauer@email.de>
+ *
+ * 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 <jansson.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+
+#include "../../utils/http.h"
+#include "../../utils/json.h"
+#include "../../utils/strings.h"
+#include "../folder.h"
+#include "../mfconn.h"
+#include "../apicalls.h"        // IWYU pragma: keep
+
+static int      _decode_device_get_changes(mfhttp * conn, void *data);
+
+int mfconn_api_device_get_changes(mfconn * conn, uint64_t revision)
+{
+    const char     *api_call;
+    int             retval;
+    mfhttp         *http;
+
+    if (conn == NULL)
+        return -1;
+
+    api_call = mfconn_create_signed_get(conn, 0, "device/get_changes.php",
+                                        "?revision=%" PRIu64
+                                        "&response_format=json", revision);
+
+    http = http_create();
+    retval = http_get_buf(http, api_call, _decode_device_get_changes, NULL);
+    http_destroy(http);
+
+    free((void *)api_call);
+
+    return retval;
+}
+
+static int _decode_device_get_changes(mfhttp * conn, void *user_ptr)
+{
+    json_error_t    error;
+    json_t         *root;
+    json_t         *node;
+    json_t         *data;
+
+    json_t         *obj_array;
+    json_t         *key;
+    json_t         *parent;
+    json_t         *revision;
+
+    int             array_sz;
+    int             i = 0;
+
+    if (user_ptr != NULL)
+        return -1;
+
+    root = http_parse_buf_json(conn, 0, &error);
+
+    node = json_object_by_path(root, "response/updated");
+
+    obj_array = json_object_get(node, "files");
+    if (json_is_array(obj_array)) {
+        array_sz = json_array_size(obj_array);
+        printf("updated files:\n");
+        for (i = 0; i < array_sz; i++) {
+            data = json_array_get(obj_array, i);
+
+            if (json_is_object(data)) {
+                key = json_object_get(data, "quickkey");
+                parent = json_object_get(data, "parent_folderkey");
+                revision = json_object_get(data, "revision");
+
+                printf("   %s   %s    %s\n\r", json_string_value(key),
+                        json_string_value(parent), json_string_value(revision));
+            }
+        }
+        printf("\n");
+    }
+
+    node = json_object_by_path(root, "response/updated");
+
+    obj_array = json_object_get(node, "folders");
+    if (json_is_array(obj_array)) {
+        array_sz = json_array_size(obj_array);
+        printf("updated folders:\n");
+        for (i = 0; i < array_sz; i++) {
+            data = json_array_get(obj_array, i);
+
+            if (json_is_object(data)) {
+                key = json_object_get(data, "folderkey");
+                parent = json_object_get(data, "parent_folderkey");
+                revision = json_object_get(data, "revision");
+
+                printf("   %s   %s    %s\n\r", json_string_value(key),
+                        json_string_value(parent), json_string_value(revision));
+            }
+        }
+        printf("\n");
+    }
+
+    node = json_object_by_path(root, "response/deleted");
+
+    obj_array = json_object_get(node, "files");
+    if (json_is_array(obj_array)) {
+        array_sz = json_array_size(obj_array);
+        printf("deleted files:\n");
+        for (i = 0; i < array_sz; i++) {
+            data = json_array_get(obj_array, i);
+
+            if (json_is_object(data)) {
+                key = json_object_get(data, "quickkey");
+                parent = json_object_get(data, "parent_folderkey");
+                revision = json_object_get(data, "revision");
+
+                printf("   %s   %s    %s\n\r", json_string_value(key),
+                        json_string_value(parent), json_string_value(revision));
+            }
+        }
+        printf("\n");
+    }
+
+    node = json_object_by_path(root, "response/deleted");
+
+    obj_array = json_object_get(node, "folders");
+    if (json_is_array(obj_array)) {
+        array_sz = json_array_size(obj_array);
+        printf("deleted folders:\n");
+        for (i = 0; i < array_sz; i++) {
+            data = json_array_get(obj_array, i);
+
+            if (json_is_object(data)) {
+                key = json_object_get(data, "folderkey");
+                parent = json_object_get(data, "parent_folderkey");
+                revision = json_object_get(data, "revision");
+
+                printf("   %s   %s    %s\n\r", json_string_value(key),
+                        json_string_value(parent), json_string_value(revision));
+            }
+        }
+        printf("\n");
+    }
+
+    if (root != NULL)
+        json_decref(root);
+
+    return 0;
+}

mfapi/apicalls/device_get_status.c

@@ -28,7 +28,7 @@
 
 static int      _decode_device_get_status(mfhttp * conn, void *data);
 
-int mfconn_api_device_get_status(mfconn * conn)
+int mfconn_api_device_get_status(mfconn * conn, uint64_t *revision)
 {
     const char     *api_call;
     int             retval;
@@ -43,7 +43,7 @@ int mfconn_api_device_get_status(mfconn * conn)
                                         "?response_format=json");
 
     http = http_create();
-    retval = http_get_buf(http, api_call, _decode_device_get_status, NULL);
+    retval = http_get_buf(http, api_call, _decode_device_get_status, (void *)revision);
     http_destroy(http);
 
     free((void *)api_call);
@@ -57,8 +57,10 @@ static int _decode_device_get_status(mfhttp * conn, void *data)
     json_t         *root;
     json_t         *node;
     json_t         *device_revision;
+    uint64_t       *revision;
 
-    if (data != NULL)
+    revision = (uint64_t*)data;
+    if (data == NULL)
         return -1;
 
     root = http_parse_buf_json(conn, 0, &error);
@@ -66,10 +68,10 @@ static int _decode_device_get_status(mfhttp * conn, void *data)
     node = json_object_by_path(root, "response");
 
     device_revision = json_object_get(node, "device_revision");
-    if (device_revision != NULL)
+    if (device_revision != NULL) {
-        printf("device_revision: %s\n\r", json_string_value(device_revision));
+        fprintf(stderr, "device_revision: %s\n", json_string_value(device_revision));
-
+        *revision = atoll(json_string_value(device_revision));
-    printf("\n\r");
+    }
 
     if (root != NULL)
         json_decref(root);

mfshell/commands.h

@@ -76,4 +76,7 @@ int             mfshell_cmd_rmdir(mfshell * mfshell, int argc,
 int             mfshell_cmd_status(mfshell * mfshell, int argc,
                                    char *const argv[]);
 
+int             mfshell_cmd_changes(mfshell * mfshell, int argc,
+                                    char *const argv[]);
+
 #endif

mfshell/commands/changes.c

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2013 Bryan Christ <bryan.christ@mediafire.com>
+ *               2014 Johannes Schauer <j.schauer@email.de>
+ *
+ * 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 <stdio.h>
+#include <stdlib.h>
+
+#include "../../mfapi/apicalls.h"
+#include "../mfshell.h"
+#include "../../mfapi/mfconn.h"
+#include "../commands.h"        // IWYU pragma: keep
+
+int mfshell_cmd_changes(mfshell * mfshell, int argc, char *const argv[])
+{
+    (void)argv;
+    int             retval;
+    uint64_t        revision;
+
+    if (mfshell == NULL)
+        return -1;
+
+    switch (argc) {
+        case 1:
+            revision = 0;
+            break;
+        case 2:
+            revision = atoll(argv[1]);
+            break;
+        default:
+            fprintf(stderr, "Invalid number of arguments\n");
+            return -1;
+    }
+
+    retval = mfconn_api_device_get_changes(mfshell->conn, revision);
+    mfconn_update_secret_key(mfshell->conn);
+
+    return retval;
+}

mfshell/mfshell.c

@@ -51,6 +51,7 @@ struct mfcmd    commands[] = {
     {"get", "[quickkey]", "download a file", mfshell_cmd_get},
     {"rmdir", "[folderkey]", "remove directory", mfshell_cmd_rmdir},
     {"status", "", "device status", mfshell_cmd_status},
+    {"changes", "<revision>", "device changes (default: 0)", mfshell_cmd_changes},
     {NULL, NULL, NULL, NULL}
 };