build: attempt to fix kanzi windows builds with conditional compilation

Author: quarterstar

CMakeLists.txt

@@ -32,6 +32,25 @@ file(GLOB_RECURSE SRC_FILES
     "${SRC_DIR}/*.qss"
 )
 
+set(COMPRESSION_SUPPORT ON)
+if (WIN32)
+    set(COMPRESSION_SUPPORT OFF)
+endif()
+
+# Exclude compression features for Windows (kanzi not supported)
+if(NOT COMPRESSION_SUPPORT)
+    # list the files to exclude explicitly
+    set(EXCLUDE_FILES
+        "${SRC_DIR}/common/utils/compression.cpp"
+        "${SRC_DIR}/common/utils/compression.hpp"
+    )
+
+    # remove them from the main source list
+    list(REMOVE_ITEM SRC_FILES ${EXCLUDE_FILES})
+endif()
+
+list(REMOVE_ITEM SRC_FILES ${EXCLUDE_FILES})
+
 # Combine translation files with the source files.
 set(PROJECT_SOURCES ${TS_FILES} ${SRC_FILES})
 
@@ -74,3 +93,7 @@ if (UNIX AND NOT APPLE)
   install(FILES assets/logo.svg DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/scalable/apps RENAME io.github.prayag2.Drawy.svg)
   install(FILES deploy/linux/io.github.prayag2.Drawy.metainfo.xml.in DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/metainfo/ RENAME io.github.prayag2.Drawy.metainfo.xml)
 endif()
+
+target_compile_definitions(${PROJECT_NAME} PRIVATE
+    COMPRESSION_SUPPORT=$<BOOL:${COMPRESSION_SUPPORT}>
+)

deps/CMakeLists.txt

@@ -1,12 +1,15 @@
 include(FetchContent)
 
-FetchContent_Declare(
-  kanzi
-  URL https://github.com/flanglet/kanzi-cpp/archive/refs/tags/2.4.0.zip
-  URL_MD5 ec451cdab40362e9e4af8e5ca780a07d
-)
+# Kanzi compilation is currently broken on Windows.
+if(COMPRESSION_SUPPORT)
+    FetchContent_Declare(
+      kanzi
+      URL https://github.com/flanglet/kanzi-cpp/archive/refs/tags/2.4.0.zip
+      URL_MD5 ec451cdab40362e9e4af8e5ca780a07d
+    )
 
-add_subdirectory(kanzi)
+    add_subdirectory(kanzi)
+endif()
 
 # find_package(tinyxml2 REQUIRED)
 # target_link_libraries(${PROJECT_NAME} PRIVATE tinyxml2::tinyxml2)

src/serializer/loader.cpp

@@ -26,9 +26,9 @@
 #include <QString>
 #include <format>
 #include <memory>
+#include <optional>
 
 #include "../common/constants.hpp"
-#include "../common/utils/compression.hpp"
 #include "../context/applicationcontext.hpp"
 #include "../context/renderingcontext.hpp"
 #include "../context/spatialcontext.hpp"
@@ -42,24 +42,12 @@
 #include "../item/rectangle.hpp"
 #include "../item/text.hpp"
 
-void Loader::loadFromFile(ApplicationContext *context) {
-    // file filter
-    QString filter = QString::fromUtf8("Drawy (*.%1)").arg(Common::drawyFileExt);
-
-    // ask for file (handle cancel)
-    QDir homeDir{QDir::home()};
-    QString fileName = QFileDialog::getOpenFileName(nullptr, "Open File", homeDir.path(), filter);
-    if (fileName.isEmpty())
-        return;
-
-    QFile file{fileName};
-    if (!file.open(QIODevice::ReadOnly)) {
-        qWarning() << "Failed to open file:" << file.errorString();
-        return;
-    }
+#ifdef COMPRESSION_SUPPORT
+#include "../common/utils/compression.hpp"
 
+std::optional<QJsonDocument> loadCompressedSave(QFile &file) {
     QByteArray compressedByteArray = file.readAll();
-    file.close();
+    QJsonParseError parseError;
 
     QByteArray byteArray;
     try {
@@ -73,21 +61,71 @@ void Loader::loadFromFile(ApplicationContext *context) {
                 byteArray = Common::Utils::Compression::decompressData(decoded);
             } catch (const std::exception &ex2) {
                 qWarning() << "Base64-decode fallback also failed:" << ex2.what();
-                return;
+                return std::nullopt;
             }
         } else {
-            return;
+            return std::nullopt;
         }
     }
 
-    QJsonParseError parseError;
     QJsonDocument doc = QJsonDocument::fromJson(byteArray, &parseError);
     if (doc.isNull() || !doc.isObject()) {
         qWarning() << "JSON parse failed:" << parseError.errorString()
                    << "offset:" << parseError.offset;
+        return std::nullopt;
+    }
+
+    return doc;
+}
+#endif
+
+void Loader::loadFromFile(ApplicationContext *context) {
+    // file filter
+    QString filter = QString::fromUtf8("Drawy (*.%1)").arg(Common::drawyFileExt);
+
+    // ask for file (handle cancel)
+    QDir homeDir{QDir::home()};
+    QString fileName = QFileDialog::getOpenFileName(nullptr, "Open File", homeDir.path(), filter);
+    if (fileName.isEmpty())
+        return;
+
+    QFile file{fileName};
+    if (!file.open(QIODevice::ReadOnly)) {
+        qWarning() << "Failed to open file:" << file.errorString();
+        return;
+    }
+
+    bool jsonLoadFailed = false;
+
+    QByteArray byteArray = file.readAll();
+    QJsonParseError parseError;
+    QJsonDocument doc = QJsonDocument::fromJson(byteArray, &parseError);
+    if (!doc.isNull() && doc.isObject()) {
+        jsonLoadFailed = true;
+        qWarning() << "JSON parse failed:" << parseError.errorString()
+                   << "offset:" << parseError.offset;
+    }
+
+#ifdef COMPRESSION_SUPPORT
+    if (jsonLoadFailed) {
+        auto maybeDoc = loadCompressedSave(file);
+
+        if (maybeDoc.has_value()) {
+            doc = maybeDoc.value();
+            jsonLoadFailed = false;
+        } else {
+            file.close();
+            return;
+        }
+    }
+#endif
+
+    if (jsonLoadFailed) {
         return;
     }
 
+    file.close();
+
     QJsonObject docObj = doc.object();
 
     context->reset();

src/serializer/serializer.cpp

@@ -26,7 +26,6 @@
 #include <memory>
 
 #include "../common/constants.hpp"
-#include "../common/utils/compression.hpp"
 #include "../context/applicationcontext.hpp"
 #include "../context/renderingcontext.hpp"
 #include "../context/spatialcontext.hpp"
@@ -36,6 +35,10 @@
 #include "../item/polygon.hpp"
 #include "../item/text.hpp"
 
+#ifdef COMPRESSION_SUPPORT
+#include "../common/utils/compression.hpp"
+#endif
+
 Serializer::Serializer() {
 }
 
@@ -131,14 +134,17 @@ void Serializer::saveToFile() {
         QFileDialog::getSaveFileName(nullptr, "Save File", defaultFilePath, text.data())};
 
     auto data{doc.toJson(QJsonDocument::Compact)};
-    auto compressedData{Common::Utils::Compression::compressData(data)};
+
+#ifdef COMPRESSION_SUPPORT
+    data = Common::Utils::Compression::compressData(data);
+#endif
 
     QFile file{fileName};
     file.open(QIODevice::WriteOnly);
-    qint64 written = file.write(compressedData);
+    qint64 written = file.write(data);
     file.close();
 
-    if (written != compressedData.size()) {
+    if (written != data.size()) {
         qWarning() << "Warning: not all bytes were written";
     }