From 78310fa1e425652fb0f2f2e29865a6f2b9310cf0 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 7 Apr 2022 12:10:37 +0200
Subject: [PATCH] Builder now uses new Git repos API

---
 src/build/build.v | 10 ++--------
 src/git/client.v  |  9 ++++++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/build/build.v b/src/build/build.v
index 934627f..c42c98d 100644
--- a/src/build/build.v
+++ b/src/build/build.v
@@ -3,9 +3,7 @@ module build
 import docker
 import encoding.base64
 import time
-import net.http
 import git
-import json
 
 const container_build_dir = '/build'
 
@@ -63,11 +61,7 @@ fn create_build_image() ?string {
 
 fn build(conf Config) ? {
 	// We get the repos list from the Vieter instance
-	mut req := http.new_request(http.Method.get, '$conf.address/api/repos', '') ?
-	req.add_custom_header('X-Api-Key', conf.api_key) ?
-
-	res := req.do() ?
-	repos := json.decode([]git.GitRepo, res.text) ?
+	repos := git.get_repos(conf.address, conf.api_key) ?
 
 	// No point in doing work if there's no repos present
 	if repos.len == 0 {
@@ -77,7 +71,7 @@ fn build(conf Config) ? {
 	// First, we create a base image which has updated repos n stuff
 	image_id := create_build_image() ?
 
-	for repo in repos {
+	for _, repo in repos {
 		// TODO what to do with PKGBUILDs that build multiple packages?
 		commands := [
 			'git clone --single-branch --depth 1 --branch $repo.branch $repo.url repo',
diff --git a/src/git/client.v b/src/git/client.v
index 3da1a61..97fe9fb 100644
--- a/src/git/client.v
+++ b/src/git/client.v
@@ -4,7 +4,8 @@ import json
 import response { Response }
 import net.http
 
-fn get_repos(address string, api_key string) ?map[string]GitRepo {
+// get_repos returns the current list of repos.
+pub fn get_repos(address string, api_key string) ?map[string]GitRepo {
 	mut req := http.new_request(http.Method.get, '$address/api/repos', '') ?
 	req.add_custom_header('X-API-Key', api_key) ?
 
@@ -14,7 +15,8 @@ fn get_repos(address string, api_key string) ?map[string]GitRepo {
 	return data.data
 }
 
-fn add_repo(address string, api_key string, url string, branch string, arch []string) ?Response<string> {
+// add_repo adds a new repo to the server.
+pub fn add_repo(address string, api_key string, url string, branch string, arch []string) ?Response<string> {
 	mut req := http.new_request(http.Method.post, '$address/api/repos?url=$url&branch=$branch&arch=${arch.join(',')}',
 		'') ?
 	req.add_custom_header('X-API-Key', api_key) ?
@@ -25,7 +27,8 @@ fn add_repo(address string, api_key string, url string, branch string, arch []st
 	return data
 }
 
-fn remove_repo(address string, api_key string, id string) ?Response<string> {
+// remove_repo removes the repo with the given ID from the server.
+pub fn remove_repo(address string, api_key string, id string) ?Response<string> {
 	mut req := http.new_request(http.Method.delete, '$address/api/repos/$id', '') ?
 	req.add_custom_header('X-API-Key', api_key) ?