PicturePlayer/plugin.py: -use "Setup" Skin but still allow individual skinning over...

[enigma2.git] / lib / python / Plugins / SystemPlugins / DiseqcTester / plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py b/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
index cbd6bc8922530a59065113880d737f93a6b7c76e..71ae50b673377edc1bccb31632232d1b58ac376f 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
@@ -51,8 +51,10 @@ class ResultParser:
                percentsuccessful = round(countsuccessful / float(countall + 0.0001) * 100)
                text += "Tested %d transponders\n%d (%d %%) transponders succeeded\n%d (%d %%) transponders failed\n" % (countall, countsuccessful, percentsuccessful, countfailed, percentfailed)
                reasons = {}
+               completelist = []
                if countfailed > 0:
                        for transponder in failed:
+                               completelist.append({"transponder": transponder[0], "fedata": transponder[-1]})
                                reasons[transponder[2]] = reasons.get(transponder[2], [])
                                reasons[transponder[2]].append(transponder)
                                if transponder[2] == "pids_failed":
@@ -78,16 +80,30 @@ class ResultParser:
                                                text += " ==> "
                                                text += str(transponder[0])
                                                text += "\n"
+                                       if reason == "pids_failed":
+                                               text += "(tsid, onid): "
+                                               text += str(transponder[3]['real'])
+                                               text += "(read from sat) != "
+                                               text += str(transponder[3]['expected'])
+                                               text += "(read from file)"
+                                               text += "\n"
+                                       text += "\n"
                if countsuccessful > 0:
                        text += "\n"
                        text += "Successfully tuned transponders' previous planes:\n" 
                        for transponder in successful:
+                               completelist.append({"transponder": transponder[0], "fedata": transponder[-1]})
                                if transponder[1] is not None:
                                        text += self.getTextualIndexRepresentation(self.getIndexForTransponder(transponder[1]))
                                else:
                                        text += "No transponder tuned"
                                text += " ==> " + self.getTextualIndexRepresentation(self.getIndexForTransponder(transponder[0]))
                                text += "\n"
+               
+               text += "------------------------------------------------\n"
+               text += "complete transponderlist:\n"
+               for entry in completelist:
+                       text += str(entry["transponder"]) + " -- " + str(entry["fedata"]) + "\n"
                return text
 
        def getTextualResult(self):
@@ -623,7 +639,7 @@ class DiseqcTesterNimSelection(NimSelection):
        def showNim(self, nim):
                nimConfig = nimmanager.getNimConfig(nim.slot)
                if nim.isCompatible("DVB-S"):
-                       if nimConfig.configMode.value in ["loopthrough", "equal", "satposdepends", "nothing"]:
+                       if nimConfig.configMode.value in ("loopthrough", "equal", "satposdepends", "nothing"):
                                return False
                        if nimConfig.configMode.value == "simple":
                                if nimConfig.diseqcMode.value == "positioner":