Added support of saving not compressed ini files GrandOrgue#1199 (Gra…

…ndOrgue#2121)
oleg68 · Feb 23, 2025 · e3ddb91 · e3ddb91
1 parent 4779a50
commit e3ddb91
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/src/core/config/GOConfigFileWriter.cpp b/src/core/config/GOConfigFileWriter.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -23,7 +23,8 @@ void GOConfigFileWriter::AddEntry(
   g[name] = value;
 }
 
-bool GOConfigFileWriter::GetFileContent(GOBuffer<uint8_t> &buf) {
+bool GOConfigFileWriter::GetFileContent(
+  GOBuffer<uint8_t> &buf, bool isToCompress) {
   uint8_t bom[] = {0xEF, 0xBB, 0xBF};
   wxString content = wxEmptyString;
 
@@ -49,24 +50,26 @@ bool GOConfigFileWriter::GetFileContent(GOBuffer<uint8_t> &buf) {
   buf.Append(bom, sizeof(bom));
   buf.Append((const uint8_t *)b.data(), b.length());
 
-  if (!compressBuffer(buf))
+  if (isToCompress && !compressBuffer(buf))
     return false;
 
   return true;
 }
 
-bool GOConfigFileWriter::Save(wxString filename) {
+bool GOConfigFileWriter::Save(const wxString &fileName, bool isToCompress) {
   wxFile out;
   GOBuffer<uint8_t> buf;
-  if (!GetFileContent(buf))
-    return false;
 
-  if (!out.Create(filename, true))
-    return false;
+  bool isOk = GetFileContent(buf, isToCompress);
 
-  if (!out.Write(buf.get(), buf.GetSize()))
-    return false;
-  out.Flush();
-  out.Close();
-  return true;
+  if (isOk)
+    isOk = out.Create(fileName, true);
+
+  if (isOk)
+    isOk = out.Write(buf.get(), buf.GetSize());
+  if (isOk)
+    isOk = out.Flush();
+  if (isOk)
+    isOk = out.Close();
+  return isOk;
 }
diff --git a/src/core/config/GOConfigFileWriter.h b/src/core/config/GOConfigFileWriter.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2006 Milan Digital Audio LLC
- * Copyright 2009-2023 GrandOrgue contributors (see AUTHORS)
+ * Copyright 2009-2025 GrandOrgue contributors (see AUTHORS)
  * License GPL-2.0 or later
  * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
  */
@@ -23,8 +23,8 @@ class GOConfigFileWriter {
   GOConfigFileWriter();
 
   void AddEntry(wxString group, wxString name, wxString value);
-  bool GetFileContent(GOBuffer<uint8_t> &buffer);
-  bool Save(wxString filename);
+  bool GetFileContent(GOBuffer<uint8_t> &buffer, bool isToCompress = true);
+  bool Save(const wxString &fileName, bool isToCompress = true);
 };
 
 #endif