Filenames now use the correct compression scheme (closes #56)
parent
8a0beffbe2
commit
33e695bdf3
|
@ -63,6 +63,9 @@ fn C.archive_write_close(&C.archive)
|
||||||
// Free the write archive
|
// Free the write archive
|
||||||
fn C.archive_write_free(&C.archive)
|
fn C.archive_write_free(&C.archive)
|
||||||
|
|
||||||
|
// Returns the name of the filter
|
||||||
|
fn C.archive_filter_code(&C.archive, int) int
|
||||||
|
|
||||||
#include "archive_entry.h"
|
#include "archive_entry.h"
|
||||||
|
|
||||||
struct C.archive_entry {}
|
struct C.archive_entry {}
|
||||||
|
|
|
@ -9,6 +9,7 @@ pub:
|
||||||
path string [required]
|
path string [required]
|
||||||
info PkgInfo [required]
|
info PkgInfo [required]
|
||||||
files []string [required]
|
files []string [required]
|
||||||
|
compression int [required]
|
||||||
}
|
}
|
||||||
|
|
||||||
// Represents the contents of a .PKGINFO file
|
// Represents the contents of a .PKGINFO file
|
||||||
|
@ -125,6 +126,11 @@ pub fn read_pkg(pkg_path string) ?Pkg {
|
||||||
C.archive_read_free(a)
|
C.archive_read_free(a)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 0: no compression (just a tarball)
|
||||||
|
// 1: gzip
|
||||||
|
// 14: zstd
|
||||||
|
compression_code := C.archive_filter_code(a, 0)
|
||||||
|
|
||||||
mut files := []string{}
|
mut files := []string{}
|
||||||
mut pkg_info := PkgInfo{}
|
mut pkg_info := PkgInfo{}
|
||||||
|
|
||||||
|
@ -164,6 +170,7 @@ pub fn read_pkg(pkg_path string) ?Pkg {
|
||||||
path: pkg_path
|
path: pkg_path
|
||||||
info: pkg_info
|
info: pkg_info
|
||||||
files: files
|
files: files
|
||||||
|
compression: compression_code
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -175,7 +182,14 @@ fn format_entry(key string, value string) string {
|
||||||
pub fn (pkg &Pkg) filename() string {
|
pub fn (pkg &Pkg) filename() string {
|
||||||
p := pkg.info
|
p := pkg.info
|
||||||
|
|
||||||
return '$p.name-$p.version-${p.arch}.pkg.tar.zst'
|
ext := match pkg.compression {
|
||||||
|
0 { '.tar' }
|
||||||
|
1 { '.tar.gz' }
|
||||||
|
14 { '.tar.zst' }
|
||||||
|
else { panic("Another compression code shouldn't be possible. Faulty code: $pkg.compression") }
|
||||||
|
}
|
||||||
|
|
||||||
|
return '$p.name-$p.version-${p.arch}.pkg$ext'
|
||||||
}
|
}
|
||||||
|
|
||||||
// to_desc returns a desc file valid string representation
|
// to_desc returns a desc file valid string representation
|
||||||
|
|
2
test.py
2
test.py
|
@ -67,7 +67,7 @@ def create_random_package(tmpdir, words, pkg_name_min_len, pkg_name_max_len, min
|
||||||
|
|
||||||
return tar_info
|
return tar_info
|
||||||
|
|
||||||
with tarfile.open(tar_path, "w") as tar:
|
with tarfile.open(tar_path, "w:gz") as tar:
|
||||||
# Add random .PKGINFO file
|
# Add random .PKGINFO file
|
||||||
pkginfo_file = sub_path / ".PKGINFO"
|
pkginfo_file = sub_path / ".PKGINFO"
|
||||||
pkginfo_file.write_text(create_random_pkginfo(words, pkg_name_min_len, pkg_name_max_len))
|
pkginfo_file.write_text(create_random_pkginfo(words, pkg_name_min_len, pkg_name_max_len))
|
||||||
|
|
Loading…
Reference in New Issue