Merge pull request #82675 from akrieger/delteeted

Author: Maleclypse

src/cata_utility.cpp

@@ -602,15 +602,15 @@ bool read_from_file_optional_json( const cata_path &path,
     return file_exist( path.get_unrelative_path() ) && read_from_file_json( path, reader );
 }
 
-bool read_from_zzip_optional( const std::shared_ptr<zzip> &z,
+bool read_from_zzip_optional( const zzip &z,
                               const std::filesystem::path &file,
                               const std::function<void( std::string_view )> &reader )
 {
-    if( !z || !z->has_file( file ) ) {
+    if( !z.has_file( file ) ) {
         return false;
     }
     try {
-        std::vector<std::byte> file_data = z->get_file( file );
+        std::vector<std::byte> file_data = z.get_file( file );
         std::string_view sv{ reinterpret_cast<const char *>( file_data.data() ), file_data.size() };
         reader( sv );
         return true;

src/cata_utility.h

@@ -368,7 +368,7 @@ bool read_from_file_optional_json( const cata_path &path,
  * error handling logic.
  */
 /**@{*/
-bool read_from_zzip_optional( const std::shared_ptr<zzip> &z,
+bool read_from_zzip_optional( const zzip &z,
                               const std::filesystem::path &file,
                               const std::function<void( std::string_view )> &reader );
 bool read_from_zzip_optional( const std::shared_ptr<zzip_stack> &z,

src/debug_menu.cpp

@@ -482,10 +482,9 @@ void write_min_archive()
                         min_mmr_save_rel +
                         ".temp" ).get_unrelative_path();
                 {
-                    std::shared_ptr<zzip> min_mmr_temp_zzip = zzip::load( min_mmr_temp_zzip_path, mmr_dict );
+                    std::optional<zzip> min_mmr_temp_zzip = zzip::load( min_mmr_temp_zzip_path, mmr_dict );
                     if( !min_mmr_temp_zzip ||
-                        !mmr_stack->copy_files_to( trimmed_mmr_entries, min_mmr_temp_zzip ) ||
-                        !min_mmr_temp_zzip->compact( 0 ) ) {
+                        !mmr_stack->copy_files_to( trimmed_mmr_entries, *min_mmr_temp_zzip ) ) {
                         popup( _( "Failed to create minimized archive" ) );
                         return;
                     }

src/filesystem.cpp

@@ -178,7 +178,10 @@ bool rename_file( const std::filesystem::path &old_path, const std::filesystem::
 {
     setFsNeedsSync();
     std::error_code ec;
-    std::filesystem::rename( old_path, new_path, ec );
+    int attempts = 0;
+    do {
+        std::filesystem::rename( old_path, new_path, ec );
+    } while( ec && ++attempts < 3 );
     return !ec;
 }
 

src/game.cpp

@@ -3254,8 +3254,9 @@ bool game::load( const save_t &name )
                     u.set_save_id( name.decoded_name() );
 
                     if( world_generator->active_world->has_compression_enabled() ) {
-                        std::shared_ptr<zzip> z = zzip::load( ( save_file_path + ".zzip" ).get_unrelative_path() );
-                        abort = !read_from_zzip_optional( z, save_file_path.get_unrelative_path().filename(),
+                        std::optional<zzip> z = zzip::load( ( save_file_path + ".zzip" ).get_unrelative_path() );
+                        abort = !z.has_value() ||
+                        !read_from_zzip_optional( z.value(), save_file_path.get_unrelative_path().filename(),
                         [this]( std::string_view sv ) {
                             unserialize( std::string{ sv } );
                         } );
@@ -3519,11 +3520,12 @@ bool game::save_player_data()
     if( world_generator->active_world->has_compression_enabled() ) {
         std::stringstream save;
         serialize_json( save );
-        std::shared_ptr<zzip> z = zzip::load( ( playerfile + SAVE_EXTENSION +
-                                                ".zzip" ).get_unrelative_path() );
+        std::optional<zzip> z = zzip::load( ( playerfile + SAVE_EXTENSION +
+                                              ".zzip.tmp" ).get_unrelative_path() );
         saved_data = z->add_file( ( playerfile + SAVE_EXTENSION ).get_unrelative_path().filename(),
                                   save.str() );
-        saved_data = saved_data && z->compact( 1.0 );
+        saved_data = saved_data && z->compact_to( ( playerfile + SAVE_EXTENSION +
+                     ".zzip" ).get_unrelative_path(), 0.0 );
     } else {
         saved_data = write_to_file( playerfile + SAVE_EXTENSION, [&]( std::ostream & fout ) {
             serialize_json( fout );

src/mapbuffer.cpp

@@ -5,6 +5,7 @@
 #include <exception>
 #include <filesystem>
 #include <functional>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <stdexcept>
@@ -159,9 +160,9 @@ bool mapbuffer::submap_exists_approx( const tripoint_abs_sm &p )
                 if( !file_exist( zzip_name ) ) {
                     return false;
                 }
-                std::shared_ptr<zzip> z = zzip::load( zzip_name.get_unrelative_path(),
-                                                      ( PATH_INFO::world_base_save_path() / "maps.dict" ).get_unrelative_path() );
-                return z->has_file( std::filesystem::u8path( file_name ) );
+                std::optional<zzip> z = zzip::load( zzip_name.get_unrelative_path(),
+                                                    ( PATH_INFO::world_base_save_path() / "maps.dict" ).get_unrelative_path() );
+                return z && z->has_file( std::filesystem::u8path( file_name ) );
             } else {
                 return file_exist( dirname / file_name );
             }
@@ -246,13 +247,13 @@ void mapbuffer::save_quad(
     bool reverted_to_uniform = false;
     bool file_exists = false;
 
-    std::shared_ptr<zzip> z;
+    std::optional<zzip> z;
+    cata_path zzip_name = dirname;
+    zzip_name += ".zzip";
     // The number of uniform submaps is so enormous that the filesystem overhead
     // for this step of just checking if the quad exists approaches 70% of the
     // total cost of saving the mapbuffer, in one test save I had.
     if( world_generator->active_world->has_compression_enabled() ) {
-        cata_path zzip_name = dirname;
-        zzip_name += ".zzip";
         z = zzip::load( zzip_name.get_unrelative_path(),
                         ( PATH_INFO::world_base_save_path() / "maps.dict" ).get_unrelative_path() );
         if( !z ) {
@@ -335,7 +336,6 @@ void mapbuffer::save_quad(
 
     if( z ) {
         z->add_file( filename.get_relative_path().filename(), s );
-        z->compact( 2.0 );
     } else {
         // Don't create the directory if it would be empty
         assure_dir_exist( dirname );
@@ -351,6 +351,13 @@ void mapbuffer::save_quad(
             std::filesystem::remove( filename.get_unrelative_path() );
         }
     }
+    if( z ) {
+        cata_path tmp_path = zzip_name + ".tmp";
+        if( z->compact_to( tmp_path.get_unrelative_path(), 2.0 ) ) {
+            z.reset();
+            rename_file( tmp_path, zzip_name );
+        }
+    }
 }
 
 // We're reading in way too many entities here to mess around with creating sub-objects and
@@ -372,9 +379,9 @@ submap *mapbuffer::unserialize_submaps( const tripoint_abs_sm &p )
             if( !file_exist( zzip_name ) ) {
                 return false;
             }
-            std::shared_ptr<zzip> z = zzip::load( zzip_name.get_unrelative_path(),
-                                                  ( PATH_INFO::world_base_save_path() / "maps.dict" ).get_unrelative_path() );
-            if( !z->has_file( file_name_path ) ) {
+            std::optional<zzip> z = zzip::load( zzip_name.get_unrelative_path(),
+                                                ( PATH_INFO::world_base_save_path() / "maps.dict" ).get_unrelative_path() );
+            if( !z || !z->has_file( file_name_path ) ) {
                 return false;
             }
             std::vector<std::byte> contents = z->get_file( file_name_path );