poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

core: only call QmlScanner::scanDir() on directories

Browse source 
Removes a bogus warning message.
This commit is contained in:
outfoxxed 2025-07-10 03:12:43 -07:00
parent 4b35d7b51b
commit 1af08c0c52
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/scan.cpp
View file

@ -65,8 +65,8 @@ void QmlScanner::scanDir(const QString& path) {
|| c == '_') || c == '_')
{ {
} else { } else {
qCWarning(logQmlScanner) qCWarning(logQmlScanner) << "Module path contains invalid characters for a module name: "
<< "Module path contains invalid characters for a module name: " << end; << path.sliced(this->rootPath.path().length());
goto skipadd; goto skipadd;
} }
} }
@ -170,13 +170,19 @@ bool QmlScanner::scanQmlFile(const QString& path) {
ipath = currentdir.filePath(import); ipath = currentdir.filePath(import);
} }
auto cpath = QFileInfo(ipath).canonicalFilePath(); auto pathInfo = QFileInfo(ipath);
auto cpath = pathInfo.canonicalFilePath();
if (cpath.isEmpty()) { if (cpath.isEmpty()) {
qCWarning(logQmlScanner) << "Ignoring unresolvable import" << ipath << "from" << path; qCWarning(logQmlScanner) << "Ignoring unresolvable import" << ipath << "from" << path;
continue; continue;
} }
if (!pathInfo.isDir()) {
qCDebug(logQmlScanner) << "Ignoring non-directory import" << ipath << "from" << path;
continue;
}
if (import.endsWith(".js")) this->scannedFiles.push_back(cpath); if (import.endsWith(".js")) this->scannedFiles.push_back(cpath);
else this->scanDir(cpath); else this->scanDir(cpath);
} }