make library API better

1 files changed, 10 insertions, 6 deletions

diff --git a/src/cmd-version.c b/src/cmd-version.c
index b1e3fa8..ccee2d0 100644
--- a/src/cmd-version.c
+++ b/src/cmd-version.c
@@ -34,8 +34,6 @@ unsigned cmd_version_list_local(struct l2_context_node *ctx, char **args)
   return CMD_RESULT_SUCCESS;
 }
 
-unsigned l2_version_download_libraries(json_t *jlibraries, l2_version_feature_match_proc_t *feature_matcher);
-
 bool feat_match_cb(const char *name, json_t *js) {
   L2_UNUSED(name);
   L2_UNUSED(js);
@@ -55,12 +53,18 @@ unsigned cmd_version_install(struct l2_context_node *ctx, char **args)
     CMD_FATAL("failed to load 1.8.9: %s", l2_version_strerror(res));
   }
 
-  json_dumpf(js, stdout, JSON_INDENT(4));
-
-  putchar('\n');
+  CMD_INFO0("Retrieving library list...");
+  struct l2_version_library *libs = NULL;
+  if ((res = l2_version_collect_libraries(js, &libs, &feat_match_cb)) != VERSION_SUCCESS) {
+    CMD_FATAL("Failed to collect library list: %s", l2_version_strerror(res));
+  }
 
-  printf("%s\n", l2_version_strerror(l2_version_download_libraries(json_object_get(js, "libraries"), &feat_match_cb)));
+  CMD_INFO0("Downloading libraries...");
+  if ((res = l2_version_download_libraries(libs)) != VERSION_SUCCESS) {
+    CMD_FATAL("Failed to download libraries: %s", l2_version_strerror(res));
+  }
 
+  l2_version_free_libraries(libs);
   json_decref(js);
 
   return CMD_RESULT_SUCCESS;