github/recorder
1
0
Fork 0
mirror of https://github.com/owntracks/recorder.git synced 2026-08-27 16:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

killdata now returns JSON object with error-reasons

Browse Source
This commit is contained in:
Jan-Piet Mens
2015-08-23 15:43:18 +02:00
parent c02a80f276
commit 2cf4850ecf
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ocat.c
+13 -4
View File
@@ -191,7 +191,7 @@ int main(int argc, char **argv)
argv += (optind);
if (killdata) {
JsonNode *killed, *f;
JsonNode *obj; //, *killed, *f;
if (!username || !device) {
fprintf(stderr, "%s: killdata requires username and device\n", progname);
@@ -199,9 +199,18 @@ int main(int argc, char **argv)
}
fprintf(stderr, "Storage deleted these files:\n");
killed = kill_datastore(username, device);
json_foreach(f, killed) {
fprintf(stderr, " %s\n", f->string_);
if ((obj = kill_datastore(username, device)) != NULL) {
char *js;
// if ((killed = json_find_member(obj, "results")) != NULL) { // get array
// json_foreach(f, killed) {
// fprintf(stderr, " %s\n", f->string_);
// }
// }
js = json_stringify(obj, " ");
puts(js);
free(js);
json_delete(obj);
}
return (0);
}
storage.c
+14 -7
View File
@@ -484,7 +484,8 @@ JsonNode *geo_json(JsonNode *location_array)
}
/*
* Remove all data for a user's device. Return a JSON array of deleted files.
* Remove all data for a user's device. Return a JSON object with a status
* and an array of deleted files.
*/
static int kill_datastore_filter(const struct dirent *d)
@@ -495,7 +496,7 @@ static int kill_datastore_filter(const struct dirent *d)
JsonNode *kill_datastore(char *user, char *device)
{
static UT_string *path = NULL, *fname = NULL;
JsonNode *killed = json_mkarray();
JsonNode *obj = json_mkobject(), *killed = json_mkarray();
char *bp;
struct dirent **namelist;
int i, n;
@@ -504,7 +505,7 @@ JsonNode *kill_datastore(char *user, char *device)
utstring_renew(fname);
if (!user || !*user || !device || !*device)
return (killed);
return (obj);
for (bp = user; bp && *bp; bp++) {
if (isupper(*bp))
@@ -516,10 +517,13 @@ JsonNode *kill_datastore(char *user, char *device)
}
utstring_printf(path, "%s/rec/%s/%s", STORAGEDIR, user, device);
json_append_member(obj, "path", json_mkstring(utstring_body(path)));
if ((n = scandir(utstring_body(path), &namelist, kill_datastore_filter, NULL)) < 0) {
perror(utstring_body(path));
return (killed);
json_append_member(obj, "status", json_mkstring("ERROR"));
json_append_member(obj, "error", json_mkstring(strerror(errno)));
json_append_member(obj, "reason", json_mkstring("cannot scandir"));
return (obj);
}
for (i = 0; i < n; i++) {
@@ -539,9 +543,12 @@ JsonNode *kill_datastore(char *user, char *device)
}
free(namelist);
json_append_member(obj, "status", json_mkstring("OK"));
if (rmdir(utstring_body(path)) != 0) {
perror(utstring_body(path));
json_append_member(obj, "status", json_mkstring("ERROR"));
json_append_member(obj, "error", json_mkstring( strerror(errno)));
}
return (killed);
json_append_member(obj, "killed", killed);
return (obj);
}