more templates

sbin/package_remote.sh

@@ -11,5 +11,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 cd $DIR/..
 rsync -av --delete $(pwd)/* $USER@$HOSTNAME:/tmp/slide_build
-ssh $USER@$HOSTNAME "/tmp/slide_build/sbin/package.sh $ARCH $VERSION"
+ssh $USER@$HOSTNAME "rm -rf /tmp/slide_build/build;/tmp/slide_build/sbin/package.sh $ARCH $VERSION"
 scp $USER@$HOSTNAME:/tmp/slide_build/make/slide_*.tar.gz .

src/overlay.cpp

@@ -6,6 +6,7 @@
 #include <QDate>
 #include <QLocale>
 #include <QTime>
+#include <QFileInfo>
 #include <QStringList>
 #include <QRegExp>
 #include <iostream>
@@ -117,11 +118,35 @@ std::string Overlay::renderString(QString overlayTemplate, std::string filename)
   result.replace("<datetime>", QLocale::system().toString(QDateTime::currentDateTime()));
   result.replace("<date>", QLocale::system().toString(QDate::currentDate()));
   result.replace("<time>", QTime::currentTime().toString("hh:mm"));
-  result.replace("<filename>", filename.c_str());
+  result.replace("<dir>", getDir(filename));
+  result.replace("<path>", getPath(filename));
+  result.replace("<filepath>", filename.c_str());
+  result.replace("<filename>", getFilename(filename));
+  result.replace("<basename>", getBasename(filename));
   result.replace("<exifdatetime>", getExifDate(filename));
   return result.toStdString();
 }
 
+QString Overlay::getFilename(std::string filename) {
+  QFileInfo fileInfo(filename.c_str());
+  return fileInfo.fileName();
+}
+
+QString Overlay::getBasename(std::string filename) {
+  QFileInfo fileInfo(filename.c_str());
+  return fileInfo.baseName();
+}
+
+QString Overlay::getDir(std::string filename) {
+  QFileInfo fileInfo(filename.c_str());
+  return fileInfo.dir().dirName();
+}
+
+QString Overlay::getPath(std::string filename) {
+  QFileInfo fileInfo(filename.c_str());
+  return fileInfo.path();
+}
+
 QString Overlay::getExifDate(std::string filename) {
 
   QString dateTime;

src/overlay.h

@@ -54,6 +54,10 @@ class Overlay
     QString getTemplate(QStringList components);
 
     QString getExifDate(std::string filename);
+    QString getDir(std::string filename);
+    QString getPath(std::string filename);
+    QString getFilename(std::string filename);
+    QString getBasename(std::string filename);
     void parseInput();
     std::string renderString(QString overlayTemplate, std::string filename);
 };