use sockets from MPD instead of running curl

sources/awesomewidgets/graphicalitemhelper.h

@@ -27,6 +27,8 @@ class QGraphicsScene;
 
 class GraphicalItemHelper : public QObject
 {
+    Q_OBJECT
+
 public:
     explicit GraphicalItemHelper(QObject *parent = nullptr,
                                  QGraphicsScene *scene = nullptr);

sources/awesomewidgets/owmweatherprovider.h

@@ -28,6 +28,8 @@
 
 class OWMWeatherProvider : public AbstractWeatherProvider
 {
+    Q_OBJECT
+
 public:
     explicit OWMWeatherProvider(QObject *parent, const int number);
     virtual ~OWMWeatherProvider();

sources/awesomewidgets/yahooweatherprovider.h

@@ -28,6 +28,8 @@
 
 class YahooWeatherProvider : public AbstractWeatherProvider
 {
+    Q_OBJECT
+
 public:
     explicit YahooWeatherProvider(QObject *parent, const int number);
     virtual ~YahooWeatherProvider();

sources/extsysmonsources/batterysource.h

@@ -25,6 +25,8 @@
 
 class BatterySource : public AbstractExtSysMonSource
 {
+    Q_OBJECT
+
 public:
     explicit BatterySource(QObject *parent, const QStringList args);
     virtual ~BatterySource();

sources/extsysmonsources/customsource.h

@@ -28,6 +28,8 @@ class ExtScript;
 
 class CustomSource : public AbstractExtSysMonSource
 {
+    Q_OBJECT
+
 public:
     explicit CustomSource(QObject *parent, const QStringList args);
     virtual ~CustomSource();

sources/extsysmonsources/desktopsource.h

@@ -25,6 +25,8 @@
 
 class DesktopSource : public AbstractExtSysMonSource
 {
+    Q_OBJECT
+
 public:
     explicit DesktopSource(QObject *parent, const QStringList args);
     virtual ~DesktopSource();

sources/extsysmonsources/gpuloadsource.h

@@ -27,6 +27,8 @@ class QProcess;
 
 class GPULoadSource : public AbstractExtSysMonSource
 {
+    Q_OBJECT
+
 public:
     explicit GPULoadSource(QObject *parent, const QStringList args);
     virtual ~GPULoadSource();

sources/extsysmonsources/gputempsource.h

@@ -27,6 +27,8 @@ class QProcess;
 
 class GPUTemperatureSource : public AbstractExtSysMonSource
 {
+    Q_OBJECT
+
 public:
     explicit GPUTemperatureSource(QObject *parent, const QStringList args);
     virtual ~GPUTemperatureSource();

sources/extsysmonsources/hddtempsource.h

@@ -27,6 +27,8 @@ class QProcess;
 
 class HDDTemperatureSource : public AbstractExtSysMonSource
 {
+    Q_OBJECT
+
 public:
     explicit HDDTemperatureSource(QObject *parent, const QStringList args);
     virtual ~HDDTemperatureSource();

sources/extsysmonsources/loadsource.h

@@ -25,6 +25,8 @@
 
 class LoadSource : public AbstractExtSysMonSource
 {
+    Q_OBJECT
+
 public:
     explicit LoadSource(QObject *parent, const QStringList args);
     virtual ~LoadSource();

sources/extsysmonsources/networksource.h

@@ -25,6 +25,8 @@
 
 class NetworkSource : public AbstractExtSysMonSource
 {
+    Q_OBJECT
+
 public:
     explicit NetworkSource(QObject *parent, const QStringList args);
     virtual ~NetworkSource();

sources/extsysmonsources/playersource.cpp

@@ -35,17 +35,17 @@ PlayerSource::PlayerSource(QObject *parent, const QStringList args)
     qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
 
     m_player = args.at(0);
-    m_mpdAddress = QString("%1:%2").arg(args.at(1)).arg(args.at(2));
+    m_mpdAddress = args.at(1);
+    m_mpdPort = args.at(2).toInt();
     m_mpris = args.at(3);
     m_symbols = args.at(4).toInt();
 
-    m_mpdProcess = new QProcess(nullptr);
-    // fucking magic from http://doc.qt.io/qt-5/qprocess.html#finished
-    connect(m_mpdProcess,
-            static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(
-                &QProcess::finished),
-            [this](int, QProcess::ExitStatus) { return updateMpdValue(); });
-    m_mpdProcess->waitForFinished(0);
+    connect(&m_mpdSocket, SIGNAL(connected()), this,
+            SLOT(mpdSocketConnected()));
+    connect(&m_mpdSocket, SIGNAL(readyRead()), this,
+            SLOT(mpdSocketReadyRead()));
+    connect(&m_mpdSocket, SIGNAL(bytesWritten(qint64)), this,
+            SLOT(mpdSocketWritten(const qint64)));
     m_mpdCached = defaultInfo();
 }
 
@@ -54,8 +54,7 @@ PlayerSource::~PlayerSource()
 {
     qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
 
-    m_mpdProcess->kill();
-    m_mpdProcess->deleteLater();
+    m_mpdSocket.close();
 }
 
 
@@ -182,7 +181,7 @@ void PlayerSource::run()
     // initial data
     if (m_player == QString("mpd")) {
         // mpd
-        m_values = getPlayerMpdInfo(m_mpdAddress);
+        m_values = getPlayerMpdInfo();
     } else if (m_player == QString("mpris")) {
         // players which supports mpris
         if (m_dbusMutex.tryLock()) {
@@ -256,18 +255,21 @@ QString PlayerSource::stripString(const QString &value, const int s)
 }
 
 
-void PlayerSource::updateMpdValue()
+void PlayerSource::mpdSocketConnected()
+{
+    qCDebug(LOG_ESS) << "MPD socket connected to" << m_mpdSocket.peerName()
+                     << "with state" << m_mpdSocket.state();
+}
+
+
+void PlayerSource::mpdSocketReadyRead()
 {
-    qCInfo(LOG_ESS) << "Cmd returns" << m_mpdProcess->exitCode();
-    QString qdebug = QTextCodec::codecForMib(106)
-                         ->toUnicode(m_mpdProcess->readAllStandardError())
-                         .trimmed();
-    qCInfo(LOG_ESS) << "Error" << qdebug;
     QString qoutput = QTextCodec::codecForMib(106)
-                          ->toUnicode(m_mpdProcess->readAllStandardOutput())
+                          ->toUnicode(m_mpdSocket.readAll())
                           .trimmed();
     qCInfo(LOG_ESS) << "Output" << qoutput;
 
+    // parse
     for (auto str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
         if (str.split(QString(": "), QString::SkipEmptyParts).count() == 2) {
             // "Metadata: data"
@@ -292,6 +294,13 @@ void PlayerSource::updateMpdValue()
 }
 
 
+void PlayerSource::mpdSocketWritten(const qint64 bytes)
+{
+    qCDebug(LOG_ESS) << "Bytes written" << bytes << "to"
+                     << m_mpdSocket.peerName();
+}
+
+
 QVariantHash PlayerSource::defaultInfo() const
 {
     QVariantHash info;
@@ -305,16 +314,16 @@ QVariantHash PlayerSource::defaultInfo() const
 }
 
 
-QVariantHash PlayerSource::getPlayerMpdInfo(const QString mpdAddress) const
+QVariantHash PlayerSource::getPlayerMpdInfo()
 {
-    qCDebug(LOG_ESS) << "MPD" << mpdAddress;
-
-    // build cmd
-    QString cmd = QString("bash -c \"echo 'currentsong\nstatus\nclose' | curl "
-                          "--connect-timeout 1 -fsm 3 telnet://%1\"")
-                      .arg(mpdAddress);
-    qCInfo(LOG_ESS) << "cmd" << cmd;
-    m_mpdProcess->start(cmd);
+    if (m_mpdSocket.state() == QAbstractSocket::UnconnectedState) {
+        // connect to host
+        qCInfo(LOG_ESS) << "Connect to" << m_mpdAddress << m_mpdPort;
+        m_mpdSocket.connectToHost(m_mpdAddress, m_mpdPort);
+    } else if (m_mpdSocket.state() == QAbstractSocket::ConnectedState) {
+        // send request
+        m_mpdSocket.write("currentsong\nstatus\n");
+    }
 
     return m_mpdCached;
 }

sources/extsysmonsources/playersource.h

@@ -20,6 +20,7 @@
 
 #include <QMutex>
 #include <QObject>
+#include <QTcpSocket>
 
 #include "abstractextsysmonsource.h"
 
@@ -28,6 +29,8 @@ class QProcess;
 
 class PlayerSource : public AbstractExtSysMonSource
 {
+    Q_OBJECT
+
 public:
     explicit PlayerSource(QObject *parent, const QStringList args);
     virtual ~PlayerSource();
@@ -42,16 +45,19 @@ public:
     static QString stripString(const QString &value, const int s);
 
 private slots:
-    void updateMpdValue();
+    void mpdSocketConnected();
+    void mpdSocketReadyRead();
+    void mpdSocketWritten(const qint64 bytes);
 
 private:
     inline QVariantHash defaultInfo() const;
-    QVariantHash getPlayerMpdInfo(const QString mpdAddress) const;
+    QVariantHash getPlayerMpdInfo();
     QVariantHash getPlayerMprisInfo(const QString mpris) const;
+    QTcpSocket m_mpdSocket;
     // configuration and values
     QString m_mpdAddress;
+    int m_mpdPort;
     QVariantHash m_mpdCached;
-    QProcess *m_mpdProcess = nullptr;
     QString m_mpris;
     QMutex m_dbusMutex;
     QString m_player;

sources/extsysmonsources/processessource.h

@@ -25,6 +25,8 @@
 
 class ProcessesSource : public AbstractExtSysMonSource
 {
+    Q_OBJECT
+
 public:
     explicit ProcessesSource(QObject *parent, const QStringList args);
     virtual ~ProcessesSource();

sources/extsysmonsources/quotessource.h

@@ -28,6 +28,8 @@ class ExtQuotes;
 
 class QuotesSource : public AbstractExtSysMonSource
 {
+    Q_OBJECT
+
 public:
     explicit QuotesSource(QObject *parent, const QStringList args);
     virtual ~QuotesSource();

sources/extsysmonsources/upgradesource.h

@@ -28,6 +28,8 @@ class ExtUpgrade;
 
 class UpgradeSource : public AbstractExtSysMonSource
 {
+    Q_OBJECT
+
 public:
     explicit UpgradeSource(QObject *parent, const QStringList args);
     virtual ~UpgradeSource();

sources/extsysmonsources/weathersource.h

@@ -28,6 +28,8 @@ class ExtWeather;
 
 class WeatherSource : public AbstractExtSysMonSource
 {
+    Q_OBJECT
+
 public:
     explicit WeatherSource(QObject *parent, const QStringList args);
     virtual ~WeatherSource();