mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

printing: update the coping of bundled templates

Browse source 
This update includes:
- Instead of copyPath() use a new specialized function:
  copy_bundled_templates()
- The new function supports overwriting of templates
in the user path, but only if a template file is read-only
- If the file is RW create a backup of the file in the
form of: <file-name>-User.html
- Collect backup files and store them in a QStringList
which is then shown in a QMessageBox from MainWindow
to notifying the user about the backup

This change allows moving the maintenance of the bundled
templates back to the application developers and contributors
as currently the only one who can edit the templates in the user
path was the user.

Suggested-by: Dirk Hohndel <dirk@hohndel.org>
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov 2017-11-24 22:54:54 +02:00
parent fc48cde77c
commit 65f0600679
3 changed files with 48 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
desktop-widgets/mainwindow.cpp
View file

@ -256,8 +256,23 @@ MainWindow::MainWindow() : QMainWindow(),
connect(geoLookup, SIGNAL(started()),information(), SLOT(disableGeoLookupEdition()));
connect(geoLookup, SIGNAL(finished()), information(), SLOT(enableGeoLookupEdition()));
#ifndef NO_PRINTING
// copy the bundled print templates to the user path; no overwriting occurs!
copyPath(getPrintingTemplatePathBundle(), getPrintingTemplatePathUser());
// copy the bundled print templates to the user path
QStringList templateBackupList;
QString templatePathUser(getPrintingTemplatePathUser());
copy_bundled_templates(getPrintingTemplatePathBundle(), templatePathUser, &templateBackupList);
if (templateBackupList.length()) {
QMessageBox msgBox(this);
templatePathUser.replace("\\", "/");
templateBackupList.replaceInStrings(templatePathUser + "/", "");
msgBox.setWindowTitle(tr("Template backup created"));
msgBox.setText(tr("The following backup printing templates were created:\n\n%1\n\n"
"Location:\n%2\n\n"
"Please note that as of this version of Subsurface the default templates\n"
"are read-only and should not be edited directly, since the application\n"
"can overwrite them on startup.").arg(templateBackupList.join("\n")).arg(templatePathUser));
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.exec();
}
set_bundled_templates_as_read_only();
find_all_templates();
#endif

29
desktop-widgets/templatelayout.cpp
View file

@ -62,6 +62,35 @@ void set_bundled_templates_as_read_only()
QFile::setPermissions(pathUser + QDir::separator() + f, QFileDevice::ReadOwner | QFileDevice::ReadUser);
}
void copy_bundled_templates(QString src, QString dst, QStringList *templateBackupList)
{
QDir dir(src);
if (!dir.exists())
return;
foreach (QString d, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
QString dst_path = dst + QDir::separator() + d;
dir.mkpath(dst_path);
copy_bundled_templates(src + QDir::separator() + d, dst_path, templateBackupList);
}
foreach (QString f, dir.entryList(QDir::Files)) {
QFile fileSrc(src + QDir::separator() + f);
QFile fileDest(dst + QDir::separator() + f);
if (fileDest.exists()) {
// if open() fails the file is either locked or r/o. try to remove it and then overwrite
if (!fileDest.open(QFile::ReadWrite | QFile::Text)) {
fileDest.setPermissions(QFileDevice::WriteOwner | QFileDevice::WriteUser);
fileDest.remove();
} else { // if the file is not read-only create a backup
fileDest.close();
const QString targetFile = fileDest.fileName().replace(".html", "-User.html");
fileDest.copy(targetFile);
*templateBackupList << targetFile;
}
}
fileSrc.copy(fileDest.fileName()); // in all cases copy the file
}
}
TemplateLayout::TemplateLayout(print_options *PrintOptions, template_options *templateOptions) :
m_engine(NULL)
{

2
desktop-widgets/templatelayout.h
View file

@ -2,6 +2,7 @@
#ifndef TEMPLATELAYOUT_H
#define TEMPLATELAYOUT_H
#include <QStringList>
#include <grantlee_templates.h>
#include "mainwindow.h"
#include "printoptions.h"
@ -13,6 +14,7 @@
int getTotalWork(print_options *printOptions);
void find_all_templates();
void set_bundled_templates_as_read_only();
void copy_bundled_templates(QString src, QString dst, QStringList *templateBackupList);
extern QList<QString> grantlee_templates, grantlee_statistics_templates;