prepare to move to generic bars

This commits series introduces bars which may be calculated from any
custom formula. For a start I've renamed $bar*tag to $bar* and add new
configuration parameters to graphical items.

sources/awesome-widget/plugin/awkeycache.cpp

@@ -91,11 +91,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &keys,
 
     // initial copy
     QSet<QString> used = QSet<QString>::fromList(keys);
-    // insert bars
-    for (auto bar : bars) {
-        bar.remove(QRegExp(QString("^bar[0-9]{1,}")));
-        used << bar;
-    }
+    used.unite(QSet<QString>::fromList(bars));
     // insert keys from tooltip
     for (auto key : tooltip.keys()) {
         if ((key.endsWith(QString("Tooltip"))) && (tooltip[key].toBool())) {

sources/awesome-widget/plugin/awkeyoperations.cpp

@@ -226,12 +226,8 @@ QStringList AWKeyOperations::dictKeys() const
     allKeys.append(QString("la5"));
     allKeys.append(QString("la1"));
     // bars
-    QStringList graphicalItemsKeys;
-    for (auto item : graphicalItems->items())
-        graphicalItemsKeys.append(item->tag());
-    graphicalItemsKeys.sort();
-    for (int i = graphicalItemsKeys.count() - 1; i >= 0; i--)
-        allKeys.append(graphicalItemsKeys.at(i));
+    for (int i = graphicalItems->activeItems().count() -1; i >= 0; i--)
+        allKeys.append(graphicalItems->activeItems().at(i)->tag(QString("bar")));
 
     return allKeys;
 }
@@ -243,7 +239,7 @@ GraphicalItem *AWKeyOperations::giByKey(const QString key) const
 {
     qCDebug(LOG_AW) << "Looking for item" << key;
 
-    return graphicalItems->itemByTag(key);
+    return graphicalItems->itemByTag(key, QString("bar"));
 }
 
 
@@ -251,11 +247,10 @@ QString AWKeyOperations::infoByKey(QString key) const
 {
     qCDebug(LOG_AW) << "Requested key" << key;
 
-    key.remove(QRegExp(QString("^bar[0-9]{1,}")));
-    if (key.startsWith(QString("custom")))
-        return extScripts->itemByTagNumber(
-                             key.remove(QString("custom")).toInt())
-            ->uniq();
+    if (key.startsWith(QString("bar")))
+        return graphicalItems->itemByTag(key, QString("bar"))->uniq();
+    else if (key.startsWith(QString("custom")))
+        return extScripts->itemByTag(key, QString("custom"))->uniq();
     else if (key.contains(QRegExp(QString("^hdd[rw]"))))
         return QString("%1").arg(m_devices[QString(
             "disk")][key.remove(QRegExp(QString("hdd[rw]"))).toInt()]);
@@ -273,24 +268,12 @@ QString AWKeyOperations::infoByKey(QString key) const
         return QString("%1").arg(m_devices[QString(
             "net")][key.remove(QRegExp(QString("^(down|up)"))).toInt()]);
     else if (key.startsWith(QString("pkgcount")))
-        return extUpgrade->itemByTagNumber(
-                             key.remove(QString("pkgcount")).toInt())
-            ->uniq();
+        return extUpgrade->itemByTag(key, QString("pkgcount"))->uniq();
     else if (key.contains(QRegExp(QString("(^|perc)(ask|bid|price)(chg|)"))))
-        return extQuotes->itemByTagNumber(
-                            key.remove(QRegExp(QString(
-                                           "(^|perc)(ask|bid|price)(chg|)")))
-                                .toInt())
-            ->uniq();
+        return extQuotes->itemByTag(key, QString("ask"))->uniq();
     else if (key.contains(QRegExp(
                  QString("(weather|weatherId|humidity|pressure|temperature)"))))
-        return extWeather
-            ->itemByTagNumber(
-                key
-                    .remove(QRegExp(QString(
-                        "(weather|weatherId|humidity|pressure|temperature)")))
-                    .toInt())
-            ->uniq();
+        return extWeather->itemByTag(key, QString("weather"))->uniq();
     else if (key.startsWith(QString("temp")))
         return QString("%1").arg(
             m_devices[QString("temp")][key.remove(QString("temp")).toInt()]);

sources/awesome-widget/plugin/awkeys.cpp

@@ -205,9 +205,19 @@ void AWKeys::reinitKeys(const QStringList currentKeys)
     m_foundKeys
         = AWPatternFunctions::findKeys(keyOperator->pattern(), currentKeys);
     m_foundLambdas = AWPatternFunctions::findLambdas(keyOperator->pattern());
+    // generate list of required keys for bars
+    QStringList barKeys;
+    for (auto bar : m_foundBars) {
+        GraphicalItem *item = keyOperator->giByKey(bar);
+        if (item->isCustom())
+            item->setUsedKeys(AWPatternFunctions::findKeys(item->bar(), currentKeys));
+        else
+            item->setUsedKeys(QStringList() << item->bar());
+        barKeys.append(item->usedKeys());
+    }
     // get required keys
     m_requiredKeys
-        = m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, m_foundBars,
+        = m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys,
                                                    m_tooltipParams, currentKeys)
                      : QStringList();
 
@@ -318,16 +328,29 @@ QString AWKeys::parsePattern(QString pattern) const
     // bars
     for (auto bar : m_foundBars) {
         GraphicalItem *item = keyOperator->giByKey(bar);
-        QString key = bar;
-        key.remove(QRegExp(QString("^bar[0-9]{1,}")));
         if (item->type() == GraphicalItem::Graph)
             pattern.replace(QString("$%1").arg(bar),
-                            item->image([](const QList<float> data) {
-                                return QVariant::fromValue<QList<float>>(data);
-                            }(dataAggregator->getData(key))));
-        else
-            pattern.replace(QString("$%1").arg(bar),
-                            item->image(values[key].toFloat()));
+                            item->image(QVariant::fromValue<QList<float>>(dataAggregator->getData(item->bar()))));
+        else {
+            if (item->isCustom())
+                pattern.replace(QString("$%1").arg(bar),item->image([this, item](QString bar ){
+                    QJSEngine engine;
+                    for (auto key : item->usedKeys())
+                        bar.replace(QString("$%1").arg(key), aggregator->formater(values[key], key));
+                    qCInfo(LOG_AW) << "Expression" << bar;
+                    QJSValue result = engine.evaluate(bar);
+                    if (result.isError()) {
+                        qCWarning(LOG_AW) << "Uncaught exception at line"
+                                          << result.property("lineNumber").toInt()
+                                          << ":" << result.toString();
+                        return QString();
+                    } else {
+                        return result.toString();
+                    }
+                }(item->bar())));
+            else
+                pattern.replace(QString("$%1").arg(bar),item->image(values[item->bar()]));
+        }
     }
 
     // prepare strings

sources/awesome-widget/plugin/awkeysaggregator.cpp

@@ -539,7 +539,8 @@ QStringList AWKeysAggregator::registerSource(const QString &source,
     // drop key from dictionary if no one user requested key required it
     QStringList foundKeys = keysFromSource(source);
     qCInfo(LOG_AW) << "Looking for keys" << foundKeys << "in" << keys;
-    // let required if key list is empty no one use it
+    // this source is required if list is empty (which means skip checking)
+    // or if key in required key list
     bool required
         = keys.isEmpty() || std::any_of(foundKeys.cbegin(), foundKeys.cend(),
                                         [&keys](const QString &key) {