mfshell: add new folder command

mfapi/apicalls/folder_get_info.c

@@ -17,10 +17,12 @@
  *
  */
 
+#define _XOPEN_SOURCE // for strptime
 #include <jansson.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "../../utils/http.h"
 #include "../../utils/json.h"
@@ -74,9 +76,14 @@ static int _decode_folder_get_info(mfhttp * conn, void *data)
     json_t         *node;
     json_t         *folderkey;
     json_t         *folder_name;
+    json_t         *revision;
+    json_t         *epoch;
+    json_t         *created;
     json_t         *parent_folder;
     int             retval = 0;
     mffolder       *folder;
+    char           *ret;
+    struct tm       tm;
 
     if (data == NULL)
         return -1;
@@ -103,6 +110,27 @@ static int _decode_folder_get_info(mfhttp * conn, void *data)
     if (parent_folder == NULL && folderkey != NULL)
         folder_set_parent(folder, NULL);
 
+    revision = json_object_get(node, "revision");
+    if (revision != NULL) {
+        folder_set_revision(folder, atol(json_string_value(revision)));
+    }
+
+    epoch = json_object_get(node, "epoch");
+    if (epoch != NULL) {
+        folder_set_epoch(folder, atol(json_string_value(epoch)));
+    }
+
+    created = json_object_get(node, "created");
+    if (created != NULL) {
+        memset(&tm, 0, sizeof(struct tm));
+        ret = strptime(json_string_value(created), "%F %T", &tm);
+        if (ret[0] != '\0') {
+            fprintf(stderr, "cannot parse time\n");
+        } else {
+            folder_set_created(folder, mktime(&tm));
+        }
+    }
+
     if (folderkey == NULL)
         retval = -1;
 

mfapi/folder.c

@@ -30,6 +30,8 @@ struct mffolder {
     uint64_t        revision;
     uint32_t        folder_count;
     uint32_t        file_count;
+    time_t          epoch;
+    time_t          created;
 };
 
 mffolder       *folder_alloc(void)
@@ -131,3 +133,54 @@ const char     *folder_get_name(mffolder * folder)
 
     return folder->name;
 }
+
+int folder_set_revision(mffolder * folder, uint64_t revision)
+{
+    if (folder == NULL)
+        return -1;
+
+    folder->revision = revision;
+    return 0;
+}
+
+uint64_t folder_get_revision(mffolder * folder)
+{
+    if (folder == NULL)
+        return -1;
+
+    return folder->revision;
+}
+
+int folder_set_epoch(mffolder * folder, time_t epoch)
+{
+    if (folder == NULL)
+        return -1;
+
+    folder->epoch = epoch;
+    return 0;
+}
+
+time_t folder_get_epoch(mffolder * folder)
+{
+    if (folder == NULL)
+        return -1;
+
+    return folder->epoch;
+}
+
+int folder_set_created(mffolder * folder, time_t created)
+{
+    if (folder == NULL)
+        return -1;
+
+    folder->created = created;
+    return 0;
+}
+
+time_t folder_get_created(mffolder * folder)
+{
+    if (folder == NULL)
+        return -1;
+
+    return folder->created;
+}

mfapi/folder.h

@@ -20,6 +20,9 @@
 #ifndef __MFAPI_FOLDER_H__
 #define __MFAPI_FOLDER_H__
 
+#include <stdint.h>
+#include <time.h>
+
 typedef struct mffolder mffolder;
 
 mffolder       *folder_alloc(void);
@@ -38,4 +41,16 @@ int             folder_set_name(mffolder * folder, const char *name);
 
 const char     *folder_get_name(mffolder * folder);
 
+int             folder_set_revision(mffolder * folder, uint64_t revision);
+
+uint64_t        folder_get_revision(mffolder * folder);
+
+int             folder_set_epoch(mffolder * folder, time_t epoch);
+
+time_t          folder_get_epoch(mffolder * folder);
+
+int             folder_set_created(mffolder * folder, time_t created);
+
+time_t          folder_get_created(mffolder * folder);
+
 #endif