This commit is contained in:
arcan1s 2014-03-31 07:17:15 +04:00
parent 05b65679d9
commit b8fd9cd51f
2 changed files with 37 additions and 32 deletions

View File

@ -245,6 +245,7 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
qoutput = QTextCodec::codecForMib(106)->toUnicode(player.readAllStandardOutput()); qoutput = QTextCodec::codecForMib(106)->toUnicode(player.readAllStandardOutput());
for (int i=0; i<qoutput.split(QString("\n"), QString::SkipEmptyParts).count(); i++) { for (int i=0; i<qoutput.split(QString("\n"), QString::SkipEmptyParts).count(); i++) {
qstr = qoutput.split(QString("\n"), QString::SkipEmptyParts)[i]; qstr = qoutput.split(QString("\n"), QString::SkipEmptyParts)[i];
if ((qstr.split(QString(" = "), QString::SkipEmptyParts).count() > 1) || (qstr.at(0) == QChar('['))) {
if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("ALBUM")) if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("ALBUM"))
value_album = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed(); value_album = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed();
else if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("ARTIST")) else if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("ARTIST"))
@ -259,6 +260,7 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
else if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("TITLE")) else if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("TITLE"))
value = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed(); value = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed();
} }
}
key = QString("qmmp_album"); key = QString("qmmp_album");
setData(source, key, value_album); setData(source, key, value_album);
key = QString("qmmp_artist"); key = QString("qmmp_artist");
@ -281,6 +283,7 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
qoutput = QTextCodec::codecForMib(106)->toUnicode(player.readAllStandardOutput()); qoutput = QTextCodec::codecForMib(106)->toUnicode(player.readAllStandardOutput());
for (int i=0; i<qoutput.split(QString("\n"), QString::SkipEmptyParts).count(); i++) { for (int i=0; i<qoutput.split(QString("\n"), QString::SkipEmptyParts).count(); i++) {
qstr = qoutput.split(QString("\n"), QString::SkipEmptyParts)[i]; qstr = qoutput.split(QString("\n"), QString::SkipEmptyParts)[i];
if (qstr.split(QString(": "), QString::SkipEmptyParts).count() > 1) {
if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("album")) if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("album"))
value_album = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed(); value_album = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("artist")) else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("artist"))
@ -290,6 +293,7 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("title")) else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("title"))
value = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed(); value = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
} }
}
player.start("qdbus org.kde.amarok /Player PositionGet"); player.start("qdbus org.kde.amarok /Player PositionGet");
player.waitForFinished(-1); player.waitForFinished(-1);
qoutput = player.readAllStandardOutput(); qoutput = player.readAllStandardOutput();
@ -323,6 +327,7 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
qoutput = QTextCodec::codecForMib(106)->toUnicode(player.readAllStandardOutput()); qoutput = QTextCodec::codecForMib(106)->toUnicode(player.readAllStandardOutput());
for (int i=0; i<qoutput.split(QString("\n"), QString::SkipEmptyParts).count(); i++) { for (int i=0; i<qoutput.split(QString("\n"), QString::SkipEmptyParts).count(); i++) {
qstr = qoutput.split(QString("\n"), QString::SkipEmptyParts)[i]; qstr = qoutput.split(QString("\n"), QString::SkipEmptyParts)[i];
if (qstr.split(QString(": "), QString::SkipEmptyParts).count() > 1) {
if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Album")) if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Album"))
value_album = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed(); value_album = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Artist")) else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Artist"))
@ -332,6 +337,7 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Title")) else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Title"))
value = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed(); value = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
} }
}
key = QString("mpd_album"); key = QString("mpd_album");
setData(source, key, value_album); setData(source, key, value_album);
key = QString("mpd_artist"); key = QString("mpd_artist");

View File

@ -88,8 +88,7 @@ class DataEngine:
def dataUpdated(self, sourceName, data): def dataUpdated(self, sourceName, data):
"""function to update data""" """function to update data"""
#try: try:
if True:
if (sourceName == "system/uptime"): if (sourceName == "system/uptime"):
value = datetime.timedelta(0, int(round(float(data[QString(u'value')]), 1))) value = datetime.timedelta(0, int(round(float(data[QString(u'value')]), 1)))
days = value.days days = value.days
@ -339,5 +338,5 @@ class DataEngine:
self.parent.label_time.setText(text) self.parent.label_time.setText(text)
self.parent.update() self.parent.update()
#except: except:
#pass pass