GreekStapler/vieter
1
0
Fork 0
forked from vieter-v/vieter
Code Issues Pull requests Releases Activity

Logs now show names of added packages

Browse source
This commit is contained in:
Jef Roosens 2022-02-02 13:24:31 +01:00
parent 3ad960fd59
commit a29592ef36
Signed by untrusted user: Jef Roosens
GPG key ID: B580B976584B5F30
5 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/routes.v
View file

@ -62,7 +62,7 @@ fn (mut app App) put_package() web.Result {
pkg_path = os.join_path_single(app.dl_dir, rand.uuid_v4())
}
app.ldebug("Uploading $length (${pretty_bytes(length.int())}) bytes to '$pkg_path'.")
app.ldebug("Uploading $length bytes (${pretty_bytes(length.int())}) to '$pkg_path'.")
// This is used to time how long it takes to upload a file
mut sw := time.new_stopwatch(time.StopWatchOptions{ auto_start: true })
@ -80,28 +80,22 @@ fn (mut app App) put_package() web.Result {
return app.text("Content-Type header isn't set.")
}
added := app.repo.add_from_path(pkg_path) or {
res := app.repo.add_from_path(pkg_path) or {
app.lerror('Error while adding package: $err.msg')
os.rm(pkg_path) or { app.lerror("Failed to remove download '$pkg_path'.") }
os.rm(pkg_path) or { app.lerror("Failed to remove download '$pkg_path': $err.msg") }
return app.text('Failed to add package.')
}
if !added {
os.rm(pkg_path) or { app.lerror("Failed to remove download '$pkg_path'.") }
if !res.added {
os.rm(pkg_path) or { app.lerror("Failed to remove download '$pkg_path': $err.msg") }
app.lwarn('Duplicate package.')
app.lwarn("Duplicate package '$res.pkg.full_name()'.")
return app.text('File already exists.')
}
app.linfo("Added '$pkg_path' to repository.")
app.linfo("Added '$res.pkg.full_name()' to repository.")
return app.text('Package added successfully.')
}
// add_package PUT a new package to the server
['/add'; put]
pub fn (mut app App) add_package() web.Result {
return app.text('')
}