ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-07 02:56:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add 'service' column to "rhizome list" output

Browse Source
This commit is contained in:
Andrew Bettison 2012-05-17 16:30:30 +09:30
parent 9a51c76dfb
commit 5e11067c72
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rhizome_database.c
View File

@ -574,7 +574,8 @@ int rhizome_list_manifests(const char *service, const char *sender_sid, const ch
ret = WHY(sqlite3_errmsg(rhizome_db));
} else {
size_t rows = 0;
cli_puts("7"); cli_delim("\n"); // number of columns
cli_puts("8"); cli_delim("\n"); // number of columns
cli_puts("service"); cli_delim(":");
cli_puts("fileid"); cli_delim(":");
cli_puts("manifestid"); cli_delim(":");
cli_puts("version"); cli_delim(":");
@ -598,15 +599,19 @@ int rhizome_list_manifests(const char *service, const char *sender_sid, const ch
const char *manifestblob = (char *) sqlite3_column_blob(statement, 3);
size_t manifestblobsize = sqlite3_column_bytes(statement, 3); // must call after sqlite3_column_blob()
rhizome_manifest *m = rhizome_read_manifest_file(manifestblob, manifestblobsize, 0);
const char *name = rhizome_manifest_get(m, "name", NULL, 0);
long long date = rhizome_manifest_get_ll(m, "date");
cli_puts((const char *)sqlite3_column_text(statement, 0)); cli_delim(":");
cli_puts((const char *)sqlite3_column_text(statement, 2)); cli_delim(":");
cli_printf("%lld", (long long) sqlite3_column_int64(statement, 4)); cli_delim(":");
cli_printf("%lld", (long long) sqlite3_column_int64(statement, 5)); cli_delim(":");
cli_printf("%u", sqlite3_column_int(statement, 1)); cli_delim(":");
cli_printf("%lld", date); cli_delim(":");
cli_puts(name); cli_delim("\n");
const char *blob_service = rhizome_manifest_get(m, "service", NULL, 0);
if (!service[0] || (blob_service && strcasecmp(service, blob_service) == 0)) {
const char *blob_name = rhizome_manifest_get(m, "name", NULL, 0);
long long blob_date = rhizome_manifest_get_ll(m, "date");
cli_puts(blob_service ? blob_service : ""); cli_delim(":");
cli_puts((const char *)sqlite3_column_text(statement, 0)); cli_delim(":");
cli_puts((const char *)sqlite3_column_text(statement, 2)); cli_delim(":");
cli_printf("%lld", (long long) sqlite3_column_int64(statement, 4)); cli_delim(":");
cli_printf("%lld", (long long) sqlite3_column_int64(statement, 5)); cli_delim(":");
cli_printf("%u", sqlite3_column_int(statement, 1)); cli_delim(":");
cli_printf("%lld", blob_date); cli_delim(":");
cli_puts(blob_name ? blob_name : ""); cli_delim("\n");
}
rhizome_manifest_free(m);
}
}

6
tests/dna_rhizome
View File

@ -33,12 +33,12 @@ setup_dna_rhizome() {
assert_rhizome_list() {
executeOk $dna rhizome list
assertStdoutLineCount '==' $(($# + 2))
assertStdoutIs --line=1 -e '7\n'
assertStdoutIs --line=2 -e 'fileid:manifestid:version:inserttime:length:date:name\n'
assertStdoutIs --line=1 -e '8\n'
assertStdoutIs --line=2 -e 'service:fileid:manifestid:version:inserttime:length:date:name\n'
local filename
for filename; do
unpack_manifest_for_grep "$filename"
assertStdoutGrep --matches=1 "^$re_filehash:$re_manifestid:.*:$re_name\$"
assertStdoutGrep --matches=1 "^file:$re_filehash:$re_manifestid:.*:$re_name\$"
done
}