From 16c1a849b6cee7ec6c84a39feb70b5e49f9773b7 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Fri, 12 Feb 2021 21:02:42 +0200
Subject: [PATCH] init UserSpecified templates in templatemanager

---
 app/templates/templatesmanager.cpp | 53 +++++++++++++++++++-----------
 app/templates/templatesmanager.h   |  3 ++
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/app/templates/templatesmanager.cpp b/app/templates/templatesmanager.cpp
index ad67bf418..efd5a9389 100644
--- a/app/templates/templatesmanager.cpp
+++ b/app/templates/templatesmanager.cpp
@@ -45,16 +45,31 @@ Manager::~Manager()
 }
 
 void Manager::init()
-{      
-    QDir systemTemplatesDir(m_corona->kPackage().filePath("templates"));
+{
+    //! Local Templates
+    QDir localTemplatesDir(Latte::configPath() + "/latte/templates");
+    if (!localTemplatesDir.exists()) {
+        QDir(Latte::configPath() + "/latte").mkdir("templates");
+    }
+
+    initLayoutTemplates(m_corona->kPackage().filePath("templates"));
+    initLayoutTemplates(Latte::configPath() + "/latte/templates");
+
+    initViewTemplates(m_corona->kPackage().filePath("templates"));
+    initViewTemplates(Latte::configPath() + "/latte/templates");
+}
+
+void Manager::initLayoutTemplates(const QString &path)
+{
+    QDir templatesDir(path);
     QStringList filter;
     filter.append(QString("*.layout.latte"));
-    QStringList systemLayoutTemplates = systemTemplatesDir.entryList(filter, QDir::Files | QDir::Hidden | QDir::NoSymLinks);
+    QStringList templates = templatesDir.entryList(filter, QDir::Files | QDir::Hidden | QDir::NoSymLinks);
 
-    for (int i=0; i<systemLayoutTemplates.count(); ++i) {
-        QString systemTemplatePath = systemTemplatesDir.path() + "/" + systemLayoutTemplates[i];
-        if (!m_layoutTemplates.containsId(systemTemplatePath)) {
-            CentralLayout layouttemplate(this, systemTemplatePath);
+    for (int i=0; i<templates.count(); ++i) {
+        QString templatePath = templatesDir.path() + "/" + templates[i];
+        if (!m_layoutTemplates.containsId(templatePath)) {
+            CentralLayout layouttemplate(this, templatePath);
 
             Data::Layout tdata = layouttemplate.data();
             tdata.isTemplate = true;
@@ -67,27 +82,25 @@ void Manager::init()
             m_layoutTemplates << tdata;
         }
     }
+}
 
-    filter.clear();
+void Manager::initViewTemplates(const QString &path)
+{
+    QDir templatesDir(path);
+    QStringList filter;
     filter.append(QString("*.view.latte"));
-    QStringList systemViewTemplates = systemTemplatesDir.entryList(filter, QDir::Files | QDir::Hidden | QDir::NoSymLinks);
+    QStringList templates = templatesDir.entryList(filter, QDir::Files | QDir::Hidden | QDir::NoSymLinks);
 
-    for (int i=0; i<systemViewTemplates.count(); ++i) {
-        QString systemViewTemplatePath = systemTemplatesDir.path() + "/" + systemViewTemplates[i];
-        if (!m_viewTemplates.containsId(systemViewTemplatePath)) {
+    for (int i=0; i<templates.count(); ++i) {
+        QString templatePath = templatesDir.path() + "/" + templates[i];
+        if (!m_viewTemplates.containsId(templatePath)) {
             Data::Generic vdata;
-            vdata.id = systemViewTemplatePath;
-            vdata.name = QFileInfo(systemViewTemplatePath).baseName();
+            vdata.id = templatePath;
+            vdata.name = QFileInfo(templatePath).baseName();
 
             m_viewTemplates << vdata;
         }
     }
-
-    //! Local Templates
-    QDir localTemplatesDir(Latte::configPath() + "/latte/templates");
-    if (!localTemplatesDir.exists()) {
-        QDir(Latte::configPath() + "/latte").mkdir("templates");
-    }
 }
 
 Data::Layout Manager::layoutTemplateForName(const QString &layoutName)
diff --git a/app/templates/templatesmanager.h b/app/templates/templatesmanager.h
index 390447570..af48ef410 100644
--- a/app/templates/templatesmanager.h
+++ b/app/templates/templatesmanager.h
@@ -73,6 +73,9 @@ signals:
     void newLayoutAdded(const QString &path);
 
 private:
+    void initLayoutTemplates(const QString &path);
+    void initViewTemplates(const QString &path);
+
     void exposeTranslatedTemplateNames();
 
     QString uniqueLayoutTemplateName(QString name) const;