Expanded git repos api to store repository to publish to

src/git/cli.v

@@ -26,14 +26,14 @@ pub fn cmd() cli.Command {
 			},
 			cli.Command{
 				name: 'add'
-				required_args: 2
-				usage: 'url branch arch...'
+				required_args: 4
+				usage: 'url branch repo arch...'
 				description: 'Add a new repository.'
 				execute: fn (cmd cli.Command) ? {
 					config_file := cmd.flags.get_string('config-file') ?
 					conf := env.load<Config>(config_file) ?
 
-					add(conf, cmd.args[0], cmd.args[1], cmd.args[2..]) ?
+					add(conf, cmd.args[0], cmd.args[1], cmd.args[2], cmd.args[3..]) ?
 				}
 			},
 			cli.Command{
@@ -56,12 +56,12 @@ fn list(conf Config) ? {
 	repos := get_repos(conf.address, conf.api_key) ?
 
 	for id, details in repos {
-		println('${id[..8]}\t$details.url\t$details.branch\t$details.arch')
+		println('${id[..8]}\t$details.url\t$details.branch\t$details.repo\t$details.arch')
 	}
 }
 
-fn add(conf Config, url string, branch string, arch []string) ? {
-	res := add_repo(conf.address, conf.api_key, url, branch, arch) ?
+fn add(conf Config, url string, branch string, repo string, arch []string) ? {
+	res := add_repo(conf.address, conf.api_key, url, branch, repo, arch) ?
 
 	println(res.message)
 }

src/git/client.v

@@ -4,36 +4,47 @@ import json
 import response { Response }
 import net.http
 
-// 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', '') ?
+fn send_request<T>(method http.Method, address string, url string, api_key string, params map[string]string) ?Response<T> {
+	mut full_url := '$address$url'
+
+	if params.len > 0 {
+		params_str := params.keys().map('$it=${params[it]}').join('&')
+
+		full_url = "$full_url?$params_str"
+	}
+
+	mut req := http.new_request(method, full_url, '') ?
 	req.add_custom_header('X-API-Key', api_key) ?
 
 	res := req.do() ?
-	data := json.decode(Response<map[string]GitRepo>, res.text) ?
+	data := json.decode(Response<T>, res.text) ?
+
+	return data
+}
+
+// get_repos returns the current list of repos.
+pub fn get_repos(address string, api_key string) ?map[string]GitRepo {
+	data := send_request<map[string]GitRepo>(http.Method.get, address, '/api/repos', api_key, {}) ?
 
 	return data.data
 }
 
 // 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) ?
-
-	res := req.do() ?
-	data := json.decode(Response<string>, res.text) ?
+pub fn add_repo(address string, api_key string, url string, branch string, repo string, arch []string) ?Response<string> {
+	params := {
+		'url': url
+		'branch': branch
+		'repo': repo
+		'arch': arch.join(',')
+	}
+	data := send_request<string>(http.Method.post, address, '/api/repos', api_key, params) ?
 
 	return data
 }
 
 // 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) ?
-
-	res := req.do() ?
-	data := json.decode(Response<string>, res.text) ?
+	data := send_request<string>(http.Method.delete, address, '/api/repos/$id', api_key, {}) ?
 
 	return data
 }

src/git/git.v

@@ -12,6 +12,8 @@ pub mut:
 	// On which architectures the package is allowed to be built. In reality,
 	// this controls which builders will periodically build the image.
 	arch []string
+	// Which repo the builder should publish packages to
+	repo string
 }
 
 // patch_from_params patches a GitRepo from a map[string]string, usually