From fb8ec0f8f785d67d79177a063bd82a40fcdafb94 Mon Sep 17 00:00:00 2001 From: ims Date: Mon, 20 Apr 2015 22:32:54 +0200 Subject: [PATCH] TransponderInfo - fix for terrestrial scaning when system info is None Signed-off-by: littlesat --- lib/python/Components/Converter/TransponderInfo.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/python/Components/Converter/TransponderInfo.py b/lib/python/Components/Converter/TransponderInfo.py index bc66352..0824deb 100644 --- a/lib/python/Components/Converter/TransponderInfo.py +++ b/lib/python/Components/Converter/TransponderInfo.py @@ -37,12 +37,14 @@ class TransponderInfo(Converter, object): return "" if transponderraw: transponderdata = ConvertToHumanReadable(transponderraw) - if not transponderdata: + if not transponderdata["system"]: + transponderdata["system"] = transponderraw.get("tuner_type", "None") + if not transponderdata["system"]: return "" if "DVB-T" in transponderdata["system"]: - return "%s %s %d MHz %s" % ("DVB-T", transponderdata["channel"], transponderdata["frequency"]/1000000 + 0.5 , transponderdata["bandwidth"]) + return "%s %s %d MHz %s" % (transponderdata["system"], transponderdata["channel"], transponderdata["frequency"]/1000000 + 0.5 , transponderdata["bandwidth"]) elif "DVB-C" in transponderdata["system"]: - return "%s %d MHz %d %s %s" % ("DVB-C", transponderdata["frequency"]/1000 + 0.5, transponderdata["symbol_rate"]/1000 + 0.5, transponderdata["fec_inner"], \ + return "%s %d MHz %d %s %s" % (transponderdata["system"], transponderdata["frequency"]/1000 + 0.5, transponderdata["symbol_rate"]/1000 + 0.5, transponderdata["fec_inner"], \ transponderdata["modulation"]) return "%s %d %s %d %s %s %s" % (transponderdata["system"], transponderdata["frequency"]/1000 + 0.5, transponderdata["polarization_abbreviation"], transponderdata["symbol_rate"]/1000 + 0.5, \ transponderdata["fec_inner"], transponderdata["modulation"], transponderdata["detailed_satpos" in self.type and "orbital_position" or "orb_pos"]) -- 1.7.1