Skip to content

[codex] Add QtMesh Cloud asset upload client #695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fernandotonon merged 4 commits into from
May 28, 2026
Merged

[codex] Add QtMesh Cloud asset upload client #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5974421
feat(scan): add --target alias for platform profiles (#363)
fernandotonon May 28, 2026
6f53e9c
fix(tests): avoid scan JSON stdout in report test
fernandotonon May 28, 2026
7a4004a
Add QtMesh Cloud asset upload client
fernandotonon May 28, 2026
4dd6f06
Stream QtMesh Cloud file uploads
fernandotonon May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions src/CLIPipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,7 @@ void CLIPipeline::printUsage()
" material --list-presets List the built-in preset names\n"
"\n"
"Scan options:\n"
" --target <id> Alias for --profile (CI-friendly). Built-in targets include: example-minimal, example-base\n"
" --profile <id> Built-in platform profile (e.g. example-minimal) or path to .json\n"
" --list-profiles List built-in platform profile ids and exit\n"
" --config <file> Config file (default: qtmesh.yml, qtmesh.json)\n"
Expand Down Expand Up @@ -3774,6 +3775,7 @@ int CLIPipeline::cmdScan(int argc, char* argv[])
QString scanRoot;
QString configPath;
QString profileIdArg;
QString targetIdArg;
bool listProfiles = false;
QString tokenArg;
bool strictUpload = false;
Expand Down Expand Up @@ -3877,7 +3879,10 @@ int CLIPipeline::cmdScan(int argc, char* argv[])
if (arg == "--no-upload") { noUpload = true; continue; }
if (arg == "--list-profiles") { listProfiles = true; continue; }
QString value;
ParseValueResult parseResult = parseValueArg(arg, "--profile", i, value);
ParseValueResult parseResult = parseValueArg(arg, "--target", i, value);
if (parseResult == ParseValueResult::Error) return 2;
if (parseResult == ParseValueResult::Matched) { targetIdArg = value; continue; }
parseResult = parseValueArg(arg, "--profile", i, value);
if (parseResult == ParseValueResult::Error) return 2;
if (parseResult == ParseValueResult::Matched) { profileIdArg = value; continue; }
parseResult = parseValueArg(arg, "--config", i, value);
Expand Down Expand Up @@ -4054,6 +4059,7 @@ int CLIPipeline::cmdScan(int argc, char* argv[])
// 4) CLI flags (below)
ScanConfig config = ScanConfig::defaults();
QVariantMap projectRoot;
QString activeProfileId;

if (!configPath.isEmpty()) {
if (!QFileInfo::exists(configPath)) {
Expand Down Expand Up @@ -4109,6 +4115,15 @@ int CLIPipeline::cmdScan(int argc, char* argv[])
}

QString profileId = profileIdArg.trimmed();
const QString targetId = targetIdArg.trimmed();
if (!targetId.isEmpty()) {
if (!profileId.isEmpty() && profileId != targetId) {
err() << "Error: --target and --profile both provided with different values ("
<< targetId << " vs " << profileId << ")" << Qt::endl;
return 2;
}
profileId = targetId;
}
if (profileId.isEmpty())
profileId = projectRoot.value(QStringLiteral("profile")).toString().trimmed();

Expand All @@ -4123,6 +4138,7 @@ int CLIPipeline::cmdScan(int argc, char* argv[])
for (const QString& w : loaded.warnings)
err() << "Warning: " << w << Qt::endl;
applyPlatformProfile(config, loaded.profile);
activeProfileId = loaded.profile.id;
err() << "Note: Using platform profile '" << loaded.profile.id << "'." << Qt::endl;
SentryReporter::addBreadcrumb(QStringLiteral("cli.scan"),
QStringLiteral("platform profile=%1").arg(loaded.profile.id));
Expand Down Expand Up @@ -4292,12 +4308,16 @@ int CLIPipeline::cmdScan(int argc, char* argv[])
}
}

const QJsonObject reportJson = ScanEngine::scanReportToJsonObject(result);
QJsonObject reportJson = ScanEngine::scanReportToJsonObject(result);
if (!activeProfileId.isEmpty())
reportJson.insert(QStringLiteral("profile"), activeProfileId);

// Output to terminal
if (jsonOutput) {
cliWrite(QString::fromUtf8(QJsonDocument(reportJson).toJson(QJsonDocument::Indented)) + "\n");
} else {
if (!activeProfileId.isEmpty())
cliWrite(QStringLiteral("Profile: %1\n").arg(activeProfileId));
cliWrite(formatScanSummary(result, colorizeTextOutput));
}

Expand All @@ -4315,7 +4335,7 @@ int CLIPipeline::cmdScan(int argc, char* argv[])
QFile f(sarifPath);
QDir().mkpath(QFileInfo(sarifPath).path());
if (f.open(QIODevice::WriteOnly | QIODevice::Text))
f.write(ScanEngine::formatSarif(result).toUtf8());
f.write(ScanEngine::formatSarif(result, activeProfileId).toUtf8());
else
err() << "Warning: Could not write SARIF report to " << sarifPath << Qt::endl;
}
Expand All @@ -4326,7 +4346,7 @@ int CLIPipeline::cmdScan(int argc, char* argv[])
QDir().mkpath(QFileInfo(config.reportOutput).path());
if (f.open(QIODevice::WriteOnly | QIODevice::Text)) {
if (config.reportFormat == "text")
f.write(ScanEngine::formatText(result, config, false).toUtf8());
f.write(ScanEngine::formatText(result, config, false, activeProfileId).toUtf8());
else
f.write(QJsonDocument(reportJson).toJson(QJsonDocument::Indented));
}
Expand All @@ -4335,7 +4355,7 @@ int CLIPipeline::cmdScan(int argc, char* argv[])
QFile f(config.sarifOutput);
QDir().mkpath(QFileInfo(config.sarifOutput).path());
if (f.open(QIODevice::WriteOnly | QIODevice::Text))
f.write(ScanEngine::formatSarif(result).toUtf8());
f.write(ScanEngine::formatSarif(result, activeProfileId).toUtf8());
}

bool uploadOk = true;
Expand Down
13 changes: 11 additions & 2 deletions src/CLIPipeline_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2606,8 +2606,9 @@ TEST(CLIPipelineCmdScan, WritesJsonAndSarifReports)
QByteArray configBa = configPath.toUtf8();
QByteArray reportBa = reportPath.toUtf8();
QByteArray sarifBa = sarifPath.toUtf8();
TestArgv args({"qtmesh", "scan", rootBa.constData(), "--config", configBa.constData(),
"--json", "--report", reportBa.constData(), "--sarif", sarifBa.constData(),
TestArgv args({"qtmesh", "scan", rootBa.constData(), "--target", "example-minimal",
"--config", configBa.constData(),
"--report", reportBa.constData(), "--sarif", sarifBa.constData(),
"--fail-on", "never"});

EXPECT_EQ(CLIPipeline::cmdScan(args.argc(), args.argv()), 0);
Expand All @@ -2621,6 +2622,7 @@ TEST(CLIPipelineCmdScan, WritesJsonAndSarifReports)
EXPECT_TRUE(reportContent.contains("\"assets\""));
EXPECT_TRUE(reportContent.contains("\"scanStartedUtc\""));
EXPECT_TRUE(reportContent.contains("\"scanCompletedUtc\""));
EXPECT_TRUE(reportContent.contains("\"profile\": \"example-minimal\""));

QFile sarifFile(sarifPath);
ASSERT_TRUE(sarifFile.open(QIODevice::ReadOnly | QIODevice::Text));
Expand All @@ -2629,6 +2631,13 @@ TEST(CLIPipelineCmdScan, WritesJsonAndSarifReports)
EXPECT_TRUE(sarifContent.contains("qtmesh scan"));
EXPECT_TRUE(sarifContent.contains("\"startTimeUtc\""));
EXPECT_TRUE(sarifContent.contains("\"endTimeUtc\""));
EXPECT_TRUE(sarifContent.contains("\"profile\": \"example-minimal\""));
}

TEST(CLIPipelineCmdScanError, UnknownTargetReturns2)
{
TestArgv args({"qtmesh", "scan", "--target", "no-such-target"});
EXPECT_EQ(CLIPipeline::cmdScan(args.argc(), args.argv()), 2);
}

TEST(CLIPipelineCmdScan, ReportAndSarifAreWrittenWithFailOnNever)
Expand Down
Loading
Loading