From 4e78e0e1dd7104c957a4dac2dcd5142b6982b263 Mon Sep 17 00:00:00 2001
From: arcan1s <darkarcanis@mail.ru>
Date: Sat, 11 Jul 2015 15:04:53 +0300
Subject: [PATCH] drop key definition on startup since it blocks several
 plasmoid instances (refer to #57)

---
 .../package/contents/ui/main.qml              |  4 +-
 sources/awesome-widget/plugin/awkeys.cpp      | 58 ++++---------------
 sources/awesome-widget/plugin/awkeys.h        | 11 +---
 3 files changed, 15 insertions(+), 58 deletions(-)

diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml
index 2f0ce46..ca0aa5c 100644
--- a/sources/awesome-widget/package/contents/ui/main.qml
+++ b/sources/awesome-widget/package/contents/ui/main.qml
@@ -181,7 +181,7 @@ Item {
     onNeedUpdate: {
         if (debug) console.log("[main::onNeedUpdate]")
 
-        text.text = AWKeys.parsePattern()
+        text.text = AWKeys.parsePattern(plasmoid.configuration.text)
         tooltip.text = AWKeys.toolTipImage()
 
         sizeUpdate()
@@ -211,7 +211,7 @@ Item {
         if (debug) console.log("[main::onUserConfiguringChanged]")
 
         // init submodule
-        AWKeys.initKeys(plasmoid.configuration.text)
+        AWKeys.initKeys()
         AWKeys.initTooltip(tooltipSettings)
         AWKeys.setPopupEnabled(plasmoid.configuration.notify)
         AWKeys.setWrapNewLines(plasmoid.configuration.wrapNewLines)
diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp
index a0c7aea..3a765de 100644
--- a/sources/awesome-widget/plugin/awkeys.cpp
+++ b/sources/awesome-widget/plugin/awkeys.cpp
@@ -86,7 +86,7 @@ AWKeys::~AWKeys()
 }
 
 
-void AWKeys::initKeys(const QString currentPattern)
+void AWKeys::initKeys()
 {
     if (debug) qDebug() << PDEBUG;
 
@@ -96,11 +96,8 @@ void AWKeys::initKeys(const QString currentPattern)
     extUpgrade.clear();
     graphicalItems.clear();
     keys.clear();
-    foundBars.clear();
-    foundKeys.clear();
 
     // init
-    pattern = currentPattern;
     extQuotes = getExtQuotes();
     extScripts = getExtScripts();
     extUpgrade = getExtUpgrade();
@@ -146,17 +143,19 @@ bool AWKeys::isDebugEnabled()
 }
 
 
-QString AWKeys::parsePattern()
+QString AWKeys::parsePattern(const QString currentPattern)
 {
     if (debug) qDebug() << PDEBUG;
-    if (keys.isEmpty()) return pattern;
+    if (keys.isEmpty()) return currentPattern;
 
-    QString parsed = pattern;
+    QString parsed = currentPattern;
     parsed.replace(QString("$$"), QString("$\\$\\"));
-    for (int i=0; i<foundKeys.count(); i++)
-        parsed.replace(QString("$%1").arg(foundKeys[i]), htmlValue(foundKeys[i]));
-    for (int i=0; i<foundBars.count(); i++)
-        parsed.replace(QString("$%1").arg(foundBars[i]), getItemByTag(foundBars[i])->image(valueByKey(foundBars[i]).toFloat()));
+    for (int i=0; i<keys.count(); i++) {
+        if (keys[i].startsWith(QString("bar")))
+            parsed.replace(QString("$%1").arg(keys[i]), getItemByTag(keys[i])->image(valueByKey(keys[i]).toFloat()));
+        else
+            parsed.replace(QString("$%1").arg(keys[i]), htmlValue(keys[i]));
+    }
     parsed.replace(QString("$\\$\\"), QString("$$"));
     // wrap new lines if required
     if (wrapNewLines) parsed.replace(QString("\n"), QString("<br>"));
@@ -843,8 +842,6 @@ void AWKeys::reinitKeys()
     if (debug) qDebug() << PDEBUG;
 
     keys = dictKeys();
-    foundBars = findGraphicalItems();
-    foundKeys = findKeys();
 }
 
 
@@ -1319,41 +1316,6 @@ float AWKeys::temperature(const float temp, const QString units)
 }
 
 
-QStringList AWKeys::findGraphicalItems()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    QStringList orderedKeys;
-    for (int i=0; i<graphicalItems.count(); i++)
-        orderedKeys.append(graphicalItems[i]->name() + graphicalItems[i]->bar());
-    orderedKeys.sort();
-
-    QStringList selectedKeys;
-    for (int i=orderedKeys.count()-1; i>=0; i--)
-        if (pattern.contains(QString("$%1").arg(orderedKeys[i]))) {
-            if (debug) qDebug() << PDEBUG << ":" << "Found key" << orderedKeys[i];
-            selectedKeys.append(orderedKeys[i]);
-        }
-
-    return selectedKeys;
-}
-
-
-QStringList AWKeys::findKeys()
-{
-    QStringList selectedKeys;
-    for (int i=0; i<keys.count(); i++) {
-        if (keys[i].startsWith(QString("bar"))) continue;
-        if (pattern.contains(QString("$%1").arg(keys[i]))) {
-            if (debug) qDebug() << PDEBUG << ":" << "Found key" << keys[i];
-            selectedKeys.append(keys[i]);
-        }
-    }
-
-    return selectedKeys;
-}
-
-
 QList<ExtQuotes *> AWKeys::getExtQuotes()
 {
     if (debug) qDebug() << PDEBUG;
diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h
index 2fa7b32..d71af67 100644
--- a/sources/awesome-widget/plugin/awkeys.h
+++ b/sources/awesome-widget/plugin/awkeys.h
@@ -51,12 +51,12 @@ public:
     AWKeys(QObject *parent = nullptr);
     ~AWKeys();
 
-    Q_INVOKABLE void initKeys(const QString currentPattern);
+    Q_INVOKABLE void initKeys();
     Q_INVOKABLE void initTooltip(const QVariantMap tooltipParams);
     Q_INVOKABLE void setPopupEnabled(const bool popup = false);
     Q_INVOKABLE void setWrapNewLines(const bool wrap = false);
     Q_INVOKABLE bool isDebugEnabled();
-    Q_INVOKABLE QString parsePattern();
+    Q_INVOKABLE QString parsePattern(const QString currentPattern);
     Q_INVOKABLE QString toolTipImage();
     Q_INVOKABLE QSize toolTipSize();
     // keys
@@ -93,9 +93,6 @@ private:
     QString htmlValue(QString key);
     int numberCpus();
     float temperature(const float temp, const QString units);
-    // find methods
-    QStringList findGraphicalItems();
-    QStringList findKeys();
     // get methods
     QList<ExtQuotes *> getExtQuotes();
     QList<ExtScript *> getExtScripts();
@@ -120,10 +117,8 @@ private:
     QList<ExtQuotes *> extQuotes;
     QList<ExtScript *> extScripts;
     QList<ExtUpgrade *> extUpgrade;
-    QStringList foundBars, foundKeys, keys;
-    QString pattern;
     QMap<QString, QString> values;
-    QStringList diskDevices, hddDevices, mountDevices, networkDevices, tempDevices;
+    QStringList keys, diskDevices, hddDevices, mountDevices, networkDevices, tempDevices;
 };