kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

All: Reformat according to new standard

Browse Source
This commit is contained in:
pre-commit-ci[bot]
2025-11-11 13:49:01 +01:00
committed by Kacper Donat
parent eafd18dac0
commit 25c3ba7338
2390 changed files with 154630 additions and 115818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

383
src/Gui/DocumentRecovery.cpp
View File

@@ -25,25 +25,25 @@
// implement xml meta file
# include <boost/interprocess/sync/file_lock.hpp>
# include <QApplication>
# include <QCloseEvent>
# include <QDateTime>
# include <QDebug>
# include <QDir>
# include <QDomDocument>
# include <QFileInfo>
# include <QHeaderView>
# include <QList>
# include <QMap>
# include <QMenu>
# include <QMessageBox>
# include <QSet>
# include <QTextStream>
# include <QTreeWidgetItem>
# include <QXmlStreamReader>
# include <QVector>
# include <sstream>
#include <boost/interprocess/sync/file_lock.hpp>
#include <QApplication>
#include <QCloseEvent>
#include <QDateTime>
#include <QDebug>
#include <QDir>
#include <QDomDocument>
#include <QFileInfo>
#include <QHeaderView>
#include <QList>
#include <QMap>
#include <QMenu>
#include <QMessageBox>
#include <QSet>
#include <QTextStream>
#include <QTreeWidgetItem>
#include <QXmlStreamReader>
#include <QVector>
#include <sstream>
#include <FCConfig.h>
@@ -69,91 +69,95 @@ using namespace Gui::Dialog;
namespace sp = std::placeholders;
// taken from the script doctools.py
std::string DocumentRecovery::doctools =
"import os,sys,string\n"
"import xml.sax\n"
"import xml.sax.handler\n"
"import xml.sax.xmlreader\n"
"import zipfile\n"
"\n"
"# SAX handler to parse the Document.xml\n"
"class DocumentHandler(xml.sax.handler.ContentHandler):\n"
" def __init__(self, dirname):\n"
" self.files = []\n"
" self.dirname = dirname\n"
"\n"
" def startElement(self, name, attributes):\n"
" if name == 'XLink':\n"
" return\n"
" item=attributes.get(\"file\")\n"
" if item:\n"
" self.files.append(os.path.join(self.dirname,str(item)))\n"
"\n"
" def characters(self, data):\n"
" return\n"
"\n"
" def endElement(self, name):\n"
" return\n"
"\n"
"def extractDocument(filename, outpath):\n"
" zfile=zipfile.ZipFile(filename)\n"
" files=zfile.namelist()\n"
"\n"
" for i in files:\n"
" data=zfile.read(i)\n"
" dirs=i.split(\"/\")\n"
" if len(dirs) > 1:\n"
" dirs.pop()\n"
" curpath=outpath\n"
" for j in dirs:\n"
" curpath=curpath+\"/\"+j\n"
" os.mkdir(curpath)\n"
" output=open(outpath+\"/\"+i,\'wb\')\n"
" output.write(data)\n"
" output.close()\n"
"\n"
"def createDocument(filename, outpath):\n"
" files=getFilesList(filename)\n"
" dirname=os.path.dirname(filename)\n"
" guixml=os.path.join(dirname,\"GuiDocument.xml\")\n"
" if os.path.exists(guixml):\n"
" files.extend(getFilesList(guixml))\n"
" compress=zipfile.ZipFile(outpath,\'w\',zipfile.ZIP_DEFLATED)\n"
" for i in files:\n"
" dirs=os.path.split(i)\n"
" #print i, dirs[-1]\n"
" compress.write(i,dirs[-1],zipfile.ZIP_DEFLATED)\n"
" compress.close()\n"
"\n"
"def getFilesList(filename):\n"
" dirname=os.path.dirname(filename)\n"
" handler=DocumentHandler(dirname)\n"
" parser=xml.sax.make_parser()\n"
" parser.setContentHandler(handler)\n"
" parser.parse(filename)\n"
"\n"
" files=[]\n"
" files.append(filename)\n"
" files.extend(iter(handler.files))\n"
" return files\n"
;
std::string DocumentRecovery::doctools
= "import os,sys,string\n"
"import xml.sax\n"
"import xml.sax.handler\n"
"import xml.sax.xmlreader\n"
"import zipfile\n"
"\n"
"# SAX handler to parse the Document.xml\n"
"class DocumentHandler(xml.sax.handler.ContentHandler):\n"
" def __init__(self, dirname):\n"
" self.files = []\n"
" self.dirname = dirname\n"
"\n"
" def startElement(self, name, attributes):\n"
" if name == 'XLink':\n"
" return\n"
" item=attributes.get(\"file\")\n"
" if item:\n"
" self.files.append(os.path.join(self.dirname,str(item)))\n"
"\n"
" def characters(self, data):\n"
" return\n"
"\n"
" def endElement(self, name):\n"
" return\n"
"\n"
"def extractDocument(filename, outpath):\n"
" zfile=zipfile.ZipFile(filename)\n"
" files=zfile.namelist()\n"
"\n"
" for i in files:\n"
" data=zfile.read(i)\n"
" dirs=i.split(\"/\")\n"
" if len(dirs) > 1:\n"
" dirs.pop()\n"
" curpath=outpath\n"
" for j in dirs:\n"
" curpath=curpath+\"/\"+j\n"
" os.mkdir(curpath)\n"
" output=open(outpath+\"/\"+i,\'wb\')\n"
" output.write(data)\n"
" output.close()\n"
"\n"
"def createDocument(filename, outpath):\n"
" files=getFilesList(filename)\n"
" dirname=os.path.dirname(filename)\n"
" guixml=os.path.join(dirname,\"GuiDocument.xml\")\n"
" if os.path.exists(guixml):\n"
" files.extend(getFilesList(guixml))\n"
" compress=zipfile.ZipFile(outpath,\'w\',zipfile.ZIP_DEFLATED)\n"
" for i in files:\n"
" dirs=os.path.split(i)\n"
" #print i, dirs[-1]\n"
" compress.write(i,dirs[-1],zipfile.ZIP_DEFLATED)\n"
" compress.close()\n"
"\n"
"def getFilesList(filename):\n"
" dirname=os.path.dirname(filename)\n"
" handler=DocumentHandler(dirname)\n"
" parser=xml.sax.make_parser()\n"
" parser.setContentHandler(handler)\n"
" parser.parse(filename)\n"
"\n"
" files=[]\n"
" files.append(filename)\n"
" files.extend(iter(handler.files))\n"
" return files\n";
namespace Gui { namespace Dialog {
namespace Gui
{
namespace Dialog
{
class DocumentRecoveryPrivate
{
public:
using XmlConfig = QMap<QString, QString>;
enum Status {
Unknown = 0, /*!< The file is not available */
Created = 1, /*!< The file was created but not processed so far*/
Overage = 2, /*!< The recovery file is older than the actual project file */
enum Status
{
Unknown = 0, /*!< The file is not available */
Created = 1, /*!< The file was created but not processed so far*/
Overage = 2, /*!< The recovery file is older than the actual project file */
Corrupted = 3, /*!< The original file is corrupted */
Success = 4, /*!< The file could be recovered */
Failure = 5 /*!< The file could not be recovered */
Success = 4, /*!< The file could be recovered */
Failure = 5 /*!< The file could not be recovered */
};
struct Info {
struct Info
{
QString projectFile;
QString xmlFile;
QString label;
@@ -171,15 +175,15 @@ public:
XmlConfig readXmlFile(const QString& fn) const;
};
}
}
} // namespace Dialog
} // namespace Gui
DocumentRecovery::DocumentRecovery(const QList<QFileInfo>& dirs, QWidget* parent)
: QDialog(parent), d_ptr(new DocumentRecoveryPrivate())
: QDialog(parent)
, d_ptr(new DocumentRecoveryPrivate())
{
d_ptr->ui.setupUi(this);
connect(d_ptr->ui.buttonCleanup, &QPushButton::clicked,
this, &DocumentRecovery::onButtonCleanupClicked);
connect(d_ptr->ui.buttonCleanup, &QPushButton::clicked, this, &DocumentRecovery::onButtonCleanupClicked);
d_ptr->ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Start Recovery"));
d_ptr->ui.treeWidget->header()->setSectionResizeMode(QHeaderView::Stretch);
@@ -188,8 +192,8 @@ DocumentRecovery::DocumentRecovery(const QList<QFileInfo>& dirs, QWidget* parent
for (QList<QFileInfo>::const_iterator it = dirs.begin(); it != dirs.end(); ++it) {
DocumentRecoveryPrivate::Info info = d_ptr->getRecoveryInfo(*it);
if (info.status == DocumentRecoveryPrivate::Created ||
info.status == DocumentRecoveryPrivate::Corrupted) {
if (info.status == DocumentRecoveryPrivate::Created
|| info.status == DocumentRecoveryPrivate::Corrupted) {
d_ptr->recoveryInfo << info;
auto item = new QTreeWidgetItem(d_ptr->ui.treeWidget);
@@ -197,8 +201,9 @@ DocumentRecovery::DocumentRecovery(const QList<QFileInfo>& dirs, QWidget* parent
item->setToolTip(0, info.tooltip);
if (info.status == DocumentRecoveryPrivate::Corrupted) {
item->setText(1, tr("Original file corrupted"));
item->setForeground(1, QColor(170,0,0)); // TODO: Don't hardcode colors
} else {
item->setForeground(1, QColor(170, 0, 0)); // TODO: Don't hardcode colors
}
else {
item->setText(1, tr("Not yet recovered"));
}
item->setToolTip(1, info.projectFile);
@@ -225,8 +230,8 @@ QString DocumentRecovery::createProjectFile(const QString& documentXml)
std::stringstream str;
str << doctools << "\n";
str << "createDocument(\"" << (const char*)source.toUtf8()
<< "\", \"" << (const char*)dest.toUtf8() << "\")";
str << "createDocument(\"" << (const char*)source.toUtf8() << "\", \""
<< (const char*)dest.toUtf8() << "\")";
Gui::Command::runCommand(Gui::Command::App, str.str().c_str());
return dest;
@@ -249,15 +254,16 @@ void DocumentRecovery::accept()
int index = 0;
std::vector<int> indices;
std::vector<std::string> filenames, paths, labels, errs;
for (auto &info : d->recoveryInfo) {
for (auto& info : d->recoveryInfo) {
QString errorInfo;
QTreeWidgetItem* item = d_ptr->ui.treeWidget->topLevelItem(index);
try {
QString file = info.projectFile;
QFileInfo fi(file);
if (fi.fileName() == QLatin1String("Document.xml"))
if (fi.fileName() == QLatin1String("Document.xml")) {
file = createProjectFile(info.projectFile);
}
paths.emplace_back(file.toUtf8().constData());
filenames.emplace_back(info.fileName.toUtf8().constData());
@@ -280,39 +286,41 @@ void DocumentRecovery::accept()
if (item) {
item->setText(1, tr("Failed to recover"));
item->setToolTip(1, errorInfo);
item->setForeground(1, QColor(170,0,0));
item->setForeground(1, QColor(170, 0, 0));
}
d->writeRecoveryInfo(info);
}
}
auto docs = App::GetApplication().openDocuments(filenames,&paths,&labels,&errs);
auto docs = App::GetApplication().openDocuments(filenames, &paths, &labels, &errs);
for (size_t i = 0; i < docs.size(); ++i) {
auto &info = d->recoveryInfo[indices[i]];
auto& info = d->recoveryInfo[indices[i]];
QTreeWidgetItem* item = d_ptr->ui.treeWidget->topLevelItem(indices[i]);
if (!docs[i] || !errs[i].empty()) {
if (docs[i])
if (docs[i]) {
App::GetApplication().closeDocument(docs[i]->getName());
}
info.status = DocumentRecoveryPrivate::Failure;
if (item) {
item->setText(1, tr("Failed to recover"));
item->setToolTip(1, QString::fromUtf8(errs[i].c_str()));
item->setForeground(1, QColor(170,0,0));
item->setForeground(1, QColor(170, 0, 0));
}
// write back current status
d->writeRecoveryInfo(info);
}
else {
auto gdoc = Application::Instance->getDocument(docs[i]);
if (gdoc)
if (gdoc) {
gdoc->setModified(true);
}
info.status = DocumentRecoveryPrivate::Success;
if (item) {
item->setText(1, tr("Successfully recovered"));
item->setForeground(1, QColor(0,170,0));
item->setForeground(1, QColor(0, 170, 0));
}
QDir transDir(QString::fromUtf8(docs[i]->TransientDir.getValue()));
@@ -323,21 +331,22 @@ void DocumentRecovery::accept()
if (fi.fileName() == QLatin1String("fc_recovery_file.fcstd")) {
transDir.remove(fi.fileName());
res = transDir.rename(fi.absoluteFilePath(),fi.fileName());
res = transDir.rename(fi.absoluteFilePath(), fi.fileName());
}
else {
transDir.rmdir(fi.dir().dirName());
res = transDir.rename(fi.absolutePath(),fi.dir().dirName());
res = transDir.rename(fi.absolutePath(), fi.dir().dirName());
}
if (res) {
transDir.remove(xfi.fileName());
res = transDir.rename(xfi.absoluteFilePath(),xfi.fileName());
res = transDir.rename(xfi.absoluteFilePath(), xfi.fileName());
}
if (!res) {
FC_WARN("Failed to move recovery file of document '"
<< docs[i]->Label.getValue() << "'");
FC_WARN(
"Failed to move recovery file of document '" << docs[i]->Label.getValue() << "'"
);
}
else {
DocumentRecoveryCleaner().clearDirectory(QFileInfo(xfi.absolutePath()));
@@ -364,30 +373,30 @@ void DocumentRecoveryPrivate::writeRecoveryInfo(const DocumentRecoveryPrivate::I
QFile file(info.xmlFile);
if (file.open(QFile::WriteOnly)) {
QTextStream str(&file);
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
str.setCodec("UTF-8");
#endif
str << "<?xml version='1.0' encoding='utf-8'?>\n"
<< "<AutoRecovery SchemaVersion=\"1\">\n";
switch (info.status) {
case Created:
str << " <Status>Created</Status>\n";
break;
case Overage:
str << " <Status>Deprecated</Status>\n";
break;
case Corrupted:
str << " <Status>Corrupted</Status>\n";
break;
case Success:
str << " <Status>Success</Status>\n";
break;
case Failure:
str << " <Status>Failure</Status>\n";
break;
default:
str << " <Status>Unknown</Status>\n";
break;
case Created:
str << " <Status>Created</Status>\n";
break;
case Overage:
str << " <Status>Deprecated</Status>\n";
break;
case Corrupted:
str << " <Status>Corrupted</Status>\n";
break;
case Success:
str << " <Status>Success</Status>\n";
break;
case Failure:
str << " <Status>Failure</Status>\n";
break;
default:
str << " <Status>Unknown</Status>\n";
break;
}
str << " <Label>" << info.label << "</Label>\n";
str << " <FileName>" << info.fileName << "</FileName>\n";
@@ -401,7 +410,7 @@ DocumentRecoveryPrivate::Info DocumentRecoveryPrivate::getRecoveryInfo(const QFi
{
DocumentRecoveryPrivate::Info info;
info.status = DocumentRecoveryPrivate::Unknown;
info.label = qApp->translate("StdCmdNew","Unnamed");
info.label = qApp->translate("StdCmdNew", "Unnamed");
QString file;
QDir doc_dir(fi.absoluteFilePath());
@@ -435,21 +444,25 @@ DocumentRecoveryPrivate::Info DocumentRecoveryPrivate::getRecoveryInfo(const QFi
if (cfg.contains(QStringLiteral("Status"))) {
QString status = cfg[QStringLiteral("Status")];
if (status == QLatin1String("Deprecated"))
if (status == QLatin1String("Deprecated")) {
info.status = DocumentRecoveryPrivate::Overage;
if (status == QLatin1String("Corrupted"))
}
if (status == QLatin1String("Corrupted")) {
info.status = DocumentRecoveryPrivate::Corrupted;
else if (status == QLatin1String("Success"))
}
else if (status == QLatin1String("Success")) {
info.status = DocumentRecoveryPrivate::Success;
else if (status == QLatin1String("Failure"))
}
else if (status == QLatin1String("Failure")) {
info.status = DocumentRecoveryPrivate::Failure;
}
}
if (info.status == DocumentRecoveryPrivate::Created) {
// compare the modification dates
QFileInfo fileInfo(info.fileName);
if (!info.fileName.isEmpty()) {
if (isValidProject(fileInfo)) {
if (isValidProject(fileInfo)) {
QDateTime dateRecv = QFileInfo(file).lastModified();
QDateTime dateProj = fileInfo.lastModified();
if (dateRecv < dateProj) {
@@ -459,7 +472,8 @@ DocumentRecoveryPrivate::Info DocumentRecoveryPrivate::getRecoveryInfo(const QFi
<< " because it is older than the project file"
<< info.fileName.toUtf8() << "\n";
}
} else {
}
else {
info.status = DocumentRecoveryPrivate::Corrupted;
writeRecoveryInfo(info);
qWarning() << "Original project file is corrupted: " << info.fileName << "\n";
@@ -491,15 +505,20 @@ bool zipDataIsValid(const QString& zipData)
return false;
}
return true;
} catch (...) {
}
catch (...) {
return false;
}
}
static zipios::ConstEntryPointer findEntry(zipios::ZipFile& zf, const std::string &name) {
static zipios::ConstEntryPointer findEntry(zipios::ZipFile& zf, const std::string& name)
{
auto entries = zf.entries();
for (auto it = entries.begin(); it != entries.end(); ++it)
if ((*it)->getName() == name) return *it;
for (auto it = entries.begin(); it != entries.end(); ++it) {
if ((*it)->getName() == name) {
return *it;
}
}
return {};
}
@@ -517,7 +536,9 @@ bool xmlFilesAreValid(const QString& fcstdFile)
bytes.resize(0);
std::string tmp((std::istreambuf_iterator<char>(*s)), std::istreambuf_iterator<char>());
QXmlStreamReader xr(QByteArray(tmp.data(), int(tmp.size())));
while (!xr.atEnd()) xr.readNext();
while (!xr.atEnd()) {
xr.readNext();
}
if (xr.hasError()) {
return false;
}
@@ -528,14 +549,17 @@ bool xmlFilesAreValid(const QString& fcstdFile)
auto s = zf.getInputStream(gui);
std::string tmp((std::istreambuf_iterator<char>(*s)), std::istreambuf_iterator<char>());
QXmlStreamReader xr(QByteArray(tmp.data(), int(tmp.size())));
while (!xr.atEnd()) xr.readNext();
while (!xr.atEnd()) {
xr.readNext();
}
if (xr.hasError()) {
return false;
}
}
return true;
} catch (...) {
}
catch (...) {
return false;
}
}
@@ -563,10 +587,11 @@ DocumentRecoveryPrivate::XmlConfig DocumentRecoveryPrivate::readXmlFile(const QS
DocumentRecoveryPrivate::XmlConfig cfg;
QDomDocument domDocument;
QFile file(fn);
if (!file.open(QFile::ReadOnly))
if (!file.open(QFile::ReadOnly)) {
return cfg;
}
#if QT_VERSION >= QT_VERSION_CHECK(6,5,0)
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
if (!domDocument.setContent(&file, QDomDocument::ParseOption::UseNamespaceProcessing)) {
return cfg;
}
@@ -575,8 +600,7 @@ DocumentRecoveryPrivate::XmlConfig DocumentRecoveryPrivate::readXmlFile(const QS
int errorLine;
int errorColumn;
if (!domDocument.setContent(&file, true, &errorStr, &errorLine,
&errorColumn)) {
if (!domDocument.setContent(&file, true, &errorStr, &errorLine, &errorColumn)) {
return cfg;
}
#endif
@@ -599,8 +623,9 @@ DocumentRecoveryPrivate::XmlConfig DocumentRecoveryPrivate::readXmlFile(const QS
while (!child.isNull()) {
QString name = child.localName();
const QString value = child.text();
if (filter.contains(name))
if (filter.contains(name)) {
cfg[name] = value;
}
child = child.nextSiblingElement();
}
}
@@ -624,12 +649,16 @@ void DocumentRecovery::onDeleteSection()
msgBox.setIcon(QMessageBox::Warning);
msgBox.setWindowTitle(tr("Cleanup"));
msgBox.setText(tr("Delete the selected transient directories?"));
msgBox.setInformativeText(tr("When deleting the selected transient directory it is not possible to recover any files afterwards."));
msgBox.setInformativeText(
tr("When deleting the selected transient directory it is not possible to recover any files "
"afterwards.")
);
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::No);
int ret = msgBox.exec();
if (ret == QMessageBox::No)
if (ret == QMessageBox::No) {
return;
}
QList<QTreeWidgetItem*> items = d_ptr->ui.treeWidget->selectedItems();
QDir tmp = QString::fromUtf8(App::Application::getUserCachePath().c_str());
@@ -660,8 +689,9 @@ void DocumentRecovery::onButtonCleanupClicked()
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::No);
int ret = msgBox.exec();
if (ret == QMessageBox::No)
if (ret == QMessageBox::No) {
return;
}
d_ptr->ui.treeWidget->clear();
d_ptr->ui.buttonCleanup->setEnabled(false);
@@ -669,7 +699,9 @@ void DocumentRecovery::onButtonCleanupClicked()
d_ptr->ui.buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(true);
DocumentRecoveryHandler handler;
handler.checkForPreviousCrashes(std::bind(&DocumentRecovery::cleanup, this, sp::_1, sp::_2, sp::_3));
handler.checkForPreviousCrashes(
std::bind(&DocumentRecovery::cleanup, this, sp::_1, sp::_2, sp::_3)
);
DlgCheckableMessageBox::showMessage(tr("Delete"), tr("Transient directories deleted."));
reject();
}
@@ -689,10 +721,12 @@ void DocumentRecovery::cleanup(QDir& tmp, const QList<QFileInfo>& dirs, const QS
bool DocumentRecoveryFinder::checkForPreviousCrashes()
{
//NOLINTBEGIN
// NOLINTBEGIN
DocumentRecoveryHandler handler;
handler.checkForPreviousCrashes(std::bind(&DocumentRecoveryFinder::checkDocumentDirs, this, sp::_1, sp::_2, sp::_3));
//NOLINTEND
handler.checkForPreviousCrashes(
std::bind(&DocumentRecoveryFinder::checkDocumentDirs, this, sp::_1, sp::_2, sp::_3)
);
// NOLINTEND
return showRecoveryDialogIfNeeded();
}
@@ -708,13 +742,14 @@ void DocumentRecoveryFinder::checkDocumentDirs(QDir& tmp, const QList<QFileInfo>
QString recovery_files = QStringLiteral("fc_recovery_files");
for (QList<QFileInfo>::const_iterator it = dirs.cbegin(); it != dirs.cend(); ++it) {
QDir doc_dir(it->absoluteFilePath());
doc_dir.setFilter(QDir::NoDotAndDotDot|QDir::AllEntries);
doc_dir.setFilter(QDir::NoDotAndDotDot | QDir::AllEntries);
uint entries = doc_dir.entryList().count();
if (entries == 0) {
// in this case we can delete the transient directory because
// we cannot do anything
if (tmp.rmdir(it->filePath()))
if (tmp.rmdir(it->filePath())) {
countDeletedDocs++;
}
}
// search for the existence of a recovery file
else if (doc_dir.exists(QLatin1String("fc_recovery_file.xml"))) {
@@ -725,11 +760,12 @@ void DocumentRecoveryFinder::checkDocumentDirs(QDir& tmp, const QList<QFileInfo>
else if (entries == 1 && doc_dir.exists(recovery_files)) {
// if the sub-directory is empty delete the transient directory
QDir rec_dir(doc_dir.absoluteFilePath(recovery_files));
rec_dir.setFilter(QDir::NoDotAndDotDot|QDir::AllEntries);
rec_dir.setFilter(QDir::NoDotAndDotDot | QDir::AllEntries);
if (rec_dir.entryList().isEmpty()) {
doc_dir.rmdir(recovery_files);
if (tmp.rmdir(it->filePath()))
if (tmp.rmdir(it->filePath())) {
countDeletedDocs++;
}
}
}
}
@@ -758,7 +794,9 @@ bool DocumentRecoveryFinder::showRecoveryDialogIfNeeded()
// ----------------------------------------------------------------------------
void DocumentRecoveryHandler::checkForPreviousCrashes(const std::function<void(QDir&, const QList<QFileInfo>&, const QString&)> & callableFunc) const
void DocumentRecoveryHandler::checkForPreviousCrashes(
const std::function<void(QDir&, const QList<QFileInfo>&, const QString&)>& callableFunc
) const
{
QDir tmp = QString::fromUtf8(App::Application::getUserCachePath().c_str());
tmp.setNameFilters(QStringList() << QStringLiteral("*.lock"));
@@ -766,7 +804,7 @@ void DocumentRecoveryHandler::checkForPreviousCrashes(const std::function<void(Q
QString exeName = QString::fromStdString(App::Application::getExecutableName());
QList<QFileInfo> locks = tmp.entryInfoList();
for (const QFileInfo& it : locks) {
for (const QFileInfo& it : locks) {
QString bn = it.baseName();
// ignore the lock file for this instance
QString pid = QString::number(App::Application::applicationPid());
@@ -803,8 +841,9 @@ void DocumentRecoveryHandler::checkForPreviousCrashes(const std::function<void(Q
void DocumentRecoveryCleaner::clearDirectory(const QFileInfo& dir)
{
QDir qThisDir(dir.absoluteFilePath());
if (!qThisDir.exists())
if (!qThisDir.exists()) {
return;
}
// Remove all files in this directory
qThisDir.setFilter(QDir::Files);