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

templatelayout.cpp: add a HTML preprocessor stage

Browse source 
The current Grantlee template loading scheme does not
allow a preprocessing layer. With the recent DiveObjectHelper
changes the layer is required if we don't want to add a set
of dummy methods and Q_PROPERTIES which will only inflate
the DiveObjectHelper class.

Use the already present helper readTemplate() to load the
raw HTML template and pass it to a static function which
does some variable replacement to accomudate DiveObjectHelper.

This change is done for the sake of not breaking the Grantlee
HTML variables on the user side!

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2016-02-29 16:42:06 +02:00 committed by Dirk Hohndel
parent 0b7be8ec5e
commit 0aa8ef918d
1 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
desktop-widgets/templatelayout.cpp
View file

@ -50,6 +50,33 @@ TemplateLayout::~TemplateLayout()
delete m_engine; delete m_engine;
} }
/* a HTML pre-processor stage. acts like a compatibility layer
* between some Grantlee variables and DiveObjectHelper Q_PROPERTIES;
*/
static QString preprocessTemplate(const QString &in)
{
QString out = in;
QList<QPair<QString, QString> > list;
list << qMakePair(QString("dive.weight"), QString("dive.weights."));
list << qMakePair(QString("dive.weights"), QString("dive.weightList"));
list << qMakePair(QString("dive.cylinder"), QString("dive.cylinders."));
list << qMakePair(QString("dive.cylinders"), QString("dive.cylinderList"));
/* lazy method of variable replacement without regex. the Grantlee parser
* works with a single or no space next to the variable markers -
* e.g. '{{ var }}' */
for (int i = 0; i < list.length(); i++) {
QPair<QString, QString> p = list.at(i);
out.replace("{{ " + p.first + " }}", "{{ " + p.second + " }}");
out.replace("{{" + p.first + "}}", "{{" + p.second + "}}");
out.replace("{{ " + p.first + "}}", "{{ " + p.second + "}}");
out.replace("{{" + p.first + " }}", "{{" + p.second + " }}");
}
return out;
}
QString TemplateLayout::generate() QString TemplateLayout::generate()
{ {
int progress = 0; int progress = 0;
@ -58,12 +85,6 @@ QString TemplateLayout::generate()
QString htmlContent; QString htmlContent;
delete m_engine; delete m_engine;
m_engine = new Grantlee::Engine(this); m_engine = new Grantlee::Engine(this);
QSharedPointer<Grantlee::FileSystemTemplateLoader> m_templateLoader =
QSharedPointer<Grantlee::FileSystemTemplateLoader>(new Grantlee::FileSystemTemplateLoader());
m_templateLoader->setTemplateDirs(QStringList() << getPrintingTemplatePathUser());
m_engine->addTemplateLoader(m_templateLoader);
Grantlee::registerMetaType<template_options>(); Grantlee::registerMetaType<template_options>();
Grantlee::registerMetaType<print_options>(); Grantlee::registerMetaType<print_options>();
@ -85,7 +106,12 @@ QString TemplateLayout::generate()
c.insert("template_options", QVariant::fromValue(*templateOptions)); c.insert("template_options", QVariant::fromValue(*templateOptions));
c.insert("print_options", QVariant::fromValue(*PrintOptions)); c.insert("print_options", QVariant::fromValue(*PrintOptions));
Grantlee::Template t = m_engine->loadByName(PrintOptions->p_template); /* don't use the Grantlee loader API */
QString templateContents = readTemplate(PrintOptions->p_template);
QString preprocessed = preprocessTemplate(templateContents);
/* create the template from QString; is this thing allocating memory? */
Grantlee::Template t = m_engine->newTemplate(preprocessed, PrintOptions->p_template);
if (!t || t->error()) { if (!t || t->error()) {
qDebug() << "Can't load template"; qDebug() << "Can't load template";
return htmlContent; return htmlContent;