napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[calamares] Refactor searching for QML dir

Browse Source 
- Split collecting the search paths into separate function
 - Don't fall back on the current directory
This commit is contained in:
Adriaan de Groot 2018-06-29 09:33:56 -04:00
parent f118fd73bc
commit 3329f2ea55
1 changed files with 40 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/calamares/CalamaresApplication.cpp
View File

@ -133,60 +133,55 @@ CalamaresApplication::mainWindow()
}
static QStringList
qmlDirCandidates( bool assumeBuilddir )
{
static const char QML[] = "qml";
QStringList qmlDirs;
if ( CalamaresUtils::isAppDataDirOverridden() )
qmlDirs << CalamaresUtils::appDataDir().absoluteFilePath( QML );
else
{
if ( assumeBuilddir )
qmlDirs << QDir::current().absoluteFilePath( "src/qml" ); // In build-dir
qmlDirs << CalamaresUtils::appDataDir().absoluteFilePath( QML );
}
return qmlDirs;
}
void
CalamaresApplication::initQmlPath()
{
QDir importPath;
QDir importPath; // Right now, current-dir
QStringList qmlDirCandidatesByPriority = qmlDirCandidates( isDebug() );
bool found = false;
QString subpath( "qml" );
if ( CalamaresUtils::isAppDataDirOverridden() )
foreach ( const QString& path, qmlDirCandidatesByPriority )
{
importPath = QDir( CalamaresUtils::appDataDir()
.absoluteFilePath( subpath ) );
if ( !importPath.exists() || !importPath.isReadable() )
QDir dir( path );
if ( dir.exists() && dir.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 ( isDebug() )
{
qmlDirCandidatesByPriority.append(
QDir::current().absoluteFilePath(
QString( "src/%1" )
.arg( subpath ) ) );
}
qmlDirCandidatesByPriority.append( CalamaresUtils::appDataDir()
.absoluteFilePath( subpath ) );
foreach ( const QString& path, qmlDirCandidatesByPriority )
{
QDir dir( path );
if ( dir.exists() && dir.isReadable() )
{
importPath = dir;
break;
}
}
if ( !importPath.exists() || !importPath.isReadable() )
{
cError() << "FATAL: none of the expected QML paths ("
<< qmlDirCandidatesByPriority.join( ", " )
<< ") exist."
<< "\nCowardly refusing to continue startup without the QML directory.";
::exit( EXIT_FAILURE );
importPath = dir;
found = true;
break;
}
}
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 );
}