parent
ac5fa6b875
commit
46ceb4d1d8
|
@ -56,7 +56,7 @@ bool AppConfig::exportConfig(const QString &fileName)
|
|||
if(fileName.isEmpty())
|
||||
return false;
|
||||
QSettings newConfig(fileName, JSON);
|
||||
for (const auto &key : newConfig.allKeys())
|
||||
for (const auto &key : get()->appConfig->allKeys())
|
||||
newConfig.setValue(key, get()->appConfig->value(key));
|
||||
newConfig.sync();
|
||||
return true;
|
||||
|
|
|
@ -102,14 +102,25 @@ void SystemManifest::exportManifest(DatabaseConnection* db, const QString& outpu
|
|||
|
||||
os = QSysInfo::kernelType(); // may need to check possible answers, or maybe just compare to new system value?
|
||||
QString basePath = QDir(outputDirPath).path();
|
||||
|
||||
if (options.exportConfig) {
|
||||
Q_EMIT onStatusUpdate(tr("Exporting settings"));
|
||||
configPath = QStringLiteral("config.json");
|
||||
AppConfig::exportConfig(m_fileTemplate.arg(basePath, configPath));
|
||||
}
|
||||
|
||||
m_pathToManifest = QStringLiteral("%1/system.json").arg(basePath);
|
||||
if (options.exportDb) {
|
||||
Q_EMIT onStatusUpdate(tr("Exporting Evidence"));
|
||||
dbPath = QStringLiteral("db.sqlite");
|
||||
evidenceManifestPath = QStringLiteral("evidence.json");
|
||||
auto allEvidence = DatabaseConnection::createEvidenceExportView(m_fileTemplate.arg(basePath, dbPath), EvidenceFilters(), db);
|
||||
Q_EMIT onReady(allEvidence.size());
|
||||
porting::EvidenceManifest evidenceManifest = copyEvidence(basePath, allEvidence);
|
||||
// write evidence manifest
|
||||
FileHelpers::writeFile(m_fileTemplate.arg(basePath, evidenceManifestPath),
|
||||
QJsonDocument(EvidenceManifest::serialize(evidenceManifest)).toJson());
|
||||
}
|
||||
|
||||
m_pathToManifest = QStringLiteral("%1/system.json").arg(basePath);
|
||||
FileHelpers::writeFile(m_pathToManifest, QJsonDocument(serialize(*this)).toJson());
|
||||
Q_EMIT onComplete();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue