From d5c7e76aa64044e08bbde85f524bb37e5e080ca5 Mon Sep 17 00:00:00 2001
From: Manuel Dewald <mdewald@redhat.com>
Date: Fri, 5 Mar 2021 09:05:29 +0100
Subject: [PATCH] more templates

---
 sbin/package_remote.sh |  2 +-
 src/overlay.cpp        | 27 ++++++++++++++++++++++++++-
 src/overlay.h          |  4 ++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/sbin/package_remote.sh b/sbin/package_remote.sh
index a545262..35856ab 100755
--- a/sbin/package_remote.sh
+++ b/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 .
diff --git a/src/overlay.cpp b/src/overlay.cpp
index 28729ad..9bd9aae 100644
--- a/src/overlay.cpp
+++ b/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;
diff --git a/src/overlay.h b/src/overlay.h
index 6fb90a6..3707c47 100644
--- a/src/overlay.h
+++ b/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);
 };