The branch, frodo has been updated
via 3f498d146afd17535c07a3519b22929256b0beb2 (commit)
from 7cac7689bb5e8abf90dd56f3c0ccc449abd8d1b8 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=3f498d146afd17535c07a3519b22929256b0beb2
commit 3f498d146afd17535c07a3519b22929256b0beb2
Author: ronie <[email protected]>
Date: Sun Mar 3 18:54:28 2013 +0100
[script.speedfaninfo] -v0.5.4
diff --git a/script.speedfaninfo/CHANGELOG.txt
b/script.speedfaninfo/CHANGELOG.txt
index 0ab901b..dd8c740 100644
--- a/script.speedfaninfo/CHANGELOG.txt
+++ b/script.speedfaninfo/CHANGELOG.txt
@@ -1,8 +1,22 @@
-v.0.5.1
+v 0.5.4
+- changed display logic so percents will show even in the number of percent
entries doesn't match number of speed entries
+- added Galician language files
+- changed over to Frodo .po language files
+- added check to threading loop for XBMC quitting
+- updated addon.xml with new information and format for repo database
+- updated logging so it uses standard XBMC logging levels
+
+v.0.5.3
+- internal testing version
+
+v.0.5.2
- updated language files from Transifex
- added compact display option
- added logic to keep script from being run multiple times
+v0.5.1
+- internal testing version
+
v0.5.0
- updated language files from Transifex
diff --git a/script.speedfaninfo/addon.xml b/script.speedfaninfo/addon.xml
index 3cce372..d37fa92 100644
--- a/script.speedfaninfo/addon.xml
+++ b/script.speedfaninfo/addon.xml
@@ -1,43 +1,52 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.speedfaninfo"
- name="SpeedFan Information Display" version="0.5.2"
provider-name="kylejohnson (pkscuot)">
- <requires>
- <import addon="xbmc.python" version="2.1.0"/>
- </requires>
- <extension point="xbmc.python.script" library="default.py">
- <provides>executable</provides>
- </extension>
- <extension point="xbmc.addon.metadata">
- <summary lang="be">Display information from your SpeedFan log.</summary>
- <summary lang="da">Vis information fra din SpeedFan log.</summary>
- <summary lang="de">Zeige Informationen aus deinem SpeedFan Log.</summary>
- <summary lang="el">Î Ïοβολή ÏληÏοÏοÏιÏν αÏÏ Ïο
αÏÏείο καÏαγÏαÏÎ®Ï ÏοÏ
SpeedFan.</summary>
- <summary lang="en">Display information from your SpeedFan log.</summary>
- <summary lang="es">Muestra información del log de SpeedFan</summary>
- <summary lang="es_MX">Muestra información desde tu log de
SpeedFan</summary>
- <summary lang="he">××¦× ××× ×¢× ×××× ×¨×ש×× ×××ר×ת
××××רר</summary>
- <summary lang="hu">Ventilátor-sebesség napló megjelenÃtése</summary>
- <summary lang="it">Mostra le informazioni dal tuo log di SpeedFan</summary>
- <summary lang="pl">WyÅwietla infromacje z dziennika SpeedFan</summary>
- <summary lang="pt">Exibe informação do seu log do Speedfan.</summary>
- <summary lang="pt_BR">Mostrar informações de seu registro
SpeedFan.</summary>
- <summary lang="sk">Zobraziť informácie z Vášho SpeedFan logu.</summary>
- <summary lang="sv">Visar information från din SpeedFan logg.</summary>
- <description lang="be">Parses and displays information from the SpeedFan
log. While this plugin works on any platform, SpeedFan only works on Windows,
so it is optimally built for people using XBMC on Windows. Please see
readme.txt for information on how to configure your SpeedFan log so that the
plugin can parse it properly.</description>
- <description lang="da">Henter og viser information fra SpeedFan log'en.
Selvom dette plugin virker på alle platforme, fungerer SpeedFan kun i Windows,
så det er skabt for folk, som kører XBMC på Windows. Se venligst readme.txt
for information om hvordan du opsætter din SpeedFan log, så plugin'et kan
læse den korrekt.</description>
- <description lang="de">Analysiert und zeigt Informationen vom SpeedFan
log. Während dieses Plugin auf allen Plattformen funktioniert, läuft SpeedFan
nur unter Windows, also ist es optimal für, die, die XBMC unter Windows
nutzen. Bitte lieà die readme.txt für Informationen, wie SpeedFan
konfiguriert werden muss, dass das Plugin den Log korrekt analysieren
kann.</description>
- <description lang="el">ÎναλÏει και ÏÏοβάλλει
ÏληÏοÏοÏÎ¯ÎµÏ Î±ÏÏ Ïο αÏÏείο καÏαγÏαÏÎ®Ï ÏοÏ
SpeedFan. ÎÎ½Ï Î±Ï
ÏÏ Ïο plugin δοÏ
λεÏει Ïε
οÏοιαδήÏοÏε ÏλαÏÏÏÏμα, Ïο SpeedFan δοÏ
λεÏει
μÏνο Ïε Windows, ÏÏ
νεÏÏÏ ÎµÎ¯Î½Î±Î¹ ÏÏιαγμÎνο για
ανθÏÏÏοÏ
Ï ÏοÏ
ÏÏηÏιμοÏοιοÏν Ïο XBMC Ïε Windows.
ÎείÏε Ïο readme.txt για ÏληÏοÏοÏÎ¯ÎµÏ ÏÏεÏικά με
Ïη ÏÏθμιÏη ÏοÏ
αÏÏείοÏ
καÏαγÏαÏÎ®Ï ÏοÏ
SpeedFan
οÏÏÏÏ ÏÏÏε Ïο plugin να μÏοÏÎÏει να Ïο
αναλÏÏει ÏÏÏÏά.</description>
- <description lang="en">Parses and displays information from the SpeedFan
log. While this plugin works on any platform, SpeedFan only works on Windows,
so it is optimally built for people using XBMC on Windows. Please see
readme.txt for information on how to configure your SpeedFan log so that the
plugin can parse it properly.</description>
- <description lang="es">Analiza y muestra información del log de SpeedFan.
Aunque este complemento funciona en cualquier plataforma, Speedfan sólo
funciona en Windows, por lo que está optimizado para el público que utiliza
XBMC en Windows. Por favor, lea el fichero readme.txt para obtener información
de cómo configurar el log de SpeedFan, de forma que el complemento la
interprete correctamente.</description>
- <description lang="es_MX">Parsea y muestra información desde el log de
SpeedFan. Mientras este plugin funciona en cualquier plataforma, SpeedFan
funciona solamente en Windows, asà que está construido de manera óptima para
personas que usan XBMC en Windows. Para información en como configurar el log
de SpeedFan para que el plugin pueda parsearlo de manera adecuada, revisar
readme.txt.</description>
- <description lang="he">××¢×× ××צ×× ××××¢ ××××× ×¨×ש××
××××רר. ×××× ×©×ª×סף ×× ×¢××× ×¢× ×× ×¤××פ×ר××
ר×ש×× ×××ר×ת ××××רר ×¢××× ×¨×§ ×¢× ×ער××ת
×××סס×ת ××× ××ס,×× ×©×ª×סף ×× × ×× × ×¢××ר ×ער××ת
XBMC ×××סס×ת ××× ××ס, ×××§×©× ×§×¨× ×§×××¥ readme.txt
×××××¢ × ×סף ×¢× ×××¦× ×××××ר ר×ש×× ××××ר×ת
××××רר ×× ×©×ת×סף ×××× ××¢×× ×ת ×××××¢ × ×××
×.</description>
- <description lang="hu">Feldolgozza és megjelenÃti a
ventilátor-sebesség napló adatait. Habár ez a plugin működik az összes
platformon, a SpeedFan csak Windowson fut. Ezért ez a plugin elsÅsorban az
XBMC-t Windowson futtató felhasználóknak készült. Annak érdekében, hogy
az információkat megfelelÅen dolgozzuk fel, olvassa el a readme.txt fájlt,
hogy SpeedFan naplót megfelelÅen beállÃthassa.</description>
- <description lang="it">Analizza e mostra informazioni dal log. di
SpeedFan. Mentre questo plug-in funziona su ogni piattaforma, SpeedFan funziona
solo su Windows, quindi ottimizzato per persone che usano XBMC su Windows.
Leggi il file readme.txt per le informazioni su come configurare il tuo
SpeedFan log. così che il plug-in lo potrà analizzare
correttamente.</description>
- <description lang="pl">Analizuje i wyÅwietla informacje z dziennika
SpeedFan. Podczas gdy ten plugin dziaÅa na każdej platformie, SpeedFan
dziaÅa tylko na Windowsie, wiÄc optymalne jest to by korzystaÄ z niego tylko
na tej platformie. ProszÄ zobaczyÄ readme.txt sÄ
tam informacje jak
skonfigurowaÄ dziennik SpeedFan tak żeby wtyczka mogÅÄ
analizowaÄ go
prawidÅowo.</description>
- <description lang="pt">Recolhe e exibe informação do log do Speedfan.
Apesar deste plugin funcionar em qualquer plataforma, o Speedfan apenas
funciona no Windows. Por favor verifique o readme.txt para obter informação
sobre como configurar o seu log do Speedfan, para o plugin poder analisá-lo
correctamente.</description>
- <description lang="pt_BR">Analisa e apresenta informações do registro
SpeedFan. Embora este plugin funcione em qualquer plataforma, SpeedFan só
funciona no Windows, então é optimizado para as pessoas que utilizam o XBMC
no Windows. Por favor, veja o arquivo readme.txt para obter informações sobre
como configurar o registro SpeedFan para que o plugin possa analisá-lo
corretamente.</description>
- <description lang="sk">Rozoberá a zobrazuje informácie zo SpeedFan logu.
SÃce tento doplnok funguje na vÅ¡etkých platformách, SpeedFan funguje len na
Windows, a preto je tento doplnok urÄený užÃvateľom XBMC na Windows.
ProsÃm preÄÃtajte readme.txt aby ste sa dozvedeli ako nastaviÅ¥ SpeedFan log
tak, aby ho tento doplnok vedel správne rozoberať.</description>
- <description lang="sv">Analyserar och visar information från SpeedFan
loggen. Trots att detta tillägg fungerar på alla plattformar, fungerar
SpeedFan endast på Windows, så det är optimerat för folk som använder XBMC
på Windows. Läs readme.txt för mer information hur du konfigurerar din
SpeedFan logg så att tillägget kan analysera det riktigt.</description>
- <platform>all</platform>
- </extension>
+<addon id="script.speedfaninfo" name="SpeedFan Information Display"
version="0.5.4" provider-name="pkscuot">
+ <requires>
+ <import addon="xbmc.python" version="2.1.0"/>
+ </requires>
+ <extension point="xbmc.python.script" library="default.py">
+ <provides>executable</provides>
+ </extension>
+ <extension point="xbmc.addon.metadata">
+
<website>http://wiki.xbmc.org/index.php?title=Add-on:SpeedFan_Information_Display</website>
+ <forum>http://forum.xbmc.org/showthread.php?p=1014479</forum>
+ <source>https://github.com/pkscout/script.speedfaninfo</source>
+ <email>kyle dot johnson at alumni dot duke dot edu</email>
+ <summary lang="be">Display information from your SpeedFan
log.</summary>
+ <summary lang="da">Vis oplysninger fra din
SpeedFan-log.</summary>
+ <summary lang="de">Zeige Informationen aus deinem SpeedFan
Log.</summary>
+ <summary lang="el">Î Ïοβολή ÏληÏοÏοÏιÏν αÏÏ
Ïο αÏÏείο καÏαγÏαÏÎ®Ï ÏοÏ
SpeedFan.</summary>
+ <summary lang="en">Display information from your SpeedFan
log.</summary>
+ <summary lang="es">Muestra información del log de
SpeedFan</summary>
+ <summary lang="es_MX">Muestra información desde tu log de
SpeedFan</summary>
+ <summary lang="fr">Afficher les informations a partir du
journal de SpeedFan</summary>
+ <summary lang="gl">Amosar información do teu rexistro de
SpeedFan.</summary>
+ <summary lang="he">××¦× ××× ×¢× ×××× ×¨×ש××
×××ר×ת ××××רר</summary>
+ <summary lang="hu">Ventilátor-sebesség napló
megjelenÃtése</summary>
+ <summary lang="it">Mostra le informazioni dal tuo log di
SpeedFan</summary>
+ <summary lang="nl">Laat informatie zien van het SpeedFan
log</summary>
+ <summary lang="pl">WyÅwietla infromacje z dziennika
SpeedFan</summary>
+ <summary lang="pt">Exibe informação do seu log do
Speedfan.</summary>
+ <summary lang="pt_BR">Mostrar informações de seu registro
SpeedFan.</summary>
+ <summary lang="sk">Zobraziť informácie z Vášho SpeedFan
logu.</summary>
+ <summary lang="sv">Visar information från din SpeedFan
logg.</summary>
+ <description lang="be">Parses and displays information from the
SpeedFan log. While this plugin works on any platform, SpeedFan only works on
Windows, so it is optimally built for people using XBMC on Windows. Please see
readme.txt for information on how to configure your SpeedFan log so that the
plugin can parse it properly.</description>
+ <description lang="da">Henter og viser information fra SpeedFan
log'en. Selvom dette plugin virker på alle platforme, fungerer SpeedFan kun i
Windows og er dermed skabt for folk, som kører XBMC på Windows. Se venligst
readme.txt for oplysninger om, hvordan du opsætter din SpeedFan log, så
plugin'et kan læse den korrekt.</description>
+ <description lang="de">Analysiert und zeigt Informationen vom
SpeedFan log. Während dieses Plugin auf allen Plattformen funktioniert, läuft
SpeedFan nur unter Windows, also ist es optimal für, die, die XBMC unter
Windows nutzen. Bitte lieà die readme.txt für Informationen, wie SpeedFan
konfiguriert werden muss, dass das Plugin den Log korrekt analysieren
kann.</description>
+ <description lang="el">ÎναλÏει και ÏÏοβάλλει
ÏληÏοÏοÏÎ¯ÎµÏ Î±ÏÏ Ïο αÏÏείο καÏαγÏαÏÎ®Ï ÏοÏ
SpeedFan. ÎÎ½Ï Î±Ï
ÏÏ Ïο plugin δοÏ
λεÏει Ïε
οÏοιαδήÏοÏε ÏλαÏÏÏÏμα, Ïο SpeedFan δοÏ
λεÏει
μÏνο Ïε Windows, ÏÏ
νεÏÏÏ ÎµÎ¯Î½Î±Î¹ ÏÏιαγμÎνο για
ανθÏÏÏοÏ
Ï ÏοÏ
ÏÏηÏιμοÏοιοÏν Ïο XBMC Ïε Windows.
ÎείÏε Ïο readme.txt για ÏληÏοÏοÏÎ¯ÎµÏ ÏÏεÏικά με
Ïη ÏÏθμιÏη ÏοÏ
αÏÏείοÏ
καÏαγÏαÏÎ®Ï ÏοÏ
SpeedFan
οÏÏÏÏ ÏÏÏε Ïο plugin να μÏοÏÎÏει να Ïο
αναλÏÏει ÏÏÏÏά.</description>
+ <description lang="en">Parses and displays information from the
SpeedFan log. While this plugin works on any platform, SpeedFan only works on
Windows, so it is optimally built for people using XBMC on Windows. Please see
readme.txt for information on how to configure your SpeedFan log so that the
plugin can parse it properly.</description>
+ <description lang="es">Analiza y muestra información del log
de SpeedFan. Aunque este complemento funciona en cualquier plataforma, Speedfan
sólo funciona en Windows, por lo que está optimizado para el público que
utiliza XBMC en Windows. Por favor, lea el fichero readme.txt para obtener
información de cómo configurar el log de SpeedFan, de forma que el
complemento la interprete correctamente.</description>
+ <description lang="es_MX">Parsea y muestra información desde
el log de SpeedFan. Mientras este plugin funciona en cualquier plataforma,
SpeedFan funciona solamente en Windows, asà que está construido de manera
óptima para personas que usan XBMC en Windows. Para información en como
configurar el log de SpeedFan para que el plugin pueda parsearlo de manera
adecuada, revisar readme.txt.</description>
+ <description lang="fr">Analyse et affiche les informations a
partir du journal de SpeedFan. Même si ce module fonctionne sur toutes les
plateformes, SpeedFan ne fonctionne que sous Windows, il est donc optimisé
pour les utilisateurs de XBMC sous Windows. Merci de lire le fichier readme.txt
pour savoir comment configurer votre journal SpeedFan afin que le module puisse
l'analyser correctement.</description>
+ <description lang="gl">Ananilza e amosa información do
rexistro de SpeedFan. Mentres que este engadido funciona en calquera
plataforma, SpeedFan só funciona baixo Windows polo que está optimizado para
o XBMC de Windows. Por favor lea readme.txt para obter información de como
configurar o rexistro de SpeedFan para que o engadido o poda analizar dunha
forma axeitada.</description>
+ <description lang="he">××¢×× ××צ×× ××××¢ ×××××
ר×ש×× ××××רר. ×××× ×©×ª×סף ×× ×¢××× ×¢× ××
פ××פ×ר×× ×¨×ש×× ×××ר×ת ××××רר ×¢××× ×¨×§ ×¢×
×ער××ת ×××סס×ת ××× ××ס,×× ×©×ª×סף ×× × ×× × ×¢××ר
×ער××ת XBMC ×××סס×ת ××× ××ס, ×××§×©× ×§×¨× ×§×××¥
readme.txt ×××××¢ × ×סף ×¢× ×××¦× ×××××ר ר×ש××
××××ר×ת ××××רר ×× ×©×ת×סף ×××× ××¢×× ×ת ×××××¢
× ××× ×.</description>
+ <description lang="hu">Feldolgozza és megjelenÃti a
ventilátor-sebesség napló adatait. Habár ez a plugin működik az összes
platformon, a SpeedFan csak Windowson fut. Ezért ez a plugin elsÅsorban az
XBMC-t Windowson futtató felhasználóknak készült. Annak érdekében, hogy
az információkat megfelelÅen dolgozzuk fel, olvassa el a readme.txt fájlt,
hogy SpeedFan naplót megfelelÅen beállÃthassa.</description>
+ <description lang="it">Analizza e mostra informazioni dal log.
di SpeedFan. Mentre questo plug-in funziona su ogni piattaforma, SpeedFan
funziona solo su Windows, quindi ottimizzato per persone che usano XBMC su
Windows. Leggi il file readme.txt per le informazioni su come configurare il
tuo SpeedFan log. così che il plug-in lo potrà analizzare
correttamente.</description>
+ <description lang="nl">Verzameld en laat informatie zien van
het SpeedFan log. Deze plugin werkt op elk platform alleen werkt SpeedFan enkel
op Windows en is daarom geoptimaliseerd voor mensen die XBMC gebruiken op
Windows. Lees alstublieft readme.txt voor informatie hoe je het SpeedFan log in
kunt stellen zodat de plugin correct de gegevens verzameld.</description>
+ <description lang="pl">Analizuje i wyÅwietla informacje z
dziennika SpeedFan. Podczas gdy ten plugin dziaÅa na każdej platformie,
SpeedFan dziaÅa tylko na Windowsie, wiÄc optymalne jest to by korzystaÄ z
niego tylko na tej platformie. ProszÄ zobaczyÄ readme.txt sÄ
tam informacje
jak skonfigurowaÄ dziennik SpeedFan tak żeby wtyczka mogÅÄ
analizowaÄ go
prawidÅowo.</description>
+ <description lang="pt">Recolhe e exibe informação do log do
Speedfan. Apesar deste plugin funcionar em qualquer plataforma, o Speedfan
apenas funciona no Windows. Por favor verifique o readme.txt para obter
informação sobre como configurar o seu log do Speedfan, para o plugin poder
analisá-lo correctamente.</description>
+ <description lang="pt_BR">Analisa e apresenta informações do
registro SpeedFan. Embora este plugin funcione em qualquer plataforma, SpeedFan
só funciona no Windows, então é optimizado para as pessoas que utilizam o
XBMC no Windows. Por favor, veja o arquivo readme.txt para obter informações
sobre como configurar o registro SpeedFan para que o plugin possa analisá-lo
corretamente.</description>
+ <description lang="sk">Rozoberá a zobrazuje informácie zo
SpeedFan logu. SÃce tento doplnok funguje na vÅ¡etkých platformách, SpeedFan
funguje len na Windows, a preto je tento doplnok urÄený užÃvateľom XBMC na
Windows. ProsÃm preÄÃtajte readme.txt aby ste sa dozvedeli ako nastaviÅ¥
SpeedFan log tak, aby ho tento doplnok vedel správne rozoberať.</description>
+ <description lang="sv">Analyserar och visar information från
SpeedFan loggen. Trots att detta tillägg fungerar på alla plattformar,
fungerar SpeedFan endast på Windows, så det är optimerat för folk som
använder XBMC på Windows. Läs readme.txt för mer information hur du
konfigurerar din SpeedFan logg så att tillägget kan analysera det
riktigt.</description>
+ <platform>all</platform>
+ </extension>
</addon>
diff --git a/script.speedfaninfo/default.py b/script.speedfaninfo/default.py
old mode 100644
new mode 100755
index 748be5d..b6a7b4e
--- a/script.speedfaninfo/default.py
+++ b/script.speedfaninfo/default.py
@@ -32,78 +32,84 @@ class SpeedFanInfoWindow(xbmcgui.WindowXMLDialog):
def __init__(self, *args, **kwargs):
# and define it as self
- lw.log('running __init__ from SpeedFanInfoWindow class', 'verbose')
+ lw.log('running __init__ from SpeedFanInfoWindow class', xbmc.LOGDEBUG)
def onInit(self):
#tell the object to go read the log file, parse it, and put it into
listitems for the XML
- lw.log('running inInit from SpeedFanInfoWindow class', 'verbose')
+ lw.log('running inInit from SpeedFanInfoWindow class', xbmc.LOGDEBUG)
self.populateFromLog()
def onAction(self, action):
#captures user input and acts as needed
- lw.log('running onAction from SpeedFanInfoWindow class', 'verbose')
+ lw.log('running onAction from SpeedFanInfoWindow class', xbmc.LOGDEBUG)
if(action == ACTION_PREVIOUS_MENU or action == ACTION_BACK):
#if the user hits back or exit, close the window
- lw.log('user initiated previous menu or back', 'verbose')
+ lw.log('user initiated previous menu or back', xbmc.LOGDEBUG)
global __windowopen__
#set this to false so the worker thread knows the window is being
closed
__windowopen__ = False
- lw.log('set windowopen to false', 'verbose')
+ lw.log('set windowopen to false', xbmc.LOGDEBUG)
#tell the window to close
- lw.log('tell the window to close', 'verbose')
+ lw.log('tell the window to close', xbmc.LOGDEBUG)
self.close()
def populateFromLog(self):
#get all this stuff into list info items for the window
- lw.log('attempting to add info of ' +
xbmcgui.Window(xbmcgui.getCurrentWindowId()).getProperty("panel.compact") ,
'verbose')
- lw.log('running populateFromLog from SpeedFanInfoWindow class',
'verbose')
+ lw.log('attempting to add info of ' +
xbmcgui.Window(xbmcgui.getCurrentWindowId()).getProperty("panel.compact") ,
xbmc.LOGDEBUG)
+ lw.log('running populateFromLog from SpeedFanInfoWindow class',
xbmc.LOGDEBUG)
#create new log parser and logger obejects
- lw.log('create new LogParser object', 'verbose')
+ lw.log('create new LogParser object', xbmc.LOGDEBUG)
lp = LogParser()
#get the information from the SpeedFan Log
- lw.log('ask the LogParser to get temps, speeds, voltages, and
percents', 'verbose')
+ lw.log('ask the LogParser to get temps, speeds, voltages, and
percents', xbmc.LOGDEBUG)
temps, speeds, voltages, percents = lp.parseLog()
- lw.log('starting to convert output for window', 'verbose')
+ lw.log('starting to convert output for window', xbmc.LOGDEBUG)
#add a fancy degree symbol to the temperatures
- lw.log('add fancy degree symbol to temperatures', 'verbose')
+ lw.log('add fancy degree symbol to temperatures', xbmc.LOGDEBUG)
for i in range(len(temps)):
temps[i][1] = temps[i][1][:-1] + u'\N{DEGREE SIGN}' +
temps[i][1][-1:]
#now parse all the data and get it into ListIems for display on the page
- lw.log('reset the window to prep it for data', 'verbose')
+ lw.log('reset the window to prep it for data', xbmc.LOGDEBUG)
self.getControl(120).reset()
#this allows for a line space *after* the first one so the page looks
pretty
firstline_shown = False
#put in all the temperature information
- lw.log('put in all the temperature information', 'verbose')
+ lw.log('put in all the temperature information', xbmc.LOGDEBUG)
if(len(temps) > 0):
self.populateList(__localize__(30100), temps, firstline_shown)
firstline_shown = True
#put in all the speed information (including percentage)
- lw.log('put in all the speed information (including percentages)',
'verbose')
+ lw.log('put in all the speed information (including percentages)',
xbmc.LOGDEBUG)
if(len(speeds) > 0):
- #please don't ask why this is so complicated, the simple way
caused a fatal error on Windows
- if(len(speeds) == len(percents)):
- en_speeds = []
- #add the percentage information to the end of the speed
- lw.log('adding the percentages to the end of the speeds',
'verbose')
- for i in range(len(speeds)):
- en_speeds.append((speeds[i][0], speeds [i][1] + ' (' +
percents[i][1] + ')'))
- else:
- en_speeds = speeds
+ lw.log('adding the percentages to the end of the speeds',
xbmc.LOGDEBUG)
+ en_speeds = []
+ for i in range(len(speeds)):
+ #if there is a matching percentage, add it to the end of the
speed
+ percent_match = False
+ percent_value = ''
+ for j in range(len(percents)):
+ if (speeds[i][0][:-1] == percents[j][0]):
+ lw.log('matched speed ' + speeds[i][0][:-1] + ' with
percent ' + percents[j][0], xbmc.LOGDEBUG)
+ percent_match = True
+ percent_value = percents[j][1]
+ if percent_match:
+ en_speeds.append((speeds[i][0], speeds [i][1] + ' (' +
percent_value + ')'))
+ else:
+ en_speeds.append((speeds[i][0], speeds [i][1]))
self.populateList(__localize__(30101), en_speeds, firstline_shown)
firstline_shown = True
#put in all the voltage information
- lw.log('put in all the voltage information', 'verbose')
+ lw.log('put in all the voltage information', xbmc.LOGDEBUG)
if(len(voltages) > 0):
self.populateList(__localize__(30102), voltages, firstline_shown)
#log that we're done and ready to show the page
- lw.log('completed putting information into lists, displaying window',
'standard')
+ lw.log('completed putting information into lists, displaying window',
xbmc.LOGDEBUG)
def populateList(self, title, things, titlespace):
#this takes an arbitrating list of readings and gets them into the
ListItems
- lw.log('running populateList from SpeedFanInfoWindow class',
'verbose')
+ lw.log('running populateList from SpeedFanInfoWindow class',
xbmc.LOGDEBUG)
#create the list item for the title of the section
- lw.log('create the list item for the title of the section', 'verbose')
+ lw.log('create the list item for the title of the section',
xbmc.LOGDEBUG)
if(titlespace):
item = xbmcgui.ListItem()
self.getControl(120).addItem(item) #this adds an empty line
@@ -112,13 +118,13 @@ class SpeedFanInfoWindow(xbmcgui.WindowXMLDialog):
self.getControl(120).addItem(item)
#now add all the data (we want two columns inf full mode and one
column for compact)
if (__addon__.getSetting('show_compact') == "true"):
- lw.log('add all the data to the one column format', 'verbose')
+ lw.log('add all the data to the one column format', xbmc.LOGDEBUG)
for onething in things:
item = xbmcgui.ListItem(label=onething[0],label2='')
item.setProperty('value',onething[1])
self.getControl(120).addItem(item)
else:
- lw.log('add all the data to the two column format', 'verbose')
+ lw.log('add all the data to the two column format', xbmc.LOGDEBUG)
nextside = 'left'
for onething in things:
if(nextside == 'left'):
@@ -138,12 +144,12 @@ class SpeedFanInfoWindow(xbmcgui.WindowXMLDialog):
class LogParser():
def __init__(self):
- lw.log('running __init__ from LogParser class', 'verbose')
+ lw.log('running __init__ from LogParser class', xbmc.LOGDEBUG)
# and define it as self
def readLogFile(self):
#try and open the log file
- lw.log('running readLogFile from LogParser class', 'verbose')
+ lw.log('running readLogFile from LogParser class', xbmc.LOGDEBUG)
#SpeedFan rolls the log every day, so we have to look for the log file
based on the date
#SpeedFan also does numerics if it has to roll the log during the day
#but in my testing it only uses the numeric log for a couple of
minutes and then goes
@@ -151,17 +157,17 @@ class LogParser():
log_file_date =
datetime.date(2011,1,29).today().isoformat().replace('-','')
log_file_raw = __addon__.getSetting('log_location') + 'SFLog' +
log_file_date
log_file = log_file_raw + '.csv'
- lw.log('trying to open logfile ' + log_file, 'verbose')
+ lw.log('trying to open logfile ' + log_file, xbmc.LOGDEBUG)
try:
f = open(log_file, 'rb')
except IOError:
- lw.log('no log file found', 'standard')
+ lw.log('no log file found', xbmc.LOGERROR)
if(__addon__.getSetting('log_location') == ''):
xbmc.executebuiltin('XBMC.Notification("Log File Error", "No
log file location defined.", 6000, '+ __addonicon__ +')')
else:
xbmc.executebuiltin('XBMC.Notification("Log File Error", "No
log file in defined location.", 6000, ' + __addonicon__ + ')')
return
- lw.log('opened logfile ' + log_file, 'verbose')
+ lw.log('opened logfile ' + log_file, xbmc.LOGDEBUG)
#get the first and last line of the log file
#the first line has the header information, and the last line has the
last log entry
#Speedfan updates the log every three seconds, so I didn't want to
read the whole log
@@ -189,24 +195,24 @@ class LogParser():
offset += read_size
f.close()
#some additional information for advanced logging
- lw.log('first line: ' + first, 'verbose')
- lw.log('last line: ' + last, 'verbose')
+ lw.log('first line: ' + first, xbmc.LOGDEBUG)
+ lw.log('last line: ' + last, xbmc.LOGDEBUG)
return first, last
def parseLog(self):
#parse the log for information, see readme for how to setup SpeedFan
output so that the script
- lw.log('running parseLog from LogParser class', 'verbose')
+ lw.log('running parseLog from LogParser class', xbmc.LOGDEBUG)
#can parse out the useful information
- lw.log('started parsing log','verbose');
+ lw.log('started parsing log',xbmc.LOGDEBUG);
if(__addon__.getSetting('temp_scale') == 'Celcius'):
temp_scale = 'C'
else:
temp_scale = 'F'
#read the log file
- lw.log('read the log file','verbose');
+ lw.log('read the log file',xbmc.LOGDEBUG);
first, last = self.readLogFile()
#pair up the heading with the value
- lw.log('pair up the heading with the value','verbose');
+ lw.log('pair up the heading with the value',xbmc.LOGDEBUG);
temps = []
speeds = []
voltages = []
@@ -225,53 +231,54 @@ class LogParser():
s_value =
str(int(round(float(s_value.rstrip().replace(',', '.')))))
if(item_type == "temp"):
#put this info in the temperature array
- lw.log('put the information in the temperature
array','verbose');
+ lw.log('put the information in the temperature
array',xbmc.LOGDEBUG);
temps.append([item_text + ':', s_value + temp_scale])
elif(item_type == "speed"):
#put this info in the speed array
- lw.log('put the information in the speed array','verbose');
+ lw.log('put the information in the speed array',xbmc.LOGDEBUG);
speeds.append([item_text + ':', s_value + 'rpm'])
elif(item_type == "voltage"):
#put this info in the voltage array
- lw.log('put the information in the voltage array','verbose');
+ lw.log('put the information in the voltage
array',xbmc.LOGDEBUG);
voltages.append([item_text + ':', s_value + 'v'])
elif(item_type == "percent"):
#put this info to the percent array
- lw.log('put the information in the percent array','verbose');
+ lw.log('put the information in the percent
array',xbmc.LOGDEBUG);
percents.append([item_text, s_value + '%'])
#log some additional data if advanced logging is one
- lw.log(temps, speeds, voltages, percents, 'verbose')
+ lw.log(temps, speeds, voltages, percents, xbmc.LOGDEBUG)
#log that we're done parsing the file
- lw.log('ended parsing log, displaying results', 'standard')
+ lw.log('ended parsing log, displaying results', xbmc.LOGDEBUG)
return temps, speeds, voltages, percents
def updateWindow(name, w):
#this is the worker thread that updates the window information every w
seconds
#this strange looping exists because I didn't want to sleep the thread for
very long
#as time.sleep() keeps user input from being acted upon
- lw.log('running the worker thread from inside the def','verbose');
- while __windowopen__:
+ lw.log('running the worker thread from inside the def',xbmc.LOGDEBUG);
+ while __windowopen__ and (not xbmc.abortRequested):
#start counting up to the delay set in the preference and sleep for
one second
- lw.log('start counting the delay set in the preference','verbose');
+ lw.log('start counting the delay set in the preference',xbmc.LOGDEBUG);
for i in range(int(__addon__.getSetting('update_delay'))):
#as long as the window is open, keep sleeping
if __windowopen__:
- lw.log('window is still open, sleep 1 second','verbose');
+ lw.log('window is still open, sleep 1 second',xbmc.LOGDEBUG);
time.sleep(1)
#otherwise drop out of the loop so we can exit the thread
else:
break
#as long as the window is open grab new data and refresh the window
if __windowopen__:
- lw.log('window is still open, updating the window with new
data','verbose');
+ lw.log('window is still open, updating the window with new
data',xbmc.LOGDEBUG);
w.populateFromLog()
#run the script
if ( xbmcgui.Window(10000).getProperty("speedfan.running") == "true" ):
- lw.log('script already running, aborting subsequent run attempts',
'standard')
+ lw.log('script already running, aborting subsequent run attempts',
xbmc.LOGNOTICE)
else:
xbmcgui.Window(10000).setProperty( "speedfan.running", "true" )
- lw.log('attempting to create main script object', 'verbose')
+ lw.log('starting script', xbmc.LOGNOTICE)
+ lw.log('attempting to create main script object', xbmc.LOGDEBUG)
if (__addon__.getSetting('show_compact') == "true"):
transparency_image = "speedfan-panel-compact-" +
str(int(round(float(__addon__.getSetting('transparency'))))) + ".png"
xbmcgui.Window(10000).setProperty("speedfan.panel.compact",
transparency_image)
@@ -280,19 +287,20 @@ else:
else:
#create a new object to get all the work done
w = SpeedFanInfoWindow("speedfaninfo-main.xml", __addonpath__,
"Default")
- lw.log('main script object created', 'attempting to create worker thread'
'verbose')
+ lw.log('main script object created', 'attempting to create worker thread',
xbmc.LOGDEBUG)
#create and start a separate thread for the looping process that updates
the window
t1 = Thread(target=updateWindow,args=("thread 1",w))
t1.setDaemon(True)
- lw.log('worker thread created', 'attempting to start worker thread'
'verbose')
+ lw.log('worker thread created', 'attempting to start worker thread',
xbmc.LOGDEBUG)
t1.start()
- lw.log('worker thread started', 'request window open via doModal',
'verbose')
+ lw.log('worker thread started', 'request window open via doModal',
xbmc.LOGDEBUG)
#create and open the window
w.doModal()
#just some cleanup
- lw.log('attempting to delete main object', 'attempting to delete worker
thread', 'verbose')
+ lw.log('attempting to delete main object', 'attempting to delete worker
thread', xbmc.LOGDEBUG)
del t1
del w
- lw.log('main object deleted', 'worker thread deleted', 'exiting script',
'verbose')
+ lw.log('main object deleted', 'worker thread deleted', xbmc.LOGDEBUG)
+ lw.log('exiting script', xbmc.LOGNOTICE)
del lw
xbmcgui.Window(10000).setProperty( "speedfan.running", "false" )
\ No newline at end of file
diff --git a/script.speedfaninfo/resources/settings.xml
b/script.speedfaninfo/resources/settings.xml
index 266c3f4..565da60 100644
--- a/script.speedfaninfo/resources/settings.xml
+++ b/script.speedfaninfo/resources/settings.xml
@@ -5,5 +5,4 @@
<setting id="log_location" type="folder" label="30000" default="" />
<setting id="temp_scale" type="labelenum" label="30002"
values="Celcius|Farenheit" default="0" />
<setting id="update_delay" type ="labelenum" label="30003"
values="10|20|30|40|50|60|90|120|180|240" default="30" />
- <setting id="advanced_log" type="bool" label="30001" default="false" />
</settings>
diff --git a/script.speedfaninfo/xlogger.py b/script.speedfaninfo/xlogger.py
index 000a3e5..6852268 100644
--- a/script.speedfaninfo/xlogger.py
+++ b/script.speedfaninfo/xlogger.py
@@ -45,15 +45,8 @@ class Logger():
#the last argument must be the logtype of the data (i.e. standard or
verbose)
#convert
#l_args = list(args)
- #the type (i.e. standard or verbose) of the log item is in the last
item of the tuple
- type = args[-1]
- #if advanced logging is disabled, only non-detailed items are logged
- verbose = False
- standard = False
- if(__addon__.getSetting('advanced_log') == 'true' and type ==
'verbose'):
- verbose = True
- elif(type =='standard'):
- standard = True
+ #the log_level is in the last item of the tuple
+ log_level = args[-1]
#now we need to iterate through all the other args and log them
for arg in args[:-1]:
argclass = arg.__class__.__name__
@@ -64,10 +57,7 @@ class Logger():
line = self.parseListorTuple(arg, 0)
else:
line = 'no appropriate action found for class ' + argclass
- if verbose:
- xbmc.log(__log_preamble__ + ' ' + line)
- elif standard:
- xbmc.log(__log_preamble__ + ' ' + line)
+ xbmc.log(__log_preamble__ + ' ' + line, log_level)
inst = Logger()
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
script.speedfaninfo/CHANGELOG.txt | 16 +++-
script.speedfaninfo/addon.xml | 91 ++++++++-------
script.speedfaninfo/default.py | 126 +++++++++++---------
.../resources/language/Danish/strings.po | 53 ++++++++
.../resources/language/Danish/strings.xml | 16 ---
.../resources/language/English/strings.po | 55 +++++++++
.../resources/language/English/strings.xml | 16 ---
.../resources/language/Galician/strings.po | 53 ++++++++
.../resources/language/German/strings.po | 53 ++++++++
.../resources/language/German/strings.xml | 16 ---
.../resources/language/Greek/strings.po | 53 ++++++++
.../resources/language/Greek/strings.xml | 16 ---
.../resources/language/Hungarian/strings.po | 53 ++++++++
.../resources/language/Hungarian/strings.xml | 16 ---
.../resources/language/Italian/strings.po | 53 ++++++++
.../resources/language/Italian/strings.xml | 16 ---
.../resources/language/Polish/strings.po | 53 ++++++++
.../resources/language/Polish/strings.xml | 16 ---
.../language/Portuguese (Brazil)/strings.po | 53 ++++++++
.../language/Portuguese (Brazil)/strings.xml | 16 ---
.../resources/language/Portuguese/strings.po | 53 ++++++++
.../resources/language/Portuguese/strings.xml | 14 --
.../resources/language/Slovak/strings.po | 53 ++++++++
.../resources/language/Slovak/strings.xml | 16 ---
.../resources/language/Spanish/strings.po | 53 ++++++++
.../resources/language/Spanish/strings.xml | 14 --
.../resources/language/Swedish/strings.po | 53 ++++++++
.../resources/language/Swedish/strings.xml | 16 ---
script.speedfaninfo/resources/settings.xml | 1 -
script.speedfaninfo/xlogger.py | 16 +--
30 files changed, 826 insertions(+), 303 deletions(-)
mode change 100644 => 100755 script.speedfaninfo/default.py
create mode 100644 script.speedfaninfo/resources/language/Danish/strings.po
delete mode 100644 script.speedfaninfo/resources/language/Danish/strings.xml
create mode 100644 script.speedfaninfo/resources/language/English/strings.po
delete mode 100644 script.speedfaninfo/resources/language/English/strings.xml
create mode 100644 script.speedfaninfo/resources/language/Galician/strings.po
create mode 100644 script.speedfaninfo/resources/language/German/strings.po
delete mode 100644 script.speedfaninfo/resources/language/German/strings.xml
create mode 100644 script.speedfaninfo/resources/language/Greek/strings.po
delete mode 100644 script.speedfaninfo/resources/language/Greek/strings.xml
create mode 100644 script.speedfaninfo/resources/language/Hungarian/strings.po
delete mode 100644 script.speedfaninfo/resources/language/Hungarian/strings.xml
create mode 100644 script.speedfaninfo/resources/language/Italian/strings.po
delete mode 100644 script.speedfaninfo/resources/language/Italian/strings.xml
create mode 100644 script.speedfaninfo/resources/language/Polish/strings.po
delete mode 100644 script.speedfaninfo/resources/language/Polish/strings.xml
create mode 100644 script.speedfaninfo/resources/language/Portuguese
(Brazil)/strings.po
delete mode 100644 script.speedfaninfo/resources/language/Portuguese
(Brazil)/strings.xml
create mode 100644 script.speedfaninfo/resources/language/Portuguese/strings.po
delete mode 100644
script.speedfaninfo/resources/language/Portuguese/strings.xml
create mode 100644 script.speedfaninfo/resources/language/Slovak/strings.po
delete mode 100644 script.speedfaninfo/resources/language/Slovak/strings.xml
create mode 100644 script.speedfaninfo/resources/language/Spanish/strings.po
delete mode 100644 script.speedfaninfo/resources/language/Spanish/strings.xml
create mode 100644 script.speedfaninfo/resources/language/Swedish/strings.po
delete mode 100644 script.speedfaninfo/resources/language/Swedish/strings.xml
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
