fix

Author: tamlok

src/core/notebookconfigmgr/vxnotebookconfigmgr.cpp

@@ -461,6 +461,10 @@ void VXNotebookConfigMgr::addChildNode(Node *p_parent, const QSharedPointer<Node
 QSharedPointer<Node> VXNotebookConfigMgr::loadNodeByPath(const QSharedPointer<Node> &p_root, const QString &p_relativePath)
 {
     auto p = PathUtils::cleanPath(p_relativePath);
+    if (p == ".") {
+        return p_root;
+    }
+
     auto paths = p.split('/', QString::SkipEmptyParts);
     auto node = p_root;
     for (auto &pa : paths) {

src/core/sessionconfig.cpp

@@ -11,8 +11,6 @@
 #include "mainconfig.h"
 #include "historymgr.h"
 
-#include "core/buffer/filetypehelper.h"
-
 using namespace vnotex;
 
 bool SessionConfig::NotebookItem::operator==(const NotebookItem &p_other) const
@@ -40,6 +38,34 @@ QJsonObject SessionConfig::NotebookItem::toJson() const
     return jobj;
 }
 
+bool SessionConfig::QuickNoteScheme::operator==(const QuickNoteScheme &p_other) const
+{
+    return m_name == p_other.m_name &&
+        m_folderPath == p_other.m_folderPath &&
+        m_noteName == p_other.m_noteName &&
+        m_template == p_other.m_template;
+}
+
+void SessionConfig::QuickNoteScheme::fromJson(const QJsonObject &p_jobj)
+{
+    m_name = p_jobj[QStringLiteral("name")].toString();
+    m_folderPath = p_jobj[QStringLiteral("folder_path")].toString();
+    m_noteName = p_jobj[QStringLiteral("note_name")].toString();
+    m_template = p_jobj[QStringLiteral("template")].toString();
+}
+
+QJsonObject SessionConfig::QuickNoteScheme::toJson() const
+{
+    QJsonObject jobj;
+
+    jobj[QStringLiteral("name")] = m_name;
+    jobj[QStringLiteral("folder_path")] = m_folderPath;
+    jobj[QStringLiteral("note_name")] = m_noteName;
+    jobj[QStringLiteral("template")] = m_template;
+
+    return jobj;
+}
+
 void SessionConfig::ExternalProgram::fromJson(const QJsonObject &p_jobj)
 {
     m_name = p_jobj[QStringLiteral("name")].toString();
@@ -99,6 +125,8 @@ void SessionConfig::init()
 
     loadHistory(sessionJobj);
 
+    loadQuickNoteSchemes(sessionJobj);
+
     if (MainConfig::isVersionChanged()) {
         doVersionSpecificOverride();
     }
@@ -138,9 +166,6 @@ void SessionConfig::loadCore(const QJsonObject &p_session)
     if (m_externalMediaDefaultPath.isEmpty()) {
         m_externalMediaDefaultPath = QDir::homePath();
     }
-
-    m_quickNoteStoragePath = readString(coreObj, QStringLiteral("quick_note_storage_path"));
-    m_quickNoteType = stringListToFileType(readStringList(coreObj, QStringLiteral("quick_note_type")));
 }
 
 QJsonObject SessionConfig::saveCore() const
@@ -156,8 +181,6 @@ QJsonObject SessionConfig::saveCore() const
     coreObj[QStringLiteral("flash_page")] = m_flashPage;
     writeStringList(coreObj, QStringLiteral("quick_access"), m_quickAccessFiles);
     coreObj[QStringLiteral("external_media_default_path")] = m_externalMediaDefaultPath;
-    coreObj[QStringLiteral("quick_note_storage_path")] = m_quickNoteStoragePath;
-    writeStringList(coreObj, QStringLiteral("quick_note_type"), fileTypeToStringList(m_quickNoteType));
     return coreObj;
 }
 
@@ -242,6 +265,7 @@ QJsonObject SessionConfig::toJson() const
     writeByteArray(obj, QStringLiteral("notebook_explorer_session"), m_notebookExplorerSession);
     obj[QStringLiteral("external_programs")] = saveExternalPrograms();
     obj[QStringLiteral("history")] = saveHistory();
+    obj[QStringLiteral("quick_note_schemes")] = saveQuickNoteSchemes();
     return obj;
 }
 
@@ -465,6 +489,24 @@ QJsonArray SessionConfig::saveExternalPrograms() const
     return arr;
 }
 
+void SessionConfig::loadQuickNoteSchemes(const QJsonObject &p_session)
+{
+    const auto arr = p_session.value(QStringLiteral("quick_note_schemes")).toArray();
+    m_quickNoteSchemes.resize(arr.size());
+    for (int i = 0; i < arr.size(); ++i) {
+        m_quickNoteSchemes[i].fromJson(arr[i].toObject());
+    }
+}
+
+QJsonArray SessionConfig::saveQuickNoteSchemes() const
+{
+    QJsonArray arr;
+    for (const auto &scheme : m_quickNoteSchemes) {
+        arr.append(scheme.toJson());
+    }
+    return arr;
+}
+
 const QVector<SessionConfig::ExternalProgram> &SessionConfig::getExternalPrograms() const
 {
     return m_externalPrograms;
@@ -549,40 +591,12 @@ QJsonObject SessionConfig::saveExportOption() const
     return obj;
 }
 
-const QString &SessionConfig::getQuickNoteStoragePath() const
+const QVector<SessionConfig::QuickNoteScheme> &SessionConfig::getQuickNoteSchemes() const
 {
-    return m_quickNoteStoragePath;
+    return m_quickNoteSchemes;
 }
 
-void SessionConfig::setQuickNoteStoragePath(const QString &p_path)
+void SessionConfig::setQuickNoteSchemes(const QVector<QuickNoteScheme>& p_schemes)
 {
-    updateConfig(m_quickNoteStoragePath, p_path, this);
-}
-
-const QVector<int> &SessionConfig::getQuickNoteType() const
-{
-    return m_quickNoteType;
-}
-
-void SessionConfig::setQuickNoteType(const QVector<int> &p_type)
-{
-    updateConfig(m_quickNoteType, p_type, this);
-}
-
-QStringList SessionConfig::fileTypeToStringList(const QVector<int> &p_type) const
-{
-    QStringList list;
-    for (const int typ : p_type) {
-        list << FileTypeHelper::getInst().getFileType(typ).m_typeName;
-    }
-    return list;
-}
-
-QVector<int> SessionConfig::stringListToFileType(const QStringList &p_strList) const
-{
-    QVector<int> vec;
-    for (const QString &str : p_strList) {
-        vec.append(FileTypeHelper::getInst().getFileTypeByName(str).m_type);
-    }
-    return vec;
+    updateConfig(m_quickNoteSchemes, p_schemes, this);
 }

src/core/sessionconfig.h

@@ -57,11 +57,21 @@ namespace vnotex
 
         struct QuickNoteScheme
         {
+            bool operator==(const QuickNoteScheme &p_other) const;
+
+            void fromJson(const QJsonObject &p_jobj);
+
+            QJsonObject toJson() const;
+
+            QString m_name;
+
             // Where to create the quick note.
             QString m_folderPath;
-            // Name of the quick note.
-            QString m_name;
-            QString m_templatePath;
+
+            // Name of the quick note. Snippet is supported.
+            QString m_noteName;
+
+            QString m_template;
         };
 
         enum OpenGL
@@ -158,11 +168,8 @@ namespace vnotex
         void removeHistory(const QString &p_itemPath);
         void clearHistory();
 
-        const QString &getQuickNoteStoragePath() const;
-        void setQuickNoteStoragePath(const QString &p_path);
-
-        const QVector<int> &getQuickNoteType() const;
-        void setQuickNoteType(const QVector<int> &p_type);
+        const QVector<QuickNoteScheme> &getQuickNoteSchemes() const;
+        void setQuickNoteSchemes(const QVector<QuickNoteScheme>& p_schemes);
 
     private:
         void loadCore(const QJsonObject &p_session);
@@ -181,6 +188,10 @@ namespace vnotex
 
         QJsonArray saveExternalPrograms() const;
 
+        void loadQuickNoteSchemes(const QJsonObject &p_session);
+
+        QJsonArray saveQuickNoteSchemes() const;
+
         void doVersionSpecificOverride();
 
         void loadHistory(const QJsonObject &p_session);
@@ -232,11 +243,7 @@ namespace vnotex
         // Default folder path to open for external media like images and files.
         QString m_externalMediaDefaultPath;
 
-        QString m_quickNoteStoragePath;
-        QVector<int> m_quickNoteType;
-
-        QStringList fileTypeToStringList(const QVector<int> &p_type) const;
-        QVector<int> stringListToFileType(const QStringList &p_strList) const;
+        QVector<QuickNoteScheme> m_quickNoteSchemes;
     };
 } // ns vnotex
 

src/core/templatemgr.cpp

@@ -2,6 +2,8 @@
 
 #include <QDir>
 
+#include <utils/fileutils.h>
+
 #include "configmgr.h"
 
 using namespace vnotex;
@@ -20,5 +22,17 @@ QStringList TemplateMgr::getTemplates() const
 
 QString TemplateMgr::getTemplateFilePath(const QString &p_name) const
 {
+    if (p_name.isEmpty()) {
+        return QString();
+    }
     return QDir(getTemplateFolder()).filePath(p_name);
 }
+
+QString TemplateMgr::getTemplateContent(const QString &p_name) const
+{
+    const auto filePath = getTemplateFilePath(p_name);
+    if (filePath.isEmpty()) {
+        return QString();
+    }
+    return FileUtils::readTextFile(filePath);
+}

src/core/templatemgr.h

@@ -24,6 +24,8 @@ namespace vnotex
 
         QString getTemplateFilePath(const QString &p_name) const;
 
+        QString getTemplateContent(const QString &p_name) const;
+
     private:
         TemplateMgr() = default;
     };

src/core/vnotex.h

@@ -77,7 +77,10 @@ namespace vnotex
 
         // Requested to new a note in current notebook.
         // The handler should determine in which folder this note belongs to.
-        void newNoteRequested(const QVector<int> &p_type = QVector<int>(), const QString &p_path = QString());
+        void newNoteRequested();
+
+        // Requested to new a quick note (maybe in current folder).
+        void newQuickNoteRequested();
 
         // Requested to new a folder in current notebook.
         void newFolderRequested();