mirror of
https://github.com/arcan1s/awesome-widgets.git
synced 2025-04-24 23:47:20 +00:00
fixes
This commit is contained in:
parent
05b65679d9
commit
b8fd9cd51f
@ -245,19 +245,21 @@ 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)[0] == QString("ALBUM"))
|
if ((qstr.split(QString(" = "), QString::SkipEmptyParts).count() > 1) || (qstr.at(0) == QChar('['))) {
|
||||||
value_album = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed();
|
if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("ALBUM"))
|
||||||
else if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("ARTIST"))
|
value_album = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed();
|
||||||
value_artist = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed();
|
else if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("ARTIST"))
|
||||||
else if (qstr.at(0) == QChar('[')) {
|
value_artist = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed();
|
||||||
QString time = qstr.split(QString(" "), QString::SkipEmptyParts)[2].trimmed();
|
else if (qstr.at(0) == QChar('[')) {
|
||||||
value_progress = QString::number(time.split(QString("/"), QString::SkipEmptyParts)[0].split(QString(":"), QString::SkipEmptyParts)[0].toInt() * 60 +
|
QString time = qstr.split(QString(" "), QString::SkipEmptyParts)[2].trimmed();
|
||||||
time.split(QString("/"), QString::SkipEmptyParts)[0].split(QString(":"), QString::SkipEmptyParts)[1].toInt());
|
value_progress = QString::number(time.split(QString("/"), QString::SkipEmptyParts)[0].split(QString(":"), QString::SkipEmptyParts)[0].toInt() * 60 +
|
||||||
value_duration = QString::number(time.split(QString("/"), QString::SkipEmptyParts)[1].split(QString(":"), QString::SkipEmptyParts)[0].toInt() * 60 +
|
time.split(QString("/"), QString::SkipEmptyParts)[0].split(QString(":"), QString::SkipEmptyParts)[1].toInt());
|
||||||
time.split(QString("/"), QString::SkipEmptyParts)[1].split(QString(":"), QString::SkipEmptyParts)[1].toInt());
|
value_duration = QString::number(time.split(QString("/"), QString::SkipEmptyParts)[1].split(QString(":"), QString::SkipEmptyParts)[0].toInt() * 60 +
|
||||||
|
time.split(QString("/"), QString::SkipEmptyParts)[1].split(QString(":"), QString::SkipEmptyParts)[1].toInt());
|
||||||
|
}
|
||||||
|
else if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("TITLE"))
|
||||||
|
value = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].trimmed();
|
||||||
}
|
}
|
||||||
else if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("TITLE"))
|
|
||||||
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);
|
||||||
@ -281,14 +283,16 @@ 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)[0] == QString("album"))
|
if (qstr.split(QString(": "), QString::SkipEmptyParts).count() > 1) {
|
||||||
value_album = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
|
if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("album"))
|
||||||
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("artist"))
|
value_album = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
|
||||||
value_artist = 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("time"))
|
value_artist = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
|
||||||
value_duration = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
|
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("time"))
|
||||||
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("title"))
|
value_duration = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
|
||||||
value = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
|
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("title"))
|
||||||
|
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);
|
||||||
@ -323,14 +327,16 @@ 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)[0] == QString("Album"))
|
if (qstr.split(QString(": "), QString::SkipEmptyParts).count() > 1) {
|
||||||
value_album = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
|
if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Album"))
|
||||||
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Artist"))
|
value_album = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
|
||||||
value_artist = 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("Time"))
|
value_artist = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
|
||||||
value_duration = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
|
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Time"))
|
||||||
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Title"))
|
value_duration = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
|
||||||
value = qstr.split(QString(": "), QString::SkipEmptyParts)[1].trimmed();
|
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Title"))
|
||||||
|
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);
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user