forked from vieter-v/vieter
Compare commits
2 Commits
b6cd2f0bc2
...
8a08788935
| Author | SHA1 | Date |
|---|---|---|
|
|
8a08788935 | |
|
|
cf67b46df0 |
|
|
@ -5,6 +5,11 @@ import strings
|
|||
import cli
|
||||
import os
|
||||
|
||||
// tabbed_table returns a simple textual table, with tabs as separators.
|
||||
pub fn tabbed_table(data [][]string) string {
|
||||
return data.map(it.join('\t')).join('\n')
|
||||
}
|
||||
|
||||
// pretty_table converts a list of string data into a pretty table. Many thanks
|
||||
// to @hungrybluedev in the Vlang Discord for providing this code!
|
||||
// https://ptb.discord.com/channels/592103645835821068/592106336838352923/970278787143045192
|
||||
|
|
|
|||
|
|
@ -133,7 +133,9 @@ pub fn cmd() cli.Command {
|
|||
]
|
||||
}
|
||||
|
||||
list(conf, filter)?
|
||||
raw := cmd.flags.get_bool('raw')?
|
||||
|
||||
list(conf, filter, raw)?
|
||||
}
|
||||
},
|
||||
cli.Command{
|
||||
|
|
@ -167,27 +169,31 @@ pub fn cmd() cli.Command {
|
|||
}
|
||||
|
||||
// print_log_list prints a list of logs.
|
||||
fn print_log_list(logs []BuildLog) ? {
|
||||
fn print_log_list(logs []BuildLog, raw bool) ? {
|
||||
data := logs.map([it.id.str(), it.target_id.str(), it.start_time.local().str(),
|
||||
it.exit_code.str()])
|
||||
|
||||
println(console.pretty_table(['id', 'target', 'start time', 'exit code'], data)?)
|
||||
if raw {
|
||||
println(console.tabbed_table(data))
|
||||
} else {
|
||||
println(console.pretty_table(['id', 'target', 'start time', 'exit code'], data)?)
|
||||
}
|
||||
}
|
||||
|
||||
// list prints a list of all build logs.
|
||||
fn list(conf Config, filter BuildLogFilter) ? {
|
||||
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)?
|
||||
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) ? {
|
||||
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
|
||||
|
||||
print_log_list(logs)?
|
||||
print_log_list(logs, raw)?
|
||||
}
|
||||
|
||||
// info print the detailed info for a given build log.
|
||||
|
|
|
|||
|
|
@ -60,7 +60,9 @@ pub fn cmd() cli.Command {
|
|||
filter.repo = repo
|
||||
}
|
||||
|
||||
list(conf, filter)?
|
||||
raw := cmd.flags.get_bool('raw')?
|
||||
|
||||
list(conf, filter, raw)?
|
||||
}
|
||||
},
|
||||
cli.Command{
|
||||
|
|
@ -193,12 +195,16 @@ pub fn cmd() cli.Command {
|
|||
// ID. If multiple or none are found, an error is raised.
|
||||
|
||||
// list prints out a list of all repositories.
|
||||
fn list(conf Config, filter TargetFilter) ? {
|
||||
fn list(conf Config, filter TargetFilter, raw bool) ? {
|
||||
c := client.new(conf.address, conf.api_key)
|
||||
repos := c.get_targets(filter)?
|
||||
data := repos.map([it.id.str(), it.kind, it.url, it.repo])
|
||||
|
||||
println(console.pretty_table(['id', 'kind', 'url', 'repo'], data)?)
|
||||
if raw {
|
||||
println(console.tabbed_table(data))
|
||||
} else {
|
||||
println(console.pretty_table(['id', 'kind', 'url', 'repo'], data)?)
|
||||
}
|
||||
}
|
||||
|
||||
// add adds a new repository to the server's list.
|
||||
|
|
|
|||
|
|
@ -24,6 +24,13 @@ fn main() {
|
|||
global: true
|
||||
default_value: [os.expand_tilde_to_home('~/.vieterrc')]
|
||||
},
|
||||
cli.Flag{
|
||||
flag: cli.FlagType.bool
|
||||
name: 'raw'
|
||||
abbrev: 'r'
|
||||
description: 'Only output minimal information (no formatted tables, etc.)'
|
||||
global: true
|
||||
},
|
||||
]
|
||||
commands: [
|
||||
server.cmd(),
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
module server
|
||||
|
||||
import web
|
||||
import net.http
|
||||
import web.response { new_response }
|
||||
|
||||
// delete_package tries to remove the given package.
|
||||
['/:repo/:arch/:pkg'; auth; delete]
|
||||
|
|
@ -10,17 +8,17 @@ fn (mut app App) delete_package(repo string, arch string, pkg string) web.Result
|
|||
res := app.repo.remove_pkg_from_arch_repo(repo, arch, pkg, true) or {
|
||||
app.lerror('Error while deleting package: $err.msg()')
|
||||
|
||||
return app.json(http.Status.internal_server_error, new_response('Failed to delete package.'))
|
||||
return app.status(.internal_server_error)
|
||||
}
|
||||
|
||||
if res {
|
||||
app.linfo("Removed package '$pkg' from '$repo/$arch'")
|
||||
|
||||
return app.json(http.Status.ok, new_response('Package removed.'))
|
||||
return app.status(.ok)
|
||||
} else {
|
||||
app.linfo("Tried removing package '$pkg' from '$repo/$arch', but it doesn't exist.")
|
||||
|
||||
return app.json(http.Status.not_found, new_response('Package not found.'))
|
||||
return app.status(.not_found)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -30,17 +28,17 @@ fn (mut app App) delete_arch_repo(repo string, arch string) web.Result {
|
|||
res := app.repo.remove_arch_repo(repo, arch) or {
|
||||
app.lerror('Error while deleting arch-repo: $err.msg()')
|
||||
|
||||
return app.json(http.Status.internal_server_error, new_response('Failed to delete arch-repo.'))
|
||||
return app.status(.internal_server_error)
|
||||
}
|
||||
|
||||
if res {
|
||||
app.linfo("Removed '$repo/$arch'")
|
||||
app.linfo("Removed arch-repo '$repo/$arch'")
|
||||
|
||||
return app.json(http.Status.ok, new_response('Arch-repo removed.'))
|
||||
return app.status(.ok)
|
||||
} else {
|
||||
app.linfo("Tried removing '$repo/$arch', but it doesn't exist.")
|
||||
|
||||
return app.json(http.Status.not_found, new_response('Arch-repo not found.'))
|
||||
return app.status(.not_found)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -50,16 +48,16 @@ fn (mut app App) delete_repo(repo string) web.Result {
|
|||
res := app.repo.remove_repo(repo) or {
|
||||
app.lerror('Error while deleting repo: $err.msg()')
|
||||
|
||||
return app.json(http.Status.internal_server_error, new_response('Failed to delete repo.'))
|
||||
return app.status(.internal_server_error)
|
||||
}
|
||||
|
||||
if res {
|
||||
app.linfo("Removed '$repo'")
|
||||
app.linfo("Removed repo '$repo'")
|
||||
|
||||
return app.json(http.Status.ok, new_response('Repo removed.'))
|
||||
return app.status(.ok)
|
||||
} else {
|
||||
app.linfo("Tried removing '$repo', but it doesn't exist.")
|
||||
|
||||
return app.json(http.Status.not_found, new_response('Repo not found.'))
|
||||
return app.status(.not_found)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue