mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 18:07:34 +00:00
LibArchive+Utilities: Port ZipOutputStream to Core::Stream
This commit is contained in:
parent
012645bdf9
commit
8238f926fd
3 changed files with 90 additions and 80 deletions
|
@ -11,8 +11,8 @@
|
|||
#include <AK/DeprecatedString.h>
|
||||
#include <AK/Function.h>
|
||||
#include <AK/IterationDecision.h>
|
||||
#include <AK/Stream.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <LibCore/Stream.h>
|
||||
#include <string.h>
|
||||
|
||||
namespace Archive {
|
||||
|
@ -55,18 +55,23 @@ struct [[gnu::packed]] EndOfCentralDirectory {
|
|||
return true;
|
||||
}
|
||||
|
||||
void write(OutputStream& stream) const
|
||||
ErrorOr<void> write(Core::Stream::Stream& stream) const
|
||||
{
|
||||
stream.write_or_error(signature);
|
||||
stream << disk_number;
|
||||
stream << central_directory_start_disk;
|
||||
stream << disk_records_count;
|
||||
stream << total_records_count;
|
||||
stream << central_directory_size;
|
||||
stream << central_directory_offset;
|
||||
stream << comment_length;
|
||||
auto write_value = [&stream](auto value) {
|
||||
return stream.write_entire_buffer({ &value, sizeof(value) });
|
||||
};
|
||||
|
||||
TRY(stream.write_entire_buffer(signature));
|
||||
TRY(write_value(disk_number));
|
||||
TRY(write_value(central_directory_start_disk));
|
||||
TRY(write_value(disk_records_count));
|
||||
TRY(write_value(total_records_count));
|
||||
TRY(write_value(central_directory_size));
|
||||
TRY(write_value(central_directory_offset));
|
||||
TRY(write_value(comment_length));
|
||||
if (comment_length > 0)
|
||||
stream.write_or_error({ comment, comment_length });
|
||||
TRY(stream.write_entire_buffer({ comment, comment_length }));
|
||||
return {};
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -100,8 +105,6 @@ union ZipGeneralPurposeFlags {
|
|||
};
|
||||
static_assert(sizeof(ZipGeneralPurposeFlags) == sizeof(u16));
|
||||
|
||||
OutputStream& operator<<(OutputStream& stream, ZipCompressionMethod method);
|
||||
|
||||
struct [[gnu::packed]] CentralDirectoryRecord {
|
||||
static constexpr Array<u8, signature_length> signature = { 0x50, 0x4b, 0x01, 0x02 }; // 'PK\x01\x02'
|
||||
|
||||
|
@ -138,31 +141,36 @@ struct [[gnu::packed]] CentralDirectoryRecord {
|
|||
return true;
|
||||
}
|
||||
|
||||
void write(OutputStream& stream) const
|
||||
ErrorOr<void> write(Core::Stream::Stream& stream) const
|
||||
{
|
||||
stream.write_or_error(signature);
|
||||
stream << made_by_version;
|
||||
stream << minimum_version;
|
||||
stream << general_purpose_flags.flags;
|
||||
stream << compression_method;
|
||||
stream << modification_time;
|
||||
stream << modification_date;
|
||||
stream << crc32;
|
||||
stream << compressed_size;
|
||||
stream << uncompressed_size;
|
||||
stream << name_length;
|
||||
stream << extra_data_length;
|
||||
stream << comment_length;
|
||||
stream << start_disk;
|
||||
stream << internal_attributes;
|
||||
stream << external_attributes;
|
||||
stream << local_file_header_offset;
|
||||
auto write_value = [&stream](auto value) {
|
||||
return stream.write_entire_buffer({ &value, sizeof(value) });
|
||||
};
|
||||
|
||||
TRY(stream.write_entire_buffer(signature));
|
||||
TRY(write_value(made_by_version));
|
||||
TRY(write_value(minimum_version));
|
||||
TRY(write_value(general_purpose_flags.flags));
|
||||
TRY(write_value(compression_method));
|
||||
TRY(write_value(modification_time));
|
||||
TRY(write_value(modification_date));
|
||||
TRY(write_value(crc32));
|
||||
TRY(write_value(compressed_size));
|
||||
TRY(write_value(uncompressed_size));
|
||||
TRY(write_value(name_length));
|
||||
TRY(write_value(extra_data_length));
|
||||
TRY(write_value(comment_length));
|
||||
TRY(write_value(start_disk));
|
||||
TRY(write_value(internal_attributes));
|
||||
TRY(write_value(external_attributes));
|
||||
TRY(write_value(local_file_header_offset));
|
||||
if (name_length > 0)
|
||||
stream.write_or_error({ name, name_length });
|
||||
TRY(stream.write_entire_buffer({ name, name_length }));
|
||||
if (extra_data_length > 0)
|
||||
stream.write_or_error({ extra_data, extra_data_length });
|
||||
TRY(stream.write_entire_buffer({ extra_data, extra_data_length }));
|
||||
if (comment_length > 0)
|
||||
stream.write_or_error({ comment, comment_length });
|
||||
TRY(stream.write_entire_buffer({ comment, comment_length }));
|
||||
return {};
|
||||
}
|
||||
|
||||
[[nodiscard]] size_t size() const
|
||||
|
@ -202,25 +210,30 @@ struct [[gnu::packed]] LocalFileHeader {
|
|||
return true;
|
||||
}
|
||||
|
||||
void write(OutputStream& stream) const
|
||||
ErrorOr<void> write(Core::Stream::Stream& stream) const
|
||||
{
|
||||
stream.write_or_error(signature);
|
||||
stream << minimum_version;
|
||||
stream << general_purpose_flags.flags;
|
||||
stream << compression_method;
|
||||
stream << modification_time;
|
||||
stream << modification_date;
|
||||
stream << crc32;
|
||||
stream << compressed_size;
|
||||
stream << uncompressed_size;
|
||||
stream << name_length;
|
||||
stream << extra_data_length;
|
||||
auto write_value = [&stream](auto value) {
|
||||
return stream.write_entire_buffer({ &value, sizeof(value) });
|
||||
};
|
||||
|
||||
TRY(stream.write_entire_buffer(signature));
|
||||
TRY(write_value(minimum_version));
|
||||
TRY(write_value(general_purpose_flags.flags));
|
||||
TRY(write_value(compression_method));
|
||||
TRY(write_value(modification_time));
|
||||
TRY(write_value(modification_date));
|
||||
TRY(write_value(crc32));
|
||||
TRY(write_value(compressed_size));
|
||||
TRY(write_value(uncompressed_size));
|
||||
TRY(write_value(name_length));
|
||||
TRY(write_value(extra_data_length));
|
||||
if (name_length > 0)
|
||||
stream.write_or_error({ name, name_length });
|
||||
TRY(stream.write_entire_buffer({ name, name_length }));
|
||||
if (extra_data_length > 0)
|
||||
stream.write_or_error({ extra_data, extra_data_length });
|
||||
TRY(stream.write_entire_buffer({ extra_data, extra_data_length }));
|
||||
if (compressed_size > 0)
|
||||
stream.write_or_error({ compressed_data, compressed_size });
|
||||
TRY(stream.write_entire_buffer({ compressed_data, compressed_size }));
|
||||
return {};
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -254,12 +267,13 @@ private:
|
|||
|
||||
class ZipOutputStream {
|
||||
public:
|
||||
ZipOutputStream(OutputStream&);
|
||||
void add_member(ZipMember const&);
|
||||
void finish();
|
||||
ZipOutputStream(NonnullOwnPtr<Core::Stream::Stream>);
|
||||
|
||||
ErrorOr<void> add_member(ZipMember const&);
|
||||
ErrorOr<void> finish();
|
||||
|
||||
private:
|
||||
OutputStream& m_stream;
|
||||
NonnullOwnPtr<Core::Stream::Stream> m_stream;
|
||||
Vector<ZipMember> m_members;
|
||||
|
||||
bool m_finished { false };
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue