Edited for 1.5 ext-sysmon

This commit is contained in:
arcan1s 2013-11-18 19:51:57 +04:00
parent 916c32589f
commit ccaca2a725
5 changed files with 22 additions and 16 deletions

View File

@ -22,8 +22,9 @@ makedepends=('automoc4' 'cmake')
source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}.plasmoid source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}.plasmoid
https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_dtengine}-${_dtver}.zip) https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_dtengine}-${_dtver}.zip)
install=${pkgname}.install install=${pkgname}.install
md5sums=('9872eedca313768f18de0facc2fc135d' md5sums=('3e128738a0fcb90f41c57bd6cc4a249c'
'29a0fbc2014b0b7cacfab8186a56a1b6') 'ff3144a9f0d74f80a5ab6bf2f3bdf9a1')
backup=('usr/share/config/extsysmon.conf')
build () build ()
{ {

Binary file not shown.

View File

@ -23,4 +23,4 @@ target_link_libraries (${PLUGIN_NAME} ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS})
# install # install
install (TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGIN_INSTALL_DIR}) install (TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGIN_INSTALL_DIR})
install (FILES ${PROJECT_DESKTOP} DESTINATION ${SERVICES_INSTALL_DIR}) install (FILES ${PROJECT_DESKTOP} DESTINATION ${SERVICES_INSTALL_DIR})
install (FILES ${PROJECT_CONF} DESTINATION ../etc/) install (FILES ${PROJECT_CONF} DESTINATION ${CONFIG_INSTALL_DIR})

View File

@ -31,7 +31,7 @@ ExtendedSysMon::ExtendedSysMon(QObject* parent, const QVariantList& args)
Q_UNUSED(args) Q_UNUSED(args)
setMinimumPollingInterval(333); setMinimumPollingInterval(333);
readConfiguration(QString("/etc/extsysmon.conf")); readConfiguration(QString("/usr/share/config/extsysmon.conf"));
} }
QStringList ExtendedSysMon::sources() const QStringList ExtendedSysMon::sources() const
@ -86,30 +86,32 @@ bool ExtendedSysMon::readConfiguration(const QString confFileName)
break; break;
else if (fileStr[0] != '#') else if (fileStr[0] != '#')
{ {
if (fileStr.split(QString("="), QString::SkipEmptyParts).count() == 1) if (fileStr.split(QString("="), QString::SkipEmptyParts).count() == 2)
{ {
if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("GPUDEV")) if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("GPUDEV"))
{ {
if (fileStr.split(QString("="), QString::SkipEmptyParts)[1] == QString("ati")) if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] == QString("ati"))
gpudev = fileStr.split(QString("="), QString::SkipEmptyParts)[1]; gpudev = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1] == QString("nvidia")) else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] == QString("nvidia"))
gpudev = fileStr.split(QString("="), QString::SkipEmptyParts)[1]; gpudev = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1] == QString("ignore")) else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] != QString("auto"))
gpudev = QString("ignore"); gpudev = QString("ignore");
} }
else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("HDDDEV")) else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("HDDDEV"))
{ {
if (fileStr.split(QString("="), QString::SkipEmptyParts)[1] != QString("all")) if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] != QString("all"))
{ {
hdddev.clear(); hdddev.clear();
for (int i=0; i<fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString(","), QString::SkipEmptyParts).count(); i++) for (int i=0; i<fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), \
hdddev.append(fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString(","), QString::SkipEmptyParts)[i]); QString::SkipEmptyParts)[0].split(QString(","), QString::SkipEmptyParts).count(); i++)
hdddev.append(fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), \
QString::SkipEmptyParts)[0].split(QString(","), QString::SkipEmptyParts)[i]);
} }
} }
else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("MPDADDRESS")) else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("MPDADDRESS"))
mpdAddress = fileStr.split(QString("="), QString::SkipEmptyParts)[1]; mpdAddress = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("MPDPORT")) else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("MPDPORT"))
mpdPort = fileStr.split(QString("="), QString::SkipEmptyParts)[1]; mpdPort = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
} }
} }
} }
@ -288,7 +290,10 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
QString value_artist; QString value_artist;
value = QString("N\\A"); value = QString("N\\A");
value_artist = QString("N\\A"); value_artist = QString("N\\A");
f_out = popen("echo 'currentsong\nclose' | curl --connect-timeout 1 -fsm 3 telnet://localhost:6600 2> /dev/null", "r"); char commandStr[512];
sprintf (commandStr, "echo 'currentsong\nclose' | curl --connect-timeout 1 -fsm 3 telnet://%s:%s 2> /dev/null", \
mpdAddress.toUtf8().data(), mpdPort.toUtf8().data());
f_out = popen(commandStr, "r");
while (true) while (true)
{ {
fgets(output, 256, f_out); fgets(output, 256, f_out);

Binary file not shown.