mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

get cache key for github in one pass

Browse Source
This commit is contained in:
Jarred Sumner
2023-01-24 22:26:45 -08:00
parent ac7aff1b47
commit a3cc911e7a
2 changed files with 76 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/install/extract_tarball.zig
View File

@@ -195,39 +195,74 @@ fn extract(this: *const ExtractTarball, tgz_bytes: []const u8) !Install.ExtractD
);
Global.crash();
};
_ = if (PackageManager.verbose_install)
try Archive.extractToDir(
zlib_pool.data.list.items,
extract_destination,
null,
void,
void{},
// for npm packages, the root dir is always "package"
// for github tarballs, the root dir is always the commit id
1,
true,
true,
)
else
try Archive.extractToDir(
zlib_pool.data.list.items,
extract_destination,
null,
void,
void{},
// for npm packages, the root dir is always "package"
// for github tarballs, the root dir is always the commit id
1,
true,
false,
);
switch (this.resolution.tag) {
.github => {
resolved = try Archive.readFirstDirname(zlib_pool.data.list.items);
resolved = try this.package_manager.allocator.dupe(u8, resolved);
const DirnameReader = struct {
needs_first_dirname: bool = true,
outdirname: *[]const u8,
pub fn onFirstDirectoryName(dirname_reader: *@This(), first_dirname: []const u8) void {
std.debug.assert(dirname_reader.needs_first_dirname);
dirname_reader.needs_first_dirname = false;
dirname_reader.outdirname.* = FileSystem.DirnameStore.instance.append([]const u8, first_dirname) catch unreachable;
}
};
var dirname_reader = DirnameReader{ .outdirname = &resolved };
_ = if (PackageManager.verbose_install)
try Archive.extractToDir(
zlib_pool.data.list.items,
extract_destination,
null,
*DirnameReader,
&dirname_reader,
// for npm packages, the root dir is always "package"
// for github tarballs, the root dir is always the commit id
1,
true,
true,
)
else
try Archive.extractToDir(
zlib_pool.data.list.items,
extract_destination,
null,
*DirnameReader,
&dirname_reader,
// for npm packages, the root dir is always "package"
// for github tarballs, the root dir is always the commit id
1,
true,
false,
);
},
else => {
_ = if (PackageManager.verbose_install)
try Archive.extractToDir(
zlib_pool.data.list.items,
extract_destination,
null,
void,
void{},
// for npm packages, the root dir is always "package"
// for github tarballs, the root dir is always the commit id
1,
true,
true,
)
else
try Archive.extractToDir(
zlib_pool.data.list.items,
extract_destination,
null,
void,
void{},
// for npm packages, the root dir is always "package"
// for github tarballs, the root dir is always the commit id
1,
true,
false,
);
},
else => {},
}
if (PackageManager.verbose_install) {

45
src/libarchive/libarchive.zig
View File

@@ -468,42 +468,12 @@ pub const Archive = struct {
}
}
pub fn readFirstDirname(
file_buffer: []const u8,
) !string {
var entry: *lib.archive_entry = undefined;
var stream: BufferReadStream = undefined;
stream.init(file_buffer);
defer stream.deinit();
_ = stream.openRead();
var archive = stream.archive;
return brk: {
while (true) {
const r = @intToEnum(Status, lib.archive_read_next_header(archive, &entry));
switch (r) {
Status.eof => break,
Status.retry => continue,
Status.failed, Status.fatal => return error.Fail,
else => {
var pathname: [:0]const u8 = std.mem.sliceTo(lib.archive_entry_pathname(entry).?, 0);
var tokenizer = std.mem.tokenize(u8, std.mem.span(pathname), std.fs.path.sep_str);
if (tokenizer.next()) |name| break :brk name;
},
}
}
};
}
pub fn extractToDir(
file_buffer: []const u8,
dir_: std.fs.IterableDir,
ctx: ?*Archive.Context,
comptime FilePathAppender: type,
appender: FilePathAppender,
comptime ContextType: type,
appender: ContextType,
comptime depth_to_skip: usize,
comptime close_handles: bool,
comptime log: bool,
@@ -527,7 +497,14 @@ pub const Archive = struct {
Status.retry => continue :loop,
Status.failed, Status.fatal => return error.Fail,
else => {
var pathname: [:0]const u8 = std.mem.sliceTo(lib.archive_entry_pathname(entry).?, 0);
var pathname: [:0]const u8 = bun.sliceTo(lib.archive_entry_pathname(entry).?, 0);
if (comptime ContextType != void and @hasDecl(std.meta.Child(ContextType), "onFirstDirectoryName")) {
if (appender.needs_first_dirname) {
appender.onFirstDirectoryName(strings.withoutTrailingSlash(std.mem.span(pathname)));
}
}
var tokenizer = std.mem.tokenize(u8, std.mem.span(pathname), std.fs.path.sep_str);
comptime var depth_i: usize = 0;
@@ -610,7 +587,7 @@ pub const Archive = struct {
else
@as(u64, 0);
if (comptime FilePathAppender != void) {
if (comptime ContextType != void and @hasDecl(std.meta.Child(ContextType), "appendMutable")) {
var result = ctx.?.all_files.getOrPutAdapted(hash, Context.U64Context{}) catch unreachable;
if (!result.found_existing) {
result.value_ptr.* = (try appender.appendMutable(@TypeOf(slice), slice)).ptr;