comparison src/plugincandidates.cpp @ 24:24b1d94440f5

Debug output improvements, and make the checker actually attempt to call the descriptor function for known plugin types

 }
 
 void
 PluginCandidates::log(string message)
 {
-    if (m_logCallback) m_logCallback->log("PluginCandidates: " + message);
+    if (m_logCallback) {
+        m_logCallback->log("PluginCandidates: " + message);
+    } else {
+        cerr << "PluginCandidates: " << message << endl;
+    }
 }
 
 vector<string>
 PluginCandidates::getLibrariesInPath(vector<string> path)
 {
     vector<string> candidates;
 
     for (string dirname: path) {
 
-        log("scanning directory " + dirname + "\n");
+        log("scanning directory " + dirname);
 
         QDir dir(dirname.c_str(), PLUGIN_GLOB,
                  QDir::Name | QDir::IgnoreCase,
                  QDir::Files | QDir::Readable);
 

             // Helper bailed out for some reason presumably associated
             // with the plugin following the last one it reported
             // on. Add a failure entry for that one and continue with
             // the following ones.
             string failed = *(remaining.rbegin() + shortfall - 1);
-            log("helper output ended before result for plugin " + failed + "\n");
+            log("helper output ended before result for plugin " + failed);
             result.push_back("FAILURE|" + failed + "|Plugin load check failed or timed out");
             remaining = vector<string>
                 (remaining.rbegin(), remaining.rbegin() + shortfall - 1);
         }
         ++runcount;

 vector<string>
 PluginCandidates::runHelper(vector<string> libraries, string descriptor)
 {
     vector<string> output;
 
-    log("running helper " + m_helper + " with following library list:\n");
-    for (auto &lib: libraries) log(lib + "\n");
+    log("running helper " + m_helper + " with following library list:");
+    for (auto &lib: libraries) log(lib);
 
     QProcess process;
     process.setReadChannel(QProcess::StandardOutput);
     process.setProcessChannelMode(QProcess::ForwardedErrorChannel);
     process.start(m_helper.c_str(), { descriptor.c_str() });

         if (linelen > 0) {
             output.push_back(buf);
             done = (output.size() == libraries.size());
         } else if (linelen < 0) {
             // error case
-            log("received error code while reading from helper\n");
+            log("received error code while reading from helper");
             done = true;
         } else {
             // no error, but no line read (could just be between
             // lines, or could be eof)
             done = (process.state() == QProcess::NotRunning);
             if (!done) {
                 if (t.elapsed() > timeout) {
                     // this is purely an emergency measure
-                    log("timeout: helper took too long, killing it\n");
+                    log("timeout: helper took too long, killing it");
                     process.kill();
                     done = true;
                 } else {
                     process.waitForReadyRead(200);
                 }

     if (process.state() != QProcess::NotRunning) {
         process.close();
         process.waitForFinished();
     }
 
-    log("helper completed\n");
+    log("helper completed");
     
     return output;
 }
 
 void

     for (auto &r: result) {
 
         QString s(r.c_str());
         QStringList bits = s.split("|");
 
-        log("read output line from helper: " + r);
+        log(("read output line from helper: " + s.trimmed()).toStdString());
         
         if (bits.size() < 2 || bits.size() > 3) {
-            log("invalid output line (wrong number of |-separated fields)\n");
+            log("invalid output line (wrong number of |-separated fields)");
             continue;
         }
 
         string status = bits[0].toStdString();
         

 
         } else if (status == "FAILURE") {
             m_failures[tag].push_back({ library, message });
 
         } else {
-            log("unexpected status \"" + status + "\" in output line\n");
-        }
-    }
-}
-
+            log("unexpected status \"" + status + "\" in output line");
+        }
+    }
+}
+