LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add (advanced) preference for backup folder. To get the old behavior, just set the setting "application/backup/path" to an empty string.

Browse source 
Its default value is ".MuseScoreBackup"
This commit is contained in:
Marr11317 2020-04-29 20:17:03 -04:00
parent 6601f4e162
commit ca62d0caf3
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
global/settings/types/preferencekeys.h
View file

@ -52,6 +52,7 @@
#define PREF_APP_STARTUP_TELEMETRY_ACCESS_REQUESTED "application/startup/telemetry_access_requested"
#define PREF_APP_TELEMETRY_ALLOWED "application/telemetry/allowed"
#define PREF_APP_BACKUP_GENERATE_BACKUP "application/backup/generateBackup"
#define PREF_APP_BACKUP_SUBFOLDER "application/backup/subfolder"
#define PREF_EXPORT_AUDIO_NORMALIZE "export/audio/normalize"
#define PREF_EXPORT_AUDIO_SAMPLERATE "export/audio/sampleRate"
#define PREF_EXPORT_AUDIO_PCMRATE "export/audio/PCMRate"

19
libmscore/scorefile.cpp
View file

@ -36,6 +36,8 @@
#include "stafftype.h"
#include "sym.h"
#include "mscore/preferences.h"
#ifdef OMR
#include "omr/omr.h"
#include "omr/omrpage.h"
@ -421,8 +423,8 @@ bool MasterScore::saveFile(bool generateBackup)
}
temp.close();
QString name(info.filePath());
QString basename(info.fileName());
const QString name(info.filePath());
const QString basename(info.fileName());
QDir dir(info.path());
if (!saved() && generateBackup) {
// if file was already saved in this session
@ -433,25 +435,26 @@ bool MasterScore::saveFile(bool generateBackup)
// remove old backup file if exists
// remove the backup file in the same dir as score (the traditional place) if exists
//
QString backupDirString = info.path() + QString(QDir::separator()) + ".backup";
const QString backupSubdirString = preferences.getString(PREF_APP_BACKUP_SUBFOLDER);
const QString backupDirString = info.path() + QString(QDir::separator()) + backupSubdirString;
QDir backupDir(backupDirString);
if (!backupDir.exists()) {
dir.mkdir(".backup");
dir.mkdir(backupSubdirString);
#ifdef Q_OS_WIN
QString backupDirNativePath = QDir::toNativeSeparators(backupDirString);
const QString backupDirNativePath = QDir::toNativeSeparators(backupDirString);
#if (defined (_MSCVER) || defined (_MSC_VER))
#if (defined (UNICODE))
SetFileAttributes((LPCTSTR)backupDirNativePath.unicode(), FILE_ATTRIBUTE_HIDDEN);
#else
// Use byte-based Windows function
SetFileAttributes((LPCTSTR)backupDirNativePath.toLocal8Bit(), FILE_ATTRIBUTE_HIDDEN);
#endif
#endif
#else
SetFileAttributes((LPCTSTR)backupDirNativePath.toLocal8Bit(), FILE_ATTRIBUTE_HIDDEN);
#endif
#endif
}
QString backupName = QString(".") + info.fileName() + QString(",");
const QString backupName = QString(".") + info.fileName() + QString(",");
if (backupDir.exists(backupName)) {
if (!backupDir.remove(backupName)) {
// if (!MScore::noGui)
@ -472,7 +475,7 @@ bool MasterScore::saveFile(bool generateBackup)
// rename old file into backup
//
if (dir.exists(basename)) {
if (!QFile::rename(name, backupDirString + "/" + backupName)) {
if (!QFile::rename(name, backupDirString + (backupDirString.endsWith("/") ? "" : "/") + backupName)) {
// if (!MScore::noGui)
// QMessageBox::critical(0, tr("Save File"),
// tr("Renaming old file <%1> to backup <%2> failed").arg(name, backupDirString + "/" + backupName);

1
mscore/preferences.cpp
View file

@ -123,6 +123,7 @@ void Preferences::init(bool storeInMemoryOnly)
{PREF_APP_TELEMETRY_ALLOWED, new BoolPreference(false, false)},
{PREF_APP_STARTUP_TELEMETRY_ACCESS_REQUESTED, new StringPreference("", false)},
{PREF_APP_BACKUP_GENERATE_BACKUP, new BoolPreference(true)},
{PREF_APP_BACKUP_SUBFOLDER, new StringPreference(".mscbackup")},
{PREF_EXPORT_AUDIO_NORMALIZE, new BoolPreference(true)},
{PREF_EXPORT_AUDIO_SAMPLERATE, new IntPreference(44100, false)},
{PREF_EXPORT_AUDIO_PCMRATE, new IntPreference(16)},