Add "delete_section" to generator_tool.

1 files changed, 16 insertions, 10 deletions

diff --git a/generator/unpack_mwm.cpp b/generator/unpack_mwm.cpp
index 4443e0a4fc..d112de3500 100644
--- a/generator/unpack_mwm.cpp
+++ b/generator/unpack_mwm.cpp
@@ -1,32 +1,38 @@
 #include "unpack_mwm.hpp"
+
 #include "../coding/file_container.hpp"
 #include "../coding/file_writer.hpp"
+#include "../coding/read_write_utils.hpp"
+
 #include "../base/logging.hpp"
 #include "../base/stl_add.hpp"
+
 #include "../std/algorithm.hpp"
 #include "../std/vector.hpp"
 
+
 void UnpackMwm(string const & filePath)
 {
   LOG(LINFO, ("Unpacking mwm sections..."));
+
   FilesContainerR container(filePath);
   vector<string> tags;
   container.ForEachTag(MakeBackInsertFunctor<vector<string> >(tags));
+
   for (size_t i = 0; i < tags.size(); ++i)
   {
     LOG(LINFO, ("Unpacking", tags[i]));
-    FilesContainerR::ReaderT reader = container.GetReader(tags[i]);
+
+    ReaderSource<FilesContainerR::ReaderT> reader(container.GetReader(tags[i]));
     FileWriter writer(filePath + "." + tags[i]);
 
-    uint64_t const size = reader.Size();
-    uint64_t pos = 0;
-    while (pos < size)
-    {
-      vector<char> buffer(min(static_cast<size_t>(size - pos), static_cast<size_t>(1024 * 1024)));
-      reader.Read(pos, &buffer[0], buffer.size());
-      writer.Write(&buffer[0], buffer.size());
-      pos += buffer.size();
-    }
+    rw::ReadAndWrite(reader, writer, 1024 * 1024);
   }
+
   LOG(LINFO, ("Unpacking done."));
 }
+
+void DeleteSection(string const & filePath, string const & tag)
+{
+  FilesContainerW(filePath, FileWriter::OP_WRITE_EXISTING).DeleteSection(tag);
+}