Skip to content

Commit

Permalink
misc: Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Bruno Dias <[email protected]>
  • Loading branch information
nouwaarom and diasbruno committed Mar 27, 2021
1 parent 4f9d33a commit f0ab015
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/clib-install.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ static int install_package(const char *slug) {
char* author = clib_package_parse_author(slug);
char* name = clib_package_parse_name(slug);
char* package_id = clib_package_get_id(author, name);
registry_package_ptr_t package_info = registry_manger_find_package(registries, package_id);
registry_package_ptr_t package_info = registry_manager_find_package(registries, package_id);
if (!package_info) {
debug(&debugger, "Package %s not found in any registry.", slug);
return -1;
Expand Down
2 changes: 1 addition & 1 deletion src/common/clib-package-installer.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ static inline int install_packages(list_t *list, const char *dir, int verbose) {
if (NULL == slug)
goto loop_cleanup;

registry_package_ptr_t package_info = registry_manger_find_package(registries, package_id);
registry_package_ptr_t package_info = registry_manager_find_package(registries, package_id);
if (!package_info) {
debug(&_debugger, "Package %s not found in any registry.", slug);
return -1;
Expand Down
5 changes: 3 additions & 2 deletions src/registry/github-registry.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@
#include <curl/curl.h>
#include <string.h>

#define GITHUB_BASE_URL "https://github.com/"

/**
* Add `href` to the given `package`.
*/
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)
sprintf(self->href, "https://github.com/%s", self->id);
sprintf(self->href, GITHUB_BASE_URL "%s", self->id);
}

/**
Expand Down Expand Up @@ -129,4 +131,3 @@ list_t *github_registry_fetch(const char *url) {
http_get_free(res);
return list;
}

2 changes: 1 addition & 1 deletion src/registry/registry-manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void registry_manager_fetch_registries(registries_t registries) {
registry_iterator_destroy(it);
}

registry_package_ptr_t registry_manger_find_package(registries_t registries, const char* package_id) {
registry_package_ptr_t registry_manager_find_package(registries_t registries, const char* package_id) {
registry_iterator_t it = registry_iterator_new(registries);
registry_ptr_t reg;
while ((reg = registry_iterator_next(it))) {
Expand Down
2 changes: 1 addition & 1 deletion src/registry/registry-manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ void registry_iterator_destroy(registry_iterator_t iterator);
* @param package_id the identifier of the package "<namespace>/<package_name>"
* @return a pointer to the package if it could be found or NULL
*/
registry_package_ptr_t registry_manger_find_package(registries_t registries, const char* package_id);
registry_package_ptr_t registry_manager_find_package(registries_t registries, const char* package_id);

#endif//CLIB_SRC_REGISTRY_REGISTRY_MANAGER_H
4 changes: 3 additions & 1 deletion src/repository/gitlab-repository.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@
#include <string.h>
#include <url/url.h>

#define GITLAB_API_V4_URL "https://%s/api/v4%s/repository/files/%s/raw?ref=master"

// GET :hostname/api/v4/projects/:id/repository/files/:file_path/raw
char* gitlab_repository_get_url_for_file(const char*package_url, const char* slug, const char* version, const char *file, const char* secret) {
url_data_t *parsed = url_parse(package_url);

int size = strlen(parsed->hostname) + strlen(parsed->pathname) + strlen(file) + 64;
char *url = malloc(size);
if (url) {
snprintf(url, size, "https://%s/api/v4%s/repository/files/%s/raw?ref=master", parsed->hostname, parsed->pathname, file);
snprintf(url, size, GITLAB_API_V4_URL, parsed->hostname, parsed->pathname, file);
}

url_free(parsed);
Expand Down

0 comments on commit f0ab015

Please sign in to comment.