finished the interaction of highlighter

logic-wei · logic-wei · commit 865aa30acd7d · 2019-01-14T22:50:08.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 VisualLog.pro.user*
+*.autosave
diff --git a/VisualLog.pro b/VisualLog.pro
@@ -46,7 +46,8 @@ HEADERS += \
     highlighter/logfilter.h \
     highlighter/jsonhighlighter.h \
     highlighter/jsontextedit.h \
-    utils/logutil.h
+    utils/logutil.h \
+    utils/config.h
 
 FORMS +=
 
diff --git a/finder/finder.cpp b/finder/finder.cpp
@@ -47,7 +47,6 @@ void Finder::onFindTriggered(bool backward)
     options.setFlag(QTextDocument::FindFlag::FindCaseSensitively, mCaseSenseBox->isChecked());
 
     emit findTriggered(mExpressionEdit->text(), options, mRegModeBox->isChecked());
-
 }
 
 
diff --git a/highlighter/highlighter.cpp b/highlighter/highlighter.cpp
@@ -2,6 +2,7 @@
 
 Highlighter::Highlighter(QWidget *parent):
     QDockWidget("highlighter", parent),
+    TAG("Highlighter"),
     mRootWidget(new QWidget(parent)),
     mMainLayout(new QVBoxLayout()),
     mToolLayout(new QHBoxLayout()),
@@ -13,31 +14,36 @@ Highlighter::Highlighter(QWidget *parent):
     mJsonEdit(new JsonTextEdit(mRootWidget)),
     mHighlightButton(new QToolButton(mRootWidget)),
     mFindPreButton(new QPushButton(mRootWidget)),
-    mFindNxtButton(new QPushButton(mRootWidget))
+    mFindNxtButton(new QPushButton(mRootWidget)),
+    mFileSystemWatcher(new QFileSystemWatcher(this)),
+    mEditorState(BROWSING)
 {
     setupUi();
     mFilter = QSharedPointer<LogFilter>(new LogFilter());
     connect(mJsonEdit, &JsonTextEdit::updated, this, &Highlighter::onJsonObjectUpdated);
+    initDir();
+    initFSWatcher();
+    onRulesDirChanged();
 }
 
 void Highlighter::setupUi()
 {
     // widget setting
-    mRuleBox->setEditable(true);
     mNewButton->setText("+");
     mDelButton->setText("-");
     mSaveButton->setText("<<");
     mHighlightButton->setText("H");
     mFindPreButton->setText("find pre");
     mFindNxtButton->setText("find next");
+    mRuleBox->setDuplicatesEnabled(false);
 
     // layout setting
     mToolLayout->addWidget(mRuleBox);
     mToolLayout->addWidget(mNewButton);
     mToolLayout->addWidget(mDelButton);
     mToolLayout->addWidget(mSaveButton);
+    mToolLayout->addWidget(mHighlightButton);
 
-    mControlLayout->addWidget(mHighlightButton);
     mControlLayout->addWidget(mFindPreButton);
     mControlLayout->addWidget(mFindNxtButton);
 
@@ -50,6 +56,40 @@ void Highlighter::setupUi()
     setWidget(mRootWidget);
 
     setTabWidth(4);
+
+    connect(mNewButton, &QToolButton::clicked, this, &Highlighter::onNewButtonClicked);
+    connect(mDelButton, &QToolButton::clicked, this, &Highlighter::onDelButtonClicked);
+    connect(mSaveButton, &QToolButton::clicked, this, &Highlighter::onSaveButtonClicked);
+    connect(mRuleBox, &QComboBox::currentTextChanged, this, &Highlighter::onRuleSelectedChanged);
+    connect(mRuleBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &Highlighter::onRulesBoxIndexChanged);
+    connect(mHighlightButton, &QToolButton::clicked, this, &Highlighter::onHighlightButtonClicked);
+}
+
+void Highlighter::initDir()
+{
+    QDir dir = QDir::home();
+
+    if (dir.cd(VLOG_CFG_HOME_NAME)) {
+        if (!dir.exists(VLOG_CFG_HIGHLIGHTER_RULE_HOME)) {
+            if (!dir.mkdir(VLOG_CFG_HIGHLIGHTER_RULE_HOME))
+                LogUtil::e(TAG, "failed to mkdir for rules");
+        }
+        if (!dir.cd(VLOG_CFG_HIGHLIGHTER_RULE_HOME))
+            LogUtil::e(TAG, "failed to cd to rules");
+    } else {
+       LogUtil::e(TAG, "failed to cd to home");
+    }
+
+    mRulesDir = dir;
+}
+
+void Highlighter::initFSWatcher()
+{
+    LogUtil::i(TAG, "initFSWatcher: dir:"+mRulesDir.path());
+
+    mFileSystemWatcher->addPath(mRulesDir.path());
+    connect(mFileSystemWatcher, &QFileSystemWatcher::directoryChanged,
+            this, &Highlighter::onRulesDirChanged);
 }
 
 void Highlighter::setTabWidth(int nspace)
@@ -66,7 +106,7 @@ QSharedPointer<AbstractLineFilter> Highlighter::logHighlighter()
 void Highlighter::onJsonObjectUpdated(const QJsonObject &jsonObject)
 {
     mFilter->clearRule();
-    qDebug()<<"jsonUpdate";
+
     // traverse every rules
     foreach (const QString &ruleName, jsonObject.keys()) {
         QJsonValue value = jsonObject.value(ruleName);
@@ -141,3 +181,136 @@ bool Highlighter::isDoubleJsonArray(const QJsonArray &jsonArray)
     }
     return true;
 }
+
+void Highlighter::onRulesDirChanged()
+{
+    LogUtil::i(TAG, QString("onRulesDirChanged.mEditorState=%1").arg(mEditorState));
+
+    switch (mEditorState) {
+    case EditorState::EDITING:
+        break;
+    case EditorState::BROWSING:
+        LogUtil::i(TAG, QString("clear rule item"));
+        mRuleBox->clear();
+        foreach (QDir dir, mRulesDir.entryList(QDir::Filter::Files, QDir::SortFlag::Name)) {
+            LogUtil::i(TAG, QString("add rule item:%1").arg(dir.dirName()));
+            mRuleBox->addItem(dir.dirName());
+        }
+        break;
+    }
+}
+
+void Highlighter::onNewButtonClicked()
+{
+    LogUtil::i(TAG, QString("onNewButtonClicked.mEditorState=%1").arg(mEditorState));
+
+    switch (mEditorState) {
+    case EditorState::EDITING:
+        break;
+    case EditorState::BROWSING:
+        mEditorState = EditorState::EDITING;
+        mRuleBox->setEditable(true);
+        mRuleBox->update();
+        mRuleBox->setEditText("NewRule");
+        mJsonEdit->clear();
+        break;
+    }
+}
+
+void Highlighter::onDelButtonClicked()
+{
+    LogUtil::i(TAG, QString("onDelButtonClicked.mEditorState=%1").arg(mEditorState));
+
+    switch (mEditorState) {
+    case EditorState::EDITING:
+        mEditorState = EditorState::BROWSING;
+        mJsonEdit->clear();
+        mRuleBox->removeItem(mRuleBox->currentIndex());
+        mRuleBox->setEditable(false);
+        mRuleBox->update();
+        break;
+    case EditorState::BROWSING:
+        if (!mRuleBox->currentText().isNull() && !mRulesDir.remove(mRuleBox->currentText()))
+            LogUtil::e(TAG, QString("failed to remove rule file:%1").arg(mRuleBox->currentText()));
+        break;
+    }
+}
+
+void Highlighter::onSaveButtonClicked()
+{
+    LogUtil::i(TAG, QString("onSaveButtonClicked.mEditorState=%1").arg(mEditorState));
+
+    switch (mEditorState) {
+    case EditorState::BROWSING:
+        saveAsRuleFile(mRuleBox->currentText(), mJsonEdit->document()->toRawText());
+        break;
+    case EditorState::EDITING:
+        if (!mRulesDir.exists(mRuleBox->currentText())) {
+            mEditorState = EditorState::BROWSING;
+            saveAsRuleFile(mRuleBox->currentText(), mJsonEdit->document()->toRawText());
+            mRuleBox->setEditable(false);
+            mRuleBox->update();
+        } else {
+            LogUtil::i(TAG, "reduplicative file name");
+            QMessageBox::warning(this, "error", "reduplicative file name");
+        }
+        break;
+    }
+}
+
+void Highlighter::onRuleSelectedChanged(const QString &rule)
+{
+    LogUtil::i(TAG, QString("onRuleSelectedChanged.mEditorState=%1").arg(mEditorState));
+
+    if (rule.isNull() || rule == "") return;
+
+    switch (mEditorState) {
+    case EditorState::BROWSING:
+        loadRuleFile(mRuleBox->currentText());
+        break;
+    case EditorState::EDITING:
+        break;
+    }
+}
+
+void Highlighter::loadRuleFile(const QString &fileName)
+{
+    LogUtil::i(TAG, QString("loadRuleFile.fileName=%1").arg(fileName));
+
+    if (fileName.isNull() || fileName == "") return;
+
+    QFile ruleFile(mRulesDir.absoluteFilePath(fileName));
+
+    ruleFile.open(QIODevice::OpenModeFlag::ReadOnly); {
+        mJsonEdit->clear();
+        mJsonEdit->insertPlainText(ruleFile.readAll());
+    } ruleFile.close();
+}
+
+void Highlighter::onRulesBoxIndexChanged(int index)
+{
+    (void)index;
+
+    switch (mEditorState) {
+    case EditorState::BROWSING:
+        break;
+    case EditorState::EDITING:
+        mEditorState = EditorState::BROWSING;
+        mJsonEdit->clear();
+        mRuleBox->setEditable(false);
+        break;
+    }
+}
+
+void Highlighter::saveAsRuleFile(const QString &fileName, const QString &content)
+{
+    QFile ruleFile(mRulesDir.absoluteFilePath(fileName));
+    ruleFile.open(QIODevice::OpenModeFlag::WriteOnly);
+    ruleFile.write(content.toUtf8());
+    ruleFile.close();
+}
+
+void Highlighter::onHighlightButtonClicked()
+{
+    LogUtil::i(TAG, "onHighlightButtonClicked");
+}
diff --git a/highlighter/highlighter.h b/highlighter/highlighter.h
@@ -20,18 +20,31 @@
 #include <QString>
 #include <QRegularExpression>
 #include <QColor>
+#include <QFileSystemWatcher>
+#include <QDir>
+#include <QFile>
+#include <QMessageBox>
+#include <QShortcut>
+#include <QKeySequence>
 
 #include "../logviewer/abstractlinefilter.h"
 #include "logfilter.h"
 #include "jsonhighlighter.h"
 #include "jsontextedit.h"
+#include "utils/config.h"
+#include "utils/logutil.h"
 
 
 class Highlighter : public QDockWidget
 {
     Q_OBJECT
 
 public:
+    enum EditorState {
+        BROWSING = 0,
+        EDITING
+    };
+
     explicit Highlighter(QWidget *parent = nullptr);
 
     QSharedPointer<AbstractLineFilter> logHighlighter();
@@ -42,14 +55,26 @@ class Highlighter : public QDockWidget
 
 private slots:
     void onJsonObjectUpdated(const QJsonObject &jsonObject);
+    void onRulesDirChanged();
+    void onNewButtonClicked();
+    void onDelButtonClicked();
+    void onSaveButtonClicked();
+    void onRuleSelectedChanged(const QString &rule);
+    void onRulesBoxIndexChanged(int index);
+    void onHighlightButtonClicked();
 
 private:
     void setupUi();
+    void initDir();
+    void initFSWatcher();
     void updateFilterRule(LogFilter::Rule *filterRule,
                         const QString &propName, const QJsonValue &propValue);
     bool isDoubleJsonArray(const QJsonArray &jsonArray);
+    void loadRuleFile(const QString &fileName);
+    void saveAsRuleFile(const QString &fileName, const QString &content);
 
 private:
+    const QString TAG;
     // ui
     QWidget *mRootWidget;
     QLayout *mMainLayout;
@@ -68,6 +93,9 @@ private slots:
     //others
     QSharedPointer<LogFilter>   mFilter;
     JsonHighlighter             *mJsonHighlighter;
+    QFileSystemWatcher          *mFileSystemWatcher;
+    QDir                        mRulesDir;
+    EditorState                 mEditorState;
 };
 
 #endif // HIGHLIGHTER_H
diff --git a/highlighter/logfilter.cpp b/highlighter/logfilter.cpp
@@ -8,13 +8,11 @@ LogFilter::LogFilter():
 
 void LogFilter::addRule(const Rule &rule)
 {
-    qDebug()<<"addRule";
     mRules.append(rule);
 }
 
 void LogFilter::clearRule()
 {
-    qDebug()<<"clearRule";
     mRules.clear();
 }
 
@@ -37,6 +35,5 @@ void LogFilter::onNextLine(const QString &line)
 
 void LogFilter::setDefaultRule(const Rule &rule)
 {
-    qDebug()<<"setDefaultRule";
     mDefaultRule = rule;
 }
diff --git a/main.cpp b/main.cpp
@@ -1,8 +1,10 @@
-#include "mainwindow.h"
 #include <QApplication>
 #include <QDir>
 #include <QString>
-#include <utils/logutil.h>
+
+#include "mainwindow.h"
+#include "utils/logutil.h"
+#include "utils/config.h"
 
 const QString TAG = "main";
 
@@ -12,11 +14,11 @@ void checkHomePath()
     LogUtil::i(TAG, "init working directory");
     QDir wd = QDir::home();
 
-    if (!wd.exists(".VisualLog")) {
-        if (wd.mkdir(".VisualLog"))
-            wd.cd(".VisualLog");
+    if (!wd.exists(VLOG_CFG_HOME_NAME)) {
+        if (wd.mkdir(VLOG_CFG_HOME_NAME))
+            wd.cd(VLOG_CFG_HOME_NAME);
     } else {
-        wd.cd(".VisualLog");
+        wd.cd(VLOG_CFG_HOME_NAME);
     }
 
     if (QDir::setCurrent(wd.path())) {
diff --git a/utils/config.h b/utils/config.h
@@ -0,0 +1,7 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#define VLOG_CFG_HOME_NAME                  ".VisualLog"
+#define VLOG_CFG_HIGHLIGHTER_RULE_HOME      "HighlighterRules"
+
+#endif // CONFIG_H

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ void Finder::onFindTriggered(bool backward)`
`47`	`47`	`options.setFlag(QTextDocument::FindFlag::FindCaseSensitively, mCaseSenseBox->isChecked());`
`48`	`48`
`49`	`49`	`emit findTriggered(mExpressionEdit->text(), options, mRegModeBox->isChecked());`
`50`		`-`
`51`	`50`	`}`
`52`	`51`
`53`	`52`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,11 @@ LogFilter::LogFilter():`
`8`	`8`
`9`	`9`	`void LogFilter::addRule(const Rule &rule)`
`10`	`10`	`{`
`11`		`- qDebug()<<"addRule";`
`12`	`11`	`mRules.append(rule);`
`13`	`12`	`}`
`14`	`13`
`15`	`14`	`void LogFilter::clearRule()`
`16`	`15`	`{`
`17`		`- qDebug()<<"clearRule";`
`18`	`16`	`mRules.clear();`
`19`	`17`	`}`
`20`	`18`
`@@ -37,6 +35,5 @@ void LogFilter::onNextLine(const QString &line)`
`37`	`35`
`38`	`36`	`void LogFilter::setDefaultRule(const Rule &rule)`
`39`	`37`	`{`
`40`		`- qDebug()<<"setDefaultRule";`
`41`	`38`	`mDefaultRule = rule;`
`42`	`39`	`}`