X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FScanSetup.py;h=6d51d015a52305578517114de9e077612f753bc6;hb=f739c6e1e30de8cafe67fa752d7f6b24e3249f59;hp=f007f6f20d899c7df63e29187ab519c55127cbab;hpb=6e4fe9bcc4aeab419ca25ea8cf8dfe274a7868bd;p=vuplus_dvbapp diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index f007f6f..6d51d01 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -202,11 +202,12 @@ class ScanSetup(Screen): self.updateSatList() print config.scan.satselection[config.scan.nims.value] self.list.append(getConfigListEntry(_("Satellite"), config.scan.satselection[config.scan.nims.value])) + self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices)) elif currentConfigSelectionElement(config.scan.type) == "multisat": # if (norotor) tlist = [] SatList = nimmanager.getSatListForNim(config.scan.nims.value) - + self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices)) for x in SatList: if self.Satexists(tlist, x[1]) == 0: tlist.append(x[1]) @@ -228,7 +229,7 @@ class ScanSetup(Screen): self.list.append(getConfigListEntry(_("FEC"), config.scan.cab.fec)) self.list.append(getConfigListEntry(_("Network scan"), config.scan.cab.networkScan)) elif currentConfigSelectionElement(config.scan.typecable) == "complete": - pass + self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices)) if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"]): if currentConfigSelectionElement(config.scan.typeterrestrial) == "single_transponder": @@ -243,7 +244,7 @@ class ScanSetup(Screen): self.list.append(getConfigListEntry(_("Guard interval mode"), config.scan.ter.guard)) self.list.append(getConfigListEntry(_("Hierarchy mode"), config.scan.ter.hierarchy)) elif currentConfigSelectionElement(config.scan.typeterrestrial) == "complete": - pass + self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices)) if (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-S"] and currentConfigSelectionElement(config.scan.type) == "single_transponder") or \ (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"] and currentConfigSelectionElement(config.scan.typecable) == "single_transponder") or \ @@ -283,6 +284,7 @@ class ScanSetup(Screen): config.scan.type = configElement_nonSave("config.scan.type", configSelection, 0, (("single_transponder", _("Single transponder")), ("single_satellite", _("Single satellite")), ("multisat", _("Multisat")))) config.scan.typecable = configElement_nonSave("config.scan.typecable", configSelection, 0, (("single_transponder", _("Single transponder")), ("complete", _("Complete")))) config.scan.typeterrestrial = configElement_nonSave("config.scan.typeterrestrial", configSelection, 0, (("single_transponder", _("Single transponder")), ("complete", _("Complete")))) + config.scan.clearallservices = configElement_nonSave("config.scan.clearallservices", configSelection, 0, (("no", _("no")), ("yes", _("yes")), ("yes_hold_feeds", _("yes (hold feeds)")))) nimList = [ ] for nim in nimmanager.nimList(): @@ -299,11 +301,13 @@ class ScanSetup(Screen): config.scan.ber.enabled = False # sat + config.scan.sat.system = configElement_nonSave("config.scan.sat.system", configSelection, 0, (("dvb-s", _("DVB-S")), ("dvb-s2", _("DVB-S2")))) config.scan.sat.frequency = configElement_nonSave("config.scan.sat.frequency", configSequence, [11836], configsequencearg.get("INTEGER", (1, 99999))) config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, 2, (("off", _("off")), ("on", _("on")), _("Auto"))) config.scan.sat.symbolrate = configElement_nonSave("config.scan.sat.symbolrate", configSequence, [27500], configsequencearg.get("INTEGER", (1, 99999))) config.scan.sat.polarization = configElement_nonSave("config.scan.sat.polarization", configSelection, 0, (("horizontal", _("horizontal")), ("vertical", _("vertical")), ("circular_left", _("circular left")), ("circular_right", _("circular right")))) config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, (("auto", _("Auto")), ("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("5_6", "5/6"), ("7_8", "7/8"), ("none", _("None")))) + config.scan.sat.fec_s2 = configElement_nonSave("config.scan.sat.fec_s2", configSelection, 8, (("1_2", "1/2"), ("2_3", "2/3"), ("3_4", "3/4"), ("3_5", "3/5"), ("4_5", "4/5"), ("5_6", "5/6"), ("7_8", "7/8"), ("8_9", "8/9"), ("9_10", "9/10")))) # cable config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (50, 999))) @@ -356,13 +360,14 @@ class ScanSetup(Screen): if (self["config"].getCurrent()[1].parent.enabled == True): self["config"].handleKey(config.key[str(number)]) - def addSatTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position): + def addSatTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position, system): print "Add Sat: frequ: " + str(frequency) + " symbol: " + str(symbol_rate) + " pol: " + str(polarisation) + " fec: " + str(fec) + " inversion: " + str(inversion) print "orbpos: " + str(orbital_position) parm = eDVBFrontendParametersSatellite() + parm.system = system parm.frequency = frequency * 1000 parm.symbol_rate = symbol_rate * 1000 - parm.polarisation = polarisation # eDVBFrontendParametersSatellite.Polarisation.Verti + parm.polarisation = polarisation # eDVBFrontendParametersSatellite.Polarisation.Verti parm.fec = fec # eDVBFrontendParametersSatellite.FEC.f3_4; #parm.fec = 6 # AUTO parm.inversion = inversion #eDVBFrontendParametersSatellite.Inversion.Off; @@ -376,7 +381,7 @@ class ScanSetup(Screen): parm = eDVBFrontendParametersCable() parm.frequency = frequency * 1000 parm.symbol_rate = symbol_rate * 1000 - parm.modulation = modulation # modulation # eDVBFrontendParametersSatellite.Polarisation.Verti + parm.modulation = modulation # modulation # eDVBFrontendParametersSatellite.Polarisation.Verti parm.fec = fec # eDVBFrontendParametersSatellite.FEC.f3_4; #parm.fec = 6 # AUTO parm.inversion = inversion #eDVBFrontendParametersSatellite.Inversion.Off; @@ -405,10 +410,18 @@ class ScanSetup(Screen): config.scan.sat.polarization.value, config.scan.sat.fec.value, config.scan.sat.inversion.value, + config.scan.sat.system.value, orbpos) elif currentConfigSelectionElement(config.scan.type) == "single_satellite": - getInitialTransponderList(tlist, int(self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1])) + sat = self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value] + getInitialTransponderList(tlist, int(sat[1])) flags |= eComponentScan.scanNetworkSearch + tmp = currentConfigSelectionElement(config.scan.clearallservices) + if tmp == "yes": + flags |= eComponentScan.scanRemoveServices + elif tmp == "yes_hold_feeds": + flags |= eComponentScan.scanRemoveServices + flags |= eComponentScan.scanDontRemoveFeeds elif currentConfigSelectionElement(config.scan.type) == "multisat": SatList = nimmanager.getSatListForNim(config.scan.nims.value) for x in self.multiscanlist: @@ -416,6 +429,12 @@ class ScanSetup(Screen): print " " + str(x[1].parent.configPath) getInitialTransponderList(tlist, x[1].parent.configPath) flags |= eComponentScan.scanNetworkSearch + tmp = currentConfigSelectionElement(config.scan.clearallservices) + if tmp == "yes": + flags |= eComponentScan.scanRemoveServices + elif tmp == "yes_hold_feeds": + flags |= eComponentScan.scanRemoveServices + flags |= eComponentScan.scanDontRemoveFeeds elif (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-C"]): if currentConfigSelectionElement(config.scan.typecable) == "single_transponder": @@ -429,10 +448,16 @@ class ScanSetup(Screen): elif currentConfigSelectionElement(config.scan.typecable) == "complete": getInitialCableTransponderList(tlist, nimmanager.getCableDescription(config.scan.nims.value)) flags |= eComponentScan.scanNetworkSearch + tmp = currentConfigSelectionElement(config.scan.clearallservices) + if tmp == "yes": + flags |= eComponentScan.scanRemoveServices + elif tmp == "yes_hold_feeds": + flags |= eComponentScan.scanRemoveServices + flags |= eComponentScan.scanDontRemoveFeeds elif (nimmanager.getNimType(config.scan.nims.value) == nimmanager.nimType["DVB-T"]): if currentConfigSelectionElement(config.scan.typeterrestrial) == "single_transponder": - self.addTerTransponder(tlist, + self.addTerTransponder(tlist, config.scan.ter.frequency.value[0] * 1000000, inversion = config.scan.ter.inversion.value, bandwidth = config.scan.ter.bandwidth.value, @@ -447,6 +472,12 @@ class ScanSetup(Screen): elif currentConfigSelectionElement(config.scan.typeterrestrial) == "complete": getInitialTerrestrialTransponderList(tlist, nimmanager.getTerrestrialDescription(config.scan.nims.value)) flags |= eComponentScan.scanNetworkSearch + tmp = currentConfigSelectionElement(config.scan.clearallservices) + if tmp == "yes": + flags |= eComponentScan.scanRemoveServices + elif tmp == "yes_hold_feeds": + flags |= eComponentScan.scanRemoveServices + flags |= eComponentScan.scanDontRemoveFeeds for x in self["config"].list: x[1].save() @@ -510,7 +541,14 @@ class ScanSimple(Screen): scanPossible = True getInitialTerrestrialTransponderList(tlist, nimmanager.getTerrestrialDescription(slotid)) if scanPossible: - scanList.append({"transponders": tlist, "feid": slotid, "flags": eComponentScan.scanNetworkSearch}) + flags=eComponentScan.scanNetworkSearch + tmp = currentConfigSelectionElement(config.scan.clearallservices) + if tmp == "yes": + flags |= eComponentScan.scanRemoveServices + elif tmp == "yes_hold_feeds": + flags |= eComponentScan.scanRemoveServices + flags |= eComponentScan.scanDontRemoveFeeds + scanList.append({"transponders": tlist, "feid": slotid, "flags": flags}) if len(scanList): self.session.openWithCallback(self.doNothing, ServiceScan, scanList = scanList) else: @@ -518,7 +556,7 @@ class ScanSimple(Screen): def doNothing(self): pass - + def keyCancel(self): self.close() @@ -567,8 +605,15 @@ class ScanSimple(Screen): nimcount = nimmanager.getNimSocketCount() if nimcount > 0: - nim = configElement_nonSave(0, configSelection, 0,(("yes", _("yes")),("no", _("no")))) - self.list.append(getConfigListEntry(_("Scan NIM") + " 0 (" + nimmanager.getNimTypeName(0) + ")", nim)) + scan_possible=True + config.scan = ConfigSubsection() + config.scan.clearallservices = configElement_nonSave("config.scan.clearallservices", configSelection, 0, (("no", _("no")), ("yes", _("yes")), ("yes_hold_feeds", _("yes (hold feeds)")))) + self.list.append(getConfigListEntry(_("Clear before scan"), config.scan.clearallservices)) + nim = configElement_nonSave(0, configSelection, 0, (("yes", _("yes")), ("no", _("no")))) + if nimmanager.getNimType(0) == nimmanager.nimType["DVB-S"] and not len(nimmanager.getSatListForNim(0)): + scan_possible=False + if scan_possible: + self.list.append(getConfigListEntry(_("Scan NIM") + " 0 (" + nimmanager.getNimTypeName(0) + ")", nim)) if nimcount > 1 and self.ScanNimTwoNeeded(): nim = configElement_nonSave(1, configSelection, 0, (("yes", _("yes")), ("no", _("no")))) self.list.append(getConfigListEntry(_("Scan NIM") + " 1 (" + nimmanager.getNimTypeName(1) + ")", nim))