From 1cb6d39641b94677dc18b8dbb548dd7d9f5ad8e8 Mon Sep 17 00:00:00 2001
From: "DESKTOP-TG61LAS\\Olli" <waldmanns@gmx.de>
Date: Tue, 15 Nov 2022 02:37:13 +0100
Subject: [PATCH] QGCCameraControl: support of ownlaod of .xz, .lzma compressed
 cam definition files

---
 src/Camera/QGCCameraControl.cc | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/Camera/QGCCameraControl.cc b/src/Camera/QGCCameraControl.cc
index d9d6985..5378d1e 100644
--- a/src/Camera/QGCCameraControl.cc
+++ b/src/Camera/QGCCameraControl.cc
@@ -12,6 +12,7 @@
 #include "QGCMapEngine.h"
 #include "QGCCameraManager.h"
 #include "FTPManager.h"
+#include "QGCLZMA.h"
 
 #include <QDir>
 #include <QStandardPaths>
@@ -1957,12 +1958,17 @@ QGCCameraControl::_handleDefinitionFile(const QString &url)
     QFile xmlFile(_cacheFile);
 
     QString ftpPrefix(QStringLiteral("%1://").arg(FTPManager::mavlinkFTPScheme));
-    if (url.startsWith(ftpPrefix, Qt::CaseInsensitive)) {
+    if (!xmlFile.exists() && url.startsWith(ftpPrefix, Qt::CaseInsensitive)) {
+        qCDebug(CameraControlLog) << "No camera definition file cached, attempt ftp download";
         int ver = static_cast<int>(_info.cam_definition_version);
-        QString fileName = QString::asprintf("%s_%s_%03d.xml",
+        QString ext = "";
+        if (url.endsWith(".lzma", Qt::CaseInsensitive)) { ext = ".lzma"; }
+        if (url.endsWith(".xz", Qt::CaseInsensitive)) { ext = ".xz"; }
+        QString fileName = QString::asprintf("%s_%s_%03d.xml%s",
             _vendor.toStdString().c_str(),
             _modelName.toStdString().c_str(),
-            ver);
+            ver,
+            ext.toStdString().c_str());
         connect(_vehicle->ftpManager(), &FTPManager::downloadComplete, this, &QGCCameraControl::_ftpDownloadComplete);
         _vehicle->ftpManager()->download(url,
             qgcApp()->toolbox()->settingsManager()->appSettings()->parameterSavePath().toStdString().c_str(),
@@ -1971,7 +1977,7 @@ QGCCameraControl::_handleDefinitionFile(const QString &url)
     }
 
     if (!xmlFile.exists()) {
-        qCDebug(CameraControlLog) << "No camera definition file cached";
+        qCDebug(CameraControlLog) << "No camera definition file cached, attempt http download";
         _httpRequest(url);
         return;
     }
@@ -2045,7 +2051,20 @@ void QGCCameraControl::_ftpDownloadComplete(const QString& fileName, const QStri
     qCDebug(CameraControlLog) << "FTP Download completed: " << fileName << ", " << errorMsg;
 
     disconnect(_vehicle->ftpManager(), &FTPManager::downloadComplete, this, &QGCCameraControl::_ftpDownloadComplete);
-    QFile xmlFile(fileName);
+
+    QString outputFileName = fileName;
+
+    if (fileName.endsWith(".lzma", Qt::CaseInsensitive) || fileName.endsWith(".xz", Qt::CaseInsensitive)) {
+        outputFileName = fileName.left(fileName.lastIndexOf("."));
+        if (QGCLZMA::inflateLZMAFile(fileName, outputFileName)) {
+            QFile(fileName).remove();
+        } else {
+            qCWarning(CameraControlLog) << "Inflate of compressed xml failed" << fileName;
+            outputFileName.clear();
+        }
+    }
+
+    QFile xmlFile(outputFileName);
 
     if (!xmlFile.exists()) {
         qCDebug(CameraControlLog) << "No camera definition file present after ftp download completed";