Add more progress updates.

Author: dillof

src/Archive.cc

@@ -614,10 +614,13 @@ std::optional<size_t> ArchiveContents::file_index_by_name(const std::string &fil
 bool Archive::compute_detector_hashes(const std::unordered_map<size_t, DetectorPtr> &detectors) {
     auto got_new_hashes = false;
 
+    Progress::push_message("computing hashes in '" + name + "'");
     for (size_t index = 0; index < files.size(); index++) {
         auto &file = files[index];
         std::unordered_map<size_t, DetectorPtr> missing_detectors;
 
+        Progress::update();
+
         for (const auto &pair : detectors) {
             if (file.detector_hashes.find(pair.first) == file.detector_hashes.end()) {
                 missing_detectors[pair.first] = pair.second;
@@ -636,6 +639,8 @@ bool Archive::compute_detector_hashes(const std::unordered_map<size_t, DetectorP
     if (got_new_hashes) {
         set_cache_changed(HASHES_ONLY);
     }
+    Progress::pop_message();
+
     return got_new_hashes;
 }
 

src/ArchiveZip.cc

@@ -87,13 +87,19 @@ bool ArchiveZip::check() {
     return ensure_zip();
 }
 
+static void close_progress(zip_t *za, double progress, void *ud) {
+    Progress::update();
+}
 
 bool ArchiveZip::close_xxx() {
     if (za == nullptr) {
         return true;
     }
 
+    Progress::push_message("writing '" + name + "'");
+    zip_register_progress_callback_with_state(za, 0.1, close_progress, nullptr, nullptr);
     if (zip_close(za) < 0) {
+        Progress::pop_message();
 	/* error closing, so zip is still valid */
 	output.archive_error("error closing zip: %s", zip_strerror(za));
 
@@ -103,6 +109,7 @@ bool ArchiveZip::close_xxx() {
         za = nullptr;
         return false;
     }
+    Progress::pop_message();
 
     za = nullptr;