Merge branch 'dev' into basic-builds

This commit is contained in:
Jef Roosens 2022-02-19 15:55:45 +01:00
commit 6c435c2a1e
Signed by untrusted user: Jef Roosens
GPG key ID: B580B976584B5F30
12 changed files with 42 additions and 110 deletions

View file

@ -74,6 +74,9 @@ fn (r &Repo) add(pkg &package.Pkg) ?bool {
return false
}
// We remove the older package version first, if present
r.remove(pkg.info.name, false) ?
os.mkdir(pkg_dir) or { return error('Failed to create package directory.') }
os.write_file(os.join_path_single(pkg_dir, 'desc'), pkg.to_desc()) or {
@ -92,6 +95,31 @@ fn (r &Repo) add(pkg &package.Pkg) ?bool {
return true
}
// remove removes a package from the database. It returns false if the package
// wasn't present in the database.
fn (r &Repo) remove(pkg_name string, sync bool) ?bool {
// We iterate over every directory in the repo dir
for d in os.ls(r.repo_dir) ? {
name := d.split('-')#[..-2].join('-')
if name == pkg_name {
// We lock the mutex here to prevent other routines from creating a
// new archive while we removed an entry
lock r.mutex {
os.rmdir_all(os.join_path_single(r.repo_dir, d)) ?
}
if sync {
r.sync() ?
}
return true
}
}
return false
}
// Returns the path where the given package's desc & files files are stored
fn (r &Repo) pkg_path(pkg &package.Pkg) string {
return os.join_path(r.repo_dir, '$pkg.info.name-$pkg.info.version')

View file

@ -34,7 +34,7 @@ fn parse_attrs(name string, attrs []string) ?([]http.Method, string) {
}
if x.len > 0 {
return IError(http.UnexpectedExtraAttributeError{
attributes: x
attributes: x
})
}
if methods.len == 0 {

View file

@ -22,7 +22,7 @@ pub struct Result {}
pub const (
methods_with_form = [http.Method.post, .put, .patch]
headers_close = http.new_custom_header_from_map({
'Server': 'VWeb'
'Server': 'VWeb'
http.CommonHeader.connection.str(): 'close'
}) or { panic('should never fail') }