misc: Cleanup, add headers.

Author: nouwaarom

src/clib-build.c

@@ -205,7 +205,7 @@ int build_package_with_manifest_name(const char *dir, const char *file) {
 #ifdef DEBUG
     package = clib_package_new_from_slug(dir, 1);
 #else
-    package = clib_package_new_from_slug_and_url(dir, 0);
+    package = clib_package_new_from_slug_and_url(dir, "FIXME", 0);
 #endif
   }
 
@@ -336,7 +336,7 @@ int build_package_with_manifest_name(const char *dir, const char *file) {
       char *dep_dir = 0;
       asprintf(&slug, "%s/%s@%s", dep->author, dep->name, dep->version);
 
-      clib_package_t *dependency = clib_package_new_from_slug_and_url(slug, 0);
+      clib_package_t *dependency = clib_package_new_from_slug_and_url(slug, "FIXME", 0);
       if (opts.dir && dependency && dependency->name) {
         dep_dir = path_join(opts.dir, dependency->name);
       }
@@ -407,7 +407,7 @@ int build_package_with_manifest_name(const char *dir, const char *file) {
       char *slug = 0;
       asprintf(&slug, "%s/%s@%s", dep->author, dep->name, dep->version);
 
-      clib_package_t *dependency = clib_package_new_from_slug_and_url(slug, 0);
+      clib_package_t *dependency = clib_package_new_from_slug_and_url(slug, "FIXME", 0);
       char *dep_dir = path_join(opts.dir, dependency->name);
 
       free(slug);

src/clib-configure.c

@@ -198,7 +198,7 @@ int configure_package_with_manifest_name(const char *dir, const char *file) {
 #ifdef DEBUG
     package = clib_package_new_from_slug(dir, 1);
 #else
-    package = clib_package_new_from_slug_and_url(dir, 0);
+    package = clib_package_new_from_slug_and_url(dir, "FIXME", 0);
 #endif
   }
 
@@ -294,7 +294,7 @@ int configure_package_with_manifest_name(const char *dir, const char *file) {
       char *slug = 0;
       asprintf(&slug, "%s/%s@%s", dep->author, dep->name, dep->version);
 
-      clib_package_t *dependency = clib_package_new_from_slug_and_url(slug, 0);
+      clib_package_t *dependency = clib_package_new_from_slug_and_url(slug, "FIXME", 0);
       char *dep_dir = path_join(opts.dir, dependency->name);
 
       free(slug);
@@ -365,7 +365,7 @@ int configure_package_with_manifest_name(const char *dir, const char *file) {
       char *slug = 0;
       asprintf(&slug, "%s/%s@%s", dep->author, dep->name, dep->version);
 
-      clib_package_t *dependency = clib_package_new_from_slug_and_url(slug, 0);
+      clib_package_t *dependency = clib_package_new_from_slug_and_url(slug, "FIXME", 0);
       char *dep_dir = path_join(opts.dir, dependency->name);
 
       free(slug);

src/clib-install.c

@@ -293,14 +293,14 @@ static int install_package(const char *slug) {
 
   registries_t registries = registry_manager_init_registries(package->registries, secrets);
   registry_manager_fetch_registries(registries);
-  wiki_package_ptr_t package_info = registry_manger_find_package(registries, slug);
+  registry_package_ptr_t package_info = registry_manger_find_package(registries, slug);
   if (!package_info) {
     debug(&debugger, "Package %s not found in any registry.", slug);
     return -1;
   }
 
 
-  pkg = clib_package_new_from_slug_and_url(slug, wiki_package_get_href(package_info), opts.verbose);
+  pkg = clib_package_new_from_slug_and_url(slug, registry_package_get_href(package_info), opts.verbose);
   if (NULL == pkg)
     return -1;
 

src/clib-search.c

@@ -17,7 +17,7 @@
 #include "logger/logger.h"
 #include "parson/parson.h"
 #include "registry-manager.h"
-#include "registry/wiki-registry.h"
+#include "registry/registry.h"
 #include "strdup/strdup.h"
 #include "tempdir/tempdir.h"
 #include "version.h"
@@ -63,7 +63,7 @@ static void setopt_json(command_t *self) { opt_json = 1; }
     }                                                                          \
   }
 
-static int matches(int count, char *args[], wiki_package_ptr_t pkg) {
+static int matches(int count, char *args[], registry_package_ptr_t pkg) {
     // Display all packages if there's no query
     if (0 == count)
         return 1;
@@ -74,16 +74,16 @@ static int matches(int count, char *args[], wiki_package_ptr_t pkg) {
     char *href = NULL;
     int rc = 0;
 
-    name = clib_package_parse_name(wiki_package_get_id(pkg));
+    name = clib_package_parse_name(registry_package_get_id(pkg));
     COMPARE(name);
 
-    description = strdup(wiki_package_get_description(pkg));
+    description = strdup(registry_package_get_description(pkg));
     COMPARE(description);
 
-    repo = strdup(wiki_package_get_id(pkg));
+    repo = strdup(registry_package_get_id(pkg));
     COMPARE(repo);
 
-    href = strdup(wiki_package_get_href(pkg));
+    href = strdup(registry_package_get_href(pkg));
     COMPARE(href);
 
     cleanup:
@@ -122,26 +122,26 @@ static char *wiki_html_cache() {
 }
 */
 
-static void display_package(const wiki_package_ptr_t pkg,
+static void display_package(const registry_package_ptr_t pkg,
                             cc_color_t fg_color_highlight,
                             cc_color_t fg_color_text) {
-    cc_fprintf(fg_color_highlight, stdout, "  %s\n", wiki_package_get_id(pkg));
+    cc_fprintf(fg_color_highlight, stdout, "  %s\n", registry_package_get_id(pkg));
     printf("  url: ");
-    cc_fprintf(fg_color_text, stdout, "%s\n", wiki_package_get_href(pkg));
+    cc_fprintf(fg_color_text, stdout, "%s\n", registry_package_get_href(pkg));
     printf("  desc: ");
-    cc_fprintf(fg_color_text, stdout, "%s\n", wiki_package_get_description(pkg));
+    cc_fprintf(fg_color_text, stdout, "%s\n", registry_package_get_description(pkg));
     printf("\n");
 }
 
-static void add_package_to_json(const wiki_package_ptr_t pkg,
+static void add_package_to_json(const registry_package_ptr_t pkg,
                                 JSON_Array *json_list) {
     JSON_Value *json_pkg_root = json_value_init_object();
     JSON_Object *json_pkg = json_value_get_object(json_pkg_root);
 
-    json_object_set_string(json_pkg, "repo", wiki_package_get_id(pkg));
-    json_object_set_string(json_pkg, "href", wiki_package_get_href(pkg));
-    json_object_set_string(json_pkg, "description", wiki_package_get_description(pkg));
-    json_object_set_string(json_pkg, "category", wiki_package_get_category(pkg));
+    json_object_set_string(json_pkg, "repo", registry_package_get_id(pkg));
+    json_object_set_string(json_pkg, "href", registry_package_get_href(pkg));
+    json_object_set_string(json_pkg, "description", registry_package_get_description(pkg));
+    json_object_set_string(json_pkg, "category", registry_package_get_category(pkg));
 
     json_array_append_value(json_list, json_pkg_root);
 }
@@ -198,11 +198,11 @@ int main(int argc, char *argv[]) {
      */
 
     registry_iterator_t it = registry_iterator_new(registries);
-    wiki_registry_ptr_t registry = NULL;
+    registry_ptr_t registry = NULL;
     while ((registry = registry_iterator_next(it))) {
-        printf("SEARCH: packages from %s\n", wiki_registry_get_url(registry));
-        wiki_package_ptr_t pkg;
-        wiki_registry_iterator_t it = wiki_registry_iterator_new(registry);
+        printf("SEARCH: packages from %s\n", registry_get_url(registry));
+        registry_package_ptr_t pkg;
+        registry_package_iterator_t it = registry_package_iterator_new(registry);
 
         JSON_Array *json_list = NULL;
         JSON_Value *json_list_root = NULL;
@@ -214,15 +214,15 @@ int main(int argc, char *argv[]) {
 
         printf("\n");
 
-        while ((pkg = wiki_registry_iterator_next(it))) {
+        while ((pkg = registry_package_iterator_next(it))) {
             if (matches(program.argc, program.argv, pkg)) {
                 if (opt_json) {
                     add_package_to_json(pkg, json_list);
                 } else {
                     display_package(pkg, fg_color_highlight, fg_color_text);
                 }
             } else {
-                debug(&debugger, "skipped package %s", wiki_package_get_id(pkg));
+                debug(&debugger, "skipped package %s", registry_package_get_id(pkg));
             }
         }
 
@@ -234,7 +234,7 @@ int main(int argc, char *argv[]) {
             json_value_free(json_list_root);
         }
 
-        wiki_registry_iterator_destroy(it);
+        registry_package_iterator_destroy(it);
     }
     command_free(&program);
     return 0;

src/clib-update.c

@@ -237,7 +237,7 @@ static int install_package(const char *slug) {
   }
 
   if (!pkg) {
-    pkg = clib_package_new_from_slug_and_url(slug, opts.verbose);
+    pkg = clib_package_new_from_slug_and_url(slug, "FIXME", opts.verbose);
   }
 
   if (NULL == pkg)

src/clib-upgrade.c

@@ -143,7 +143,7 @@ static int install_package(const char *slug) {
 
   logger_info("info", "Upgrading to %s", extended_slug);
 
-  pkg = clib_package_new_from_slug_and_url(extended_slug, opts.verbose);
+  pkg = clib_package_new_from_slug_and_url(extended_slug, "FIXME", opts.verbose);
 
   if (NULL == pkg) {
     logger_error("error",

src/common/clib-package.c

@@ -730,7 +730,6 @@ clib_package_new_from_slug_with_package_name(const char *slug, const char* url,
   free(author);
   free(name);
   free(version);
-  free(url);
   free(json_url);
   free(repo);
   if (!res && json)

src/registry/github-registry.c

@@ -1,27 +1,27 @@
 //
 // github-registry.c
 //
-// Copyright (c) 2020 Elbert van de Put
+// Copyright (c) 2021 Elbert van de Put
 // Based on work by Stephen Mathieson
 // MIT licensed
 //
-#include <string.h>
 #include "github-registry.h"
-#include "gumbo-text-content/gumbo-text-content.h"
+#include "case/case.h"
 #include "gumbo-get-element-by-id/get-element-by-id.h"
 #include "gumbo-get-elements-by-tag-name/get-elements-by-tag-name.h"
+#include "gumbo-text-content/gumbo-text-content.h"
 #include "http-get/http-get.h"
-#include <curl/curl.h>
-#include "substr/substr.h"
+#include "registry-internal.h"
 #include "strdup/strdup.h"
-#include "case/case.h"
+#include "substr/substr.h"
 #include "trim/trim.h"
-#include "wiki-registry-internal.h"
+#include <curl/curl.h>
+#include <string.h>
 
 /**
  * Add `href` to the given `package`.
  */
-static void add_package_href(wiki_package_ptr_t self) {
+static void add_package_href(registry_package_ptr_t self) {
     size_t len = strlen(self->id) + 20; // https://github.com/ \0
     self->href = malloc(len);
     if (self->href)
@@ -31,8 +31,8 @@ static void add_package_href(wiki_package_ptr_t self) {
 /**
  * Parse the given wiki `li` into a package.
  */
-static wiki_package_ptr_t parse_li(GumboNode *li) {
-    wiki_package_ptr_t self = wiki_package_new();
+static registry_package_ptr_t parse_li(GumboNode *li) {
+  registry_package_ptr_t self = registry_package_new();
     char *text = NULL;
 
     if (!self) goto cleanup;
@@ -96,13 +96,14 @@ list_t *wiki_registry_parse(const char *html) {
             list_iterator_t *li_iterator = list_iterator_new(lis, LIST_HEAD);
             list_node_t *li_node;
             while ((li_node = list_iterator_next(li_iterator))) {
-                wiki_package_ptr_t package = parse_li(li_node->val);
+              registry_package_ptr_t package = parse_li(li_node->val);
                 if (package && package->description) {
                     package->category = strdup(category);
                     list_rpush(pkgs, list_node_new(package));
                 } else {
                     // failed to parse package
-                    if (package) wiki_package_free(package);
+                    if (package)
+                      registry_package_free(package);
                 }
             }
             list_iterator_destroy(li_iterator);