[xSwiftBus] Automatically find and load CSL packages

ref T657

src/plugins/simulator/xplane/simulatorxplane.cpp

@@ -380,7 +380,6 @@ namespace BlackSimPlugin
             connect(m_trafficProxy, &CXSwiftBusTrafficProxy::remoteAircraftAddingFailed, this, &CSimulatorXPlane::onRemoteAircraftAddingFailed);
             if (m_watcher) { m_watcher->setConnection(m_dBusConnection); }
             m_trafficProxy->removeAllPlanes();
-            this->loadCslPackages();
             this->emitSimulatorCombinedStatus();
 
             this->initSimulatorInternals();
@@ -545,53 +544,6 @@ namespace BlackSimPlugin
             return false;
         }
 
-        void CSimulatorXPlane::loadCslPackages()
-        {
-            struct Prefix { QString s; };
-            struct PrefixComparator
-            {
-                bool operator()(const Prefix &a, const QString &b) const { return QStringRef(&a.s) < b.leftRef(a.s.size()); }
-                bool operator()(const QString &a, const Prefix &b) const { return a.leftRef(b.s.size()) < QStringRef(&b.s); }
-            };
-            QList<Prefix> packages;
-
-            Q_ASSERT(isConnected());
-            const CAircraftModelList models = this->getModelSet();
-            for (const auto &model : models)
-            {
-                const QString &modelFile = model.getFileName();
-                if (modelFile.isEmpty() || ! QFile::exists(modelFile)) { continue; }
-                auto it = std::lower_bound(packages.begin(), packages.end(), modelFile, PrefixComparator());
-                if (it != packages.end() && modelFile.startsWith(it->s)) { continue; }
-                QString package = findCslPackage(modelFile);
-                if (package.isEmpty()) { continue; }
-                packages.insert(it, { package.append('/') });
-            }
-            for (auto &package : packages)
-            {
-                Q_ASSERT(package.s.endsWith('/'));
-                package.s.chop(1);
-                m_trafficProxy->loadPlanesPackage(package.s);
-            }
-        }
-
-        QString CSimulatorXPlane::findCslPackage(const QString &modelFile)
-        {
-            //! \todo KB 2018-02 KB when I have removed the CSL dir (acciedently) there was no warning here
-            const QFileInfo info(modelFile);
-            QDir dir = info.isDir() ? QDir(modelFile) : info.dir();
-            do
-            {
-                if (dir.exists(QStringLiteral("xsb_aircraft.txt")))
-                {
-                    if (dir.cdUp()) { return dir.path(); }
-                }
-            }
-            while (dir.cdUp());
-            CLogMessage(this).warning(u"Failed to find CSL package for %1") << modelFile;
-            return {};
-        }
-
         bool CSimulatorXPlane::physicallyAddRemoteAircraft(const CSimulatedAircraft &newRemoteAircraft)
         {
             Q_ASSERT(isConnected());

src/plugins/simulator/xplane/simulatorxplane.h

@@ -179,9 +179,6 @@ namespace BlackSimPlugin
             void fastTimerTimeout();
             void slowTimerTimeout();
 
-            void loadCslPackages();
-            QString findCslPackage(const QString &modelFileName);
-
             //! Update remote aircraft
             //! \remark this is where the interpolated data are set
             void updateRemoteAircraft();

src/xswiftbus/org.swift_project.xswiftbus.traffic.xml

@@ -9,10 +9,6 @@ R"(<node>
     </method>
     <method name="cleanup">
     </method>
-    <method name="loadPlanesPackage">
-      <arg name="path" type="s" direction="in"/>
-      <arg type="b" direction="out"/>
-    </method>
     <method name="setDefaultIcao">
       <arg name="defaultIcao" type="s" direction="in"/>
     </method>

src/xswiftbus/traffic.cpp

@@ -85,6 +85,12 @@ namespace XSwiftBus
     {
         if (! s_legacyDataOK) { return false; }
 
+        findAllCslPackages(g_xplanePath);
+        for (const auto &package : m_cslPackages)
+        {
+            loadPlanesPackage(package);
+        }
+
         if (! m_initialized)
         {
             auto err = XPMPMultiplayerInit(preferences, preferences);
@@ -139,6 +145,34 @@ namespace XSwiftBus
         }
     }
 
+    void CTraffic::findAllCslPackages(const std::string &path)
+    {
+        char nameBuffer[65536];
+        char *indices[4096];
+        int returnedFiles;
+        int totalFiles;
+
+        // Remove trailing /
+        std::string dir = path.substr(0, path.size() - 1);
+        XPLMGetDirectoryContents(dir.c_str(), 0, nameBuffer, sizeof(nameBuffer), indices, sizeof(indices) / sizeof(char*), &totalFiles, &returnedFiles);
+        for (int i = 0; i < returnedFiles; i++)
+        {
+            std::string fileName(indices[i]);
+            if (fileName == "xsb_aircraft.txt")
+            {
+                const std::string seperator = "/\\";
+                const std::size_t sepPos = dir.find_last_of(seperator);
+                std::string parentPath = dir.substr(0, sepPos);
+                m_cslPackages.insert(parentPath);
+            }
+            else
+            {
+                std::string filePath(path + fileName + g_sep);
+                findAllCslPackages(filePath);
+            }
+        }
+    }
+
     void CTraffic::emitSimFrame()
     {
         if (m_emitSimFrame) { sendDBusSignal("simFrame"); }
@@ -526,16 +560,6 @@ namespace XSwiftBus
                     cleanup();
                 });
             }
-            else if (message.getMethodName() == "loadPlanesPackage")
-            {
-                std::string path;
-                message.beginArgumentRead();
-                message.getArgument(path);
-                queueDBusCall([ = ]()
-                {
-                    sendDBusReply(sender, serial, loadPlanesPackage(path));
-                });
-            }
             else if (message.getMethodName() == "setDefaultIcao")
             {
                 std::string defaultIcao;

src/xswiftbus/traffic.h

@@ -21,6 +21,7 @@
 #include <XPLM/XPLMDisplay.h>
 #include <functional>
 #include <utility>
+#include <set>
 
 //! \cond PRIVATE
 #define XSWIFTBUS_TRAFFIC_INTERFACENAME "org.swift_project.xswiftbus.traffic"
@@ -146,7 +147,9 @@ namespace XSwiftBus
         bool m_initialized = false;
         bool m_enabledMultiplayer = false;
         CTerrainProbe m_terrainProbe;
+        std::set<std::string> m_cslPackages;
 
+        void findAllCslPackages(const std::string &path);
         void emitSimFrame();
         void emitPlaneAdded(const std::string &callsign);
         void emitPlaneAddingFailed(const std::string &callsign);