[calamares] Refactor searching for QML dir

- Split collecting the search paths into separate function
 - Don't fall back on the current directory

src/calamares/CalamaresApplication.cpp

@@ -133,60 +133,55 @@ CalamaresApplication::mainWindow()
 }
 
 
-void
+static QStringList
-CalamaresApplication::initQmlPath()
+qmlDirCandidates( bool assumeBuilddir )
 {
-    QDir importPath;
+    static const char QML[] = "qml";
-
-    QString subpath( "qml" );
 
+    QStringList qmlDirs;
     if ( CalamaresUtils::isAppDataDirOverridden() )
-    {
+        qmlDirs << CalamaresUtils::appDataDir().absoluteFilePath( QML );
-        importPath = QDir( CalamaresUtils::appDataDir()
-                           .absoluteFilePath( subpath ) );
-        if ( !importPath.exists() || !importPath.isReadable() )
-        {
-            cError() << "FATAL: explicitly configured application data directory"
-                   << CalamaresUtils::appDataDir().absolutePath()
-                   << "does not contain a valid QML modules directory at"
-                   << importPath.absolutePath()
-                   << "\nCowardly refusing to continue startup without the QML directory.";
-            ::exit( EXIT_FAILURE );
-        }
-    }
     else
     {
-        QStringList qmlDirCandidatesByPriority;
+        if ( assumeBuilddir )
-        if ( isDebug() )
+            qmlDirs << QDir::current().absoluteFilePath( "src/qml" );  // In build-dir
-        {
+        qmlDirs << CalamaresUtils::appDataDir().absoluteFilePath( QML );
-            qmlDirCandidatesByPriority.append(
+    }
-                        QDir::current().absoluteFilePath(
-                        QString( "src/%1" )
-                            .arg( subpath ) ) );
-        }
-        qmlDirCandidatesByPriority.append( CalamaresUtils::appDataDir()
-                            .absoluteFilePath( subpath ) );
 
-        foreach ( const QString& path, qmlDirCandidatesByPriority )
+    return qmlDirs;
-        {
+}
-            QDir dir( path );
-            if ( dir.exists() && dir.isReadable() )
-            {
-                importPath = dir;
-                break;
-            }
-        }
 
-        if ( !importPath.exists() || !importPath.isReadable() )
+
+void
+CalamaresApplication::initQmlPath()
+{
+    QDir importPath;  // Right now, current-dir
+    QStringList qmlDirCandidatesByPriority = qmlDirCandidates( isDebug() );
+    bool found = false;
+
+    foreach ( const QString& path, qmlDirCandidatesByPriority )
+    {
+        QDir dir( path );
+        if ( dir.exists() && dir.isReadable() )
         {
-            cError() << "FATAL: none of the expected QML paths ("
+            importPath = dir;
-                   << qmlDirCandidatesByPriority.join( ", " )
+            found = true;
-                   << ") exist."
+            break;
-                   << "\nCowardly refusing to continue startup without the QML directory.";
-            ::exit( EXIT_FAILURE );
         }
     }
 
+    if ( !found || !importPath.exists() || !importPath.isReadable() )
+    {
+        cError() << "Cowardly refusing to continue startup without a QML directory."
+            << Logger::DebugList( qmlDirCandidatesByPriority );
+        if ( CalamaresUtils::isAppDataDirOverridden() )
+            cError() << "FATAL: explicitly configured application data directory is missing qml/";
+        else
+            cError() << "FATAL: none of the expected QML paths exist.";
+        ::exit( EXIT_FAILURE );
+    }
+
+    cDebug() << "Using Calamares QML directory" << importPath.absolutePath();
     CalamaresUtils::setQmlModulesDir( importPath );
 }