comparison base/HelperExecPath.cpp @ 1246:75aefcc9f07d piper

Use plugin scan results to inform the list requests issued to Piper servers

 #include <QCoreApplication>
 #include <QFile>
 #include <QDir>
 #include <QFileInfo>
 
-static QStringList
-getSuffixes()
+QStringList
+HelperExecPath::getTags()
 {
     if (sizeof(void *) == 8) {
-        return { "-64", "", "-32" };
+        if (m_type == NativeArchitectureOnly) {
+            return { "64", "" };
+        } else {
+            return { "64", "", "32" };
+        }
     } else {
-        return { "", "-32" };
+        return { "", "32" };
     }
 }
 
 static bool
 isGood(QString path)
 {
     return QFile(path).exists() && QFileInfo(path).isExecutable();
 }
 
-QStringList
+QList<HelperExecPath::HelperExec>
 HelperExecPath::getHelperExecutables(QString basename)
 {
     QStringList dummy;
     return search(basename, dummy);
 }
 
 QString
 HelperExecPath::getHelperExecutable(QString basename)
 {
-    QStringList execs = getHelperExecutables(basename);
+    auto execs = getHelperExecutables(basename);
     if (execs.empty()) return "";
-    else return execs[0];
+    else return execs[0].executable;
 }
 
 QStringList
 HelperExecPath::getHelperDirPaths()
 {

     QStringList candidates;
     (void)search(basename, candidates);
     return candidates;
 }
 
-QStringList
+QList<HelperExecPath::HelperExec>
 HelperExecPath::search(QString basename, QStringList &candidates)
 {
     // Helpers are expected to exist either in the same directory as
     // this executable was found, or in a subdirectory called helpers.
 
     QString extension = "";
 #ifdef _WIN32
     extension = ".exe";
 #endif
 
-    QStringList executables;
+    QList<HelperExec> executables;
     QStringList dirs = getHelperDirPaths();
     
-    for (QString s: getSuffixes()) {
+    for (QString t: getTags()) {
         for (QString d: dirs) {
-            QString path = d + QDir::separator() + basename + s + extension;
+            QString path = d + QDir::separator() + basename;
+            if (t != QString()) path += "-" + t;
+            path += extension;
             candidates.push_back(path);
             if (isGood(path)) {
-                executables.push_back(path);
+                executables.push_back({ path, t });
                 break;
             }
         }
     }