incubator/xwim
1
0
Fork 0
Code Issues Pull requests Releases 6 Wiki Activity

Fix multiple folder compression
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse source
This commit is contained in:
Armin Friedl 2021-02-21 12:07:19 +01:00
parent 24f1407ed9
commit c3d9dd6360
Signed by: armin
GPG key ID: 48C726EEE7FBCBC8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/archiver/LibArchiver.cpp
View file

@ -32,13 +32,13 @@ void LibArchiver::compress(set<fs::path> ins, fs::path archive_out) {
archive_write_open_filename(writer.get(), archive_out.c_str()); archive_write_open_filename(writer.get(), archive_out.c_str());
shared_ptr<archive> reader; shared_ptr<archive> reader;
reader = shared_ptr<archive>(archive_read_disk_new(), archive_read_free);
archive_read_disk_set_standard_lookup(reader.get());
shared_ptr<archive_entry> entry = shared_ptr<archive_entry>(archive_entry_new(), archive_entry_free); shared_ptr<archive_entry> entry = shared_ptr<archive_entry>(archive_entry_new(), archive_entry_free);
for (auto in : ins) { for (auto in : ins) {
spdlog::debug("Compressing {}", in); spdlog::debug("Compressing {}", in);
reader = shared_ptr<archive>(archive_read_disk_new(), archive_read_free);
archive_read_disk_set_standard_lookup(reader.get());
r = archive_read_disk_open(reader.get(), in.c_str()); r = archive_read_disk_open(reader.get(), in.c_str());
if (r != ARCHIVE_OK) { if (r != ARCHIVE_OK) {
@ -56,7 +56,7 @@ void LibArchiver::compress(set<fs::path> ins, fs::path archive_out) {
archive_error_string(reader.get())}; archive_error_string(reader.get())};
} }
spdlog::debug("Compressing entry {}", archive_entry_pathname(entry.get())); spdlog::debug("Adding {} to archive", archive_entry_pathname(entry.get()));
r = archive_write_header(writer.get(), entry.get()); r = archive_write_header(writer.get(), entry.get());
if (r != ARCHIVE_OK) { if (r != ARCHIVE_OK) {
throw XwimError{"Failed writing archive entry. {}", throw XwimError{"Failed writing archive entry. {}",