Merge pull request 'Single Version per Package' (#80) from single-version-per-pkg into dev

Reviewed-on: Chewing_Bever/vieter#80
main
Jef Roosens 2022-02-19 09:10:17 +01:00
commit 871ce8a407
2 changed files with 29 additions and 1 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 {