vieter-v/vieter
vieter-v/vieter
Archived
2
1
Fork 5
Code Issues 84 Pull requests 4 Projects Releases 12 Packages 1 Wiki Activity

refactor(client): streamline code & improve error propagation

Browse source
This commit is contained in:
Jef Roosens 2022-12-15 10:01:45 +01:00
parent 0bd5158608
commit 0727d0fd25
Signed by: Jef Roosens
GPG key ID: B75D4F293C7052DB
6 changed files with 29 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/console/logs/logs.v
View file

@ -183,15 +183,7 @@ fn print_log_list(logs []BuildLog, raw bool) ! {
// list prints a list of all build logs.
fn list(conf Config, filter BuildLogFilter, raw bool) ! {
c := client.new(conf.address, conf.api_key)
logs := c.get_build_logs(filter)!.data
print_log_list(logs, raw)!
}
// list prints a list of all build logs for a given target.
fn list_for_target(conf Config, target_id int, raw bool) ! {
c := client.new(conf.address, conf.api_key)
logs := c.get_build_logs_for_target(target_id)!.data
logs := c.get_build_logs(filter)!
print_log_list(logs, raw)!
}
@ -199,7 +191,7 @@ fn list_for_target(conf Config, target_id int, raw bool) ! {
// info print the detailed info for a given build log.
fn info(conf Config, id int) ! {
c := client.new(conf.address, conf.api_key)
log := c.get_build_log(id)!.data
log := c.get_build_log(id)!
print(log)
}

32
src/console/targets/targets.v
View file

@ -215,8 +215,7 @@ pub fn cmd() cli.Command {
}
c := client.new(conf.address, conf.api_key)
res := c.queue_job(target_id, arch, force)!
println(res.message)
c.queue_job(target_id, arch, force)!
} else {
build(conf, target_id, force)!
}
@ -245,23 +244,19 @@ fn list(conf Config, filter TargetFilter, raw bool) ! {
// add adds a new repository to the server's list.
fn add(conf Config, t &NewTarget, raw bool) ! {
c := client.new(conf.address, conf.api_key)
res := c.add_target(t)!
target_id := c.add_target(t)!
if raw {
println(res.data)
println(target_id)
} else {
println('Target added with id $res.data')
println('Target added with id $target_id')
}
}
// remove removes a repository from the server's list.
fn remove(conf Config, id string) ! {
id_int := id.int()
if id_int != 0 {
c := client.new(conf.address, conf.api_key)
c.remove_target(id_int)!
}
c := client.new(conf.address, conf.api_key)
c.remove_target(id.int())!
}
// patch patches a given repository with the provided params.
@ -274,22 +269,13 @@ fn patch(conf Config, id string, params map[string]string) ! {
}
}
id_int := id.int()
if id_int != 0 {
c := client.new(conf.address, conf.api_key)
c.patch_target(id_int, params)!
}
c := client.new(conf.address, conf.api_key)
c.patch_target(id.int(), params)!
}
// info shows detailed information for a given repo.
fn info(conf Config, id string) ! {
id_int := id.int()
if id_int == 0 {
return
}
c := client.new(conf.address, conf.api_key)
repo := c.get_target(id_int)!
repo := c.get_target(id.int())!
println(repo)
}