dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

VMdTab: discard backup file directly when it is identical

Browse Source
This commit is contained in:
Le Tan 2018-04-02 20:38:13 +08:00
parent aad9395fad
commit 26a7f40f36
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/vmdtab.cpp
View File

@ -1023,6 +1023,14 @@ bool VMdTab::checkPreviousBackupFile()
return true; return true;
} }
QString backupContent = m_file->readBackupFile(preFile);
if (m_file->getContent() == backupContent) {
// Found backup file with identical content.
// Just discard the backup file.
VUtils::deleteFile(preFile);
return true;
}
QMessageBox box(QMessageBox::Warning, QMessageBox box(QMessageBox::Warning,
tr("Backup File Found"), tr("Backup File Found"),
tr("Found backup file <span style=\"%1\">%2</span> " tr("Found backup file <span style=\"%1\">%2</span> "
@ -1032,17 +1040,13 @@ bool VMdTab::checkPreviousBackupFile()
.arg(m_file->fetchPath()), .arg(m_file->fetchPath()),
QMessageBox::NoButton, QMessageBox::NoButton,
this); this);
QString backupContent = m_file->readBackupFile(preFile);
QString info = tr("VNote may crash while editing this note before.<br/>" QString info = tr("VNote may crash while editing this note before.<br/>"
"Please choose to recover from the backup file or delete it.<br/><br/>" "Please choose to recover from the backup file or delete it.<br/><br/>"
"Note file last modified: <span style=\"%1\">%2</span><br/>" "Note file last modified: <span style=\"%1\">%2</span><br/>"
"Backup file last modified: <span style=\"%1\">%3</span><br/>" "Backup file last modified: <span style=\"%1\">%3</span>")
"Content comparison: <span style=\"%1\">%4</span>")
.arg(g_config->c_dataTextStyle) .arg(g_config->c_dataTextStyle)
.arg(VUtils::displayDateTime(QFileInfo(m_file->fetchPath()).lastModified())) .arg(VUtils::displayDateTime(QFileInfo(m_file->fetchPath()).lastModified()))
.arg(VUtils::displayDateTime(QFileInfo(preFile).lastModified())) .arg(VUtils::displayDateTime(QFileInfo(preFile).lastModified()));
.arg(m_file->getContent() == backupContent ? tr("Identical")
: tr("Different"));
box.setInformativeText(info); box.setInformativeText(info);
QPushButton *recoverBtn = box.addButton(tr("Recover From Backup File"), QMessageBox::YesRole); QPushButton *recoverBtn = box.addButton(tr("Recover From Backup File"), QMessageBox::YesRole);
box.addButton(tr("Discard Backup File"), QMessageBox::NoRole); box.addButton(tr("Discard Backup File"), QMessageBox::NoRole);