Annonces sap via mumudvb et mise a jour
darcs-hash:20081001205214-9fc8c-6462672ccd58b8f4057bfa6fbf7e3fcb1dd3ce51.gz
This commit is contained in:
parent
e5bb0a47a9
commit
a510187636
2 changed files with 129 additions and 137 deletions
260
tv/sat_base.py
260
tv/sat_base.py
|
@ -52,16 +52,23 @@ class carte :
|
|||
|
||||
entete_conf = """### Fichier généré, NE PAS EDITER
|
||||
autoconfiguration=1
|
||||
sap=1
|
||||
sap_organisation=crans
|
||||
common_port=1234
|
||||
freq=%(freq)i
|
||||
pol=%(pol)s
|
||||
srate=%(srate)i
|
||||
card=%(card)i
|
||||
timeout_accord=%(timeout_accord)i
|
||||
timeout_no_diff=%(timeout_no_diff)i
|
||||
#-----
|
||||
"""
|
||||
|
||||
entete_conf_TNT = """### Fichier généré, NE PAS EDITER
|
||||
autoconfiguration=1
|
||||
sap=1
|
||||
sap_organisation=crans
|
||||
common_port=1234
|
||||
freq=%(freq)i
|
||||
qam=%(qam)s
|
||||
trans_mode=%(trans_mode)s
|
||||
|
@ -74,13 +81,14 @@ timeout_no_diff=%(timeout_no_diff)i
|
|||
"""
|
||||
|
||||
chaine_template = """ip=%(ip)s
|
||||
port=1234
|
||||
sap_group=%(sap_group)s
|
||||
name=%(name)s
|
||||
pids=%(pids)s
|
||||
#-----
|
||||
"""
|
||||
|
||||
pid_file = "/var/run/mumudvb/mumudvb_carte%i.pid" # % num carte
|
||||
mumudvb = "/usr/local/bin/mumudvb "
|
||||
mumudvb = "/usr/local/bin/mumudvb_sap "
|
||||
|
||||
def __cmp__(a,b) :
|
||||
for attr in ( 'card', 'freq', 'chaines' ) :
|
||||
|
@ -124,7 +132,7 @@ pids=%(pids)s
|
|||
|
||||
# Chaines
|
||||
n = 0
|
||||
for pids, name in self.chaines.items() :
|
||||
for pids, (sap_group, name) in self.chaines.items() :
|
||||
ip = '239.%s.20%i.2%02i' % ( IP.split('.')[-1], self.card, n)
|
||||
n += 1
|
||||
fd.write(self.chaine_template % vars())
|
||||
|
@ -171,7 +179,7 @@ pids=%(pids)s
|
|||
if self.verbose >0 : print "OK"
|
||||
|
||||
cmd = '%s -c %s' % ( self.mumudvb, self.CONF_FILE % self.card )
|
||||
if self.verbose > 2 : cmd += ' -d -s'
|
||||
if self.verbose > 2 : cmd += ' -v -v -d -s'
|
||||
if self.verbose > 1 :
|
||||
print "\tCommande : %s" % cmd
|
||||
for i in range(2*self.timeout_accord) :
|
||||
|
@ -227,182 +235,166 @@ pids=%(pids)s
|
|||
# pol='v'
|
||||
# srate=27500
|
||||
# chaines = {
|
||||
# '3336 3306' : 'rad fra Radio FG',
|
||||
# '3534 1001' : 'rad fra France Inter',
|
||||
# '3535 1002' : 'rad fra France Info' }
|
||||
# '3336 3306' : 'radios' : 'rad fra Radio FG'),
|
||||
# '3534 1001' : 'radios' : 'rad fra France Inter'),
|
||||
# '3535 1002' : 'radios' : 'rad fra France Info' }
|
||||
|
||||
#Format : "'pids' : ( 'groupe sap' : 'nom' ),"
|
||||
|
||||
class Hotbird_10873(carte) :
|
||||
pol='v'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'3101 3131' : 'rad fra Europe 1',
|
||||
'3102 3132' : 'rad fra Europe 2',
|
||||
'3103 3133' : 'rad fra RFM',
|
||||
'3105 3135' : 'rad fra RTL',
|
||||
'3107 3137' : 'rad fra Radio Classique',
|
||||
'3238 3208' : 'rad fra Alouette' }
|
||||
|
||||
class Hotbird_10911(carte) :
|
||||
pol='v'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'3501' : 'rad fra France Musiques',
|
||||
'3503' : 'rad fra FIP',
|
||||
'3506' : 'rad fra France Culture',
|
||||
'3508' : 'rad fra Le Mouv',
|
||||
'5801' : 'rad fra Meteo Express',
|
||||
'5800' : 'fra Meteo Express' }
|
||||
'3101 3131' : ('radios' , 'rad fra Europe 1'),
|
||||
'3102 3132' : ('radios' , 'rad fra Virgin radio'),
|
||||
'3103 3133' : ('radios' , 'rad fra RFM'),
|
||||
'3238 3208' : ('radios' , 'rad fra Alouette')}
|
||||
|
||||
class Hotbird_11137(carte) :
|
||||
pol='h'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'717' : 'fra TV5MONDE FBS',
|
||||
'719' : 'fra TV5MONDE Europe',
|
||||
'262' : 'ara ANN',
|
||||
'263' : 'ara Kurdistan TV',
|
||||
'264' : 'ita Videolina' }
|
||||
'717' : ('fra' , 'fra TV5MONDE FBS'),
|
||||
'719' : ('fra' , 'fra TV5MONDE Europe'),
|
||||
'262' : ('ara' , 'ara ANN'),
|
||||
'263' : ('ara' , 'ara Kurdistan TV'),
|
||||
'264' : ('ita' , 'ita Videolina')}
|
||||
|
||||
class Hotbird_11200(carte) :
|
||||
class Hotbird_11200(carte) : #A mettre a jour
|
||||
pol='V'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'366 367 2560' : 'ita Elite shopping TV',
|
||||
'386 387 512' : 'x-ero All Sex',
|
||||
'397 398 399' : 'ita StarSat',
|
||||
'394 395 4864' : 'ita Play TV',
|
||||
'400 404 402' : 'ita People TV',
|
||||
'405 406 407' : 'ita Roma Sat' }
|
||||
'366 367 2560' : ('ita' , 'ita Elite shopping TV'),
|
||||
'386 387 512' : ('x-ero' , 'x-ero All Sex'),
|
||||
'397 398 399' : ('ita' , 'ita StarSat'),
|
||||
'394 395 4864' : ('ita' , 'ita Play TV'),
|
||||
'400 404 402' : ('ita' , 'ita People TV'),
|
||||
'405 406 407' : ('ita' , 'ita Roma Sat')}
|
||||
|
||||
class Hotbird_11240(carte) :
|
||||
pol='v'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'244' : 'fra France 24',
|
||||
'247' : 'eng France 24' }
|
||||
'244' : ('fra' , 'fra France 24'),
|
||||
'247' : ('eng' , 'eng France 24')}
|
||||
|
||||
class Hotbird_11604(carte) :
|
||||
pol='h'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'500' : 'ita TLA',
|
||||
'600' : 'ger Das Erste',
|
||||
'700' : 'ger DW TV',
|
||||
'800' : 'autres DW tv arabic',
|
||||
'900' : 'ger RTL2 Schweiz',
|
||||
'3500' : 'eng Cool TV',
|
||||
'2600' : 'ger Erde Mensch',
|
||||
'1600' : 'x-ero hot arab tv',
|
||||
'3200' : 'x-ero xxx Action TV' }
|
||||
'500' : ('ita' , 'ita TLA'),
|
||||
'600' : ('ger' , 'ger Das Erste'),
|
||||
'700' : ('ger' , 'ger DW TV'),
|
||||
'800' : ('divers' , 'divers DW tv arabic (ara eng ger)'),
|
||||
'900' : ('ger' , 'ger RTL2 Schweiz'),
|
||||
'3500' : ('eng' , 'eng Cool TV'),
|
||||
'2600' : ('ger' , 'ger Erde Mensch'),
|
||||
'1600' : ('x-ero' , 'x-ero hot arab tv'),
|
||||
'3200' : ('x-ero' , 'x-ero xxx Action TV')}
|
||||
|
||||
class Hotbird_11623(carte) :
|
||||
class Hotbird_11623(carte) :
|
||||
pol='v'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'230 250 210 297' : 'fra 123sat',
|
||||
'225 245 205' : 'fra Best Of Shopping',
|
||||
'221 241 201' : 'x-ero Videosexy TV',
|
||||
'231 251 32 8190' : 'x-ero SexySat 3',
|
||||
'227 247 287 5008' : 'rom TV Romania International' }
|
||||
'230 250 210 297' : ('fra' , 'fra 123sat'),
|
||||
'225 245 205' : ('fra' , 'fra Best Of Shopping'),
|
||||
'221 241 201' : ('x-ero' , 'x-ero Videosexy TV'),
|
||||
'231 251 32 8190' : ('x-ero' , 'x-ero SexySat 3'),
|
||||
'227 247 287 5008' : ('rom' , 'rom TV Romania International')}
|
||||
|
||||
class Hotbird_11642(carte) :
|
||||
pol='h'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'1360 1320 5003' : 'eng Bloomberg Europe',
|
||||
'1460 1420 5004' : 'ger Bloomberg TV Deutschland',
|
||||
'1560 1520 5005' : 'eng Bloomberg U.K.',
|
||||
'2101 2111 256 128 2121' : 'gr ERT Sat' }
|
||||
'1360 1320 5003' : ('eng' , 'eng Bloomberg Europe'),
|
||||
'1460 1420 5004' : ('ger' , 'ger Bloomberg TV Deutschland'),
|
||||
'1560 1520 5005' : ('eng' , 'eng Bloomberg U.K.'),
|
||||
'2101 2111 256 128 2121' : ('gr' , 'gr ERT Sat')}
|
||||
|
||||
class Hotbird_11727(carte) :
|
||||
pol='v'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'2711 2712 257 2710' : 'fra La Locale',
|
||||
'2791 2792 269' : 'ita Sicilia International (SET)',
|
||||
'2751 2752 266' : 'ita Sardegna Uno Sat',
|
||||
'6507 6662' : 'rad eng BBC English (Europe)',
|
||||
'6510 6692' : 'rad eng BBC English News',
|
||||
'7302 6571' : 'rad eng BBC Feed 1',
|
||||
'7312 6572' : 'rad eng BBC Feed 2',
|
||||
'7322 6573' : 'rad eng BBC Feed 3',
|
||||
'7332 6574' : 'rad eng BBC Feed 4',
|
||||
'7342 6575' : 'rad eng BBC Feed 5',
|
||||
'7352 6576' : 'rad eng BBC Feed 6'}
|
||||
'2711 2712 257 2710' : ('fra' , 'fra La Locale'),
|
||||
'2791 2792 269' : ('ita' , 'ita Sicilia International (SET)'),
|
||||
'2751 2752 266' : ('ita' , 'ita Sardegna Uno Sat'),
|
||||
'6507 6662' : ('radios' , 'rad eng BBC English (Europe)'),
|
||||
'6510 6692' : ('radios' , 'rad eng BBC English News'),
|
||||
'7302 6571' : ('radios' , 'rad eng BBC Feed 1'),
|
||||
'7312 6572' : ('radios' , 'rad eng BBC Feed 2'),
|
||||
'7322 6573' : ('radios' , 'rad eng BBC Feed 3'),
|
||||
'7332 6574' : ('radios' , 'rad eng BBC Feed 4'),
|
||||
'7342 6575' : ('radios' , 'rad eng BBC Feed 5'),
|
||||
'7352 6576' : ('radios' , 'rad eng BBC Feed 6')}
|
||||
|
||||
# Pour remplacer 10796
|
||||
class Hotbird_11766(carte) :
|
||||
pol='v'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'1104' : 'ita Rai Uno',
|
||||
'1105' : 'ita Rai Duo',
|
||||
'1106' : 'ita Rai Tre',
|
||||
'261' : 'ita Rai Edu2'}
|
||||
'1104' : ('ita' , 'ita Rai Uno'),
|
||||
'1105' : ('ita' , 'ita Rai Duo'),
|
||||
'1106' : ('ita' , 'ita Rai Tre'),
|
||||
'260' : ('ita' , 'ita Rai Med'),
|
||||
'1107' : ('ita' , 'ita eng Senato italiano'),
|
||||
'1107' : ('eng' , 'eng ita Senato italiano'),
|
||||
'261' : ('ita' , 'ita Rai Edu2')}
|
||||
|
||||
class Hotbird_11785(carte) :
|
||||
pol='h'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'32' : 'esp TVE International',
|
||||
'33' : 'esp Canal 24 Horas',
|
||||
'34' : 'esp TVE Internacional Asia/Africa' }
|
||||
'32' : ('esp' , 'esp TVE International'),
|
||||
'33' : ('esp' , 'esp Canal 24 Horas'),
|
||||
'34' : ('esp' , 'esp TVE Internacional Asia/Africa')}
|
||||
|
||||
class Hotbird_12111(carte) :
|
||||
pol='v'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'1028' : 'ara Al Jazeera Documentary',
|
||||
'1029' : 'ara Al Jazeera Mubasher',
|
||||
'1030' : 'ita Ceramicanda',
|
||||
'1031' : 'ara Al Jazeera Satellite Channel',
|
||||
'1032' : 'ita Silicia Channel',
|
||||
'1034' : 'ita High life TV',
|
||||
'1040' : 'ita Radio Radio TV'}
|
||||
|
||||
'1028' : ('ara' , 'ara Al Jazeera Documentary'),
|
||||
'1029' : ('ara' , 'ara Al Jazeera Mubasher'),
|
||||
'1030' : ('ita' , 'ita ACM - Architecture Construction Materials'),
|
||||
'1031' : ('ara' , 'ara Al Jazeera Satellite Channel'),
|
||||
'1032' : ('ita' , 'ita Silicia Channel'),
|
||||
'1034' : ('ita' , 'ita High life TV'),
|
||||
'1040' : ('ita' , 'ita Radio Radio TV'),
|
||||
'1042' : ('ita' , 'ita MediterraneoSat 1')}
|
||||
|
||||
class Hotbird_12476(carte) :
|
||||
pol='h'
|
||||
srate=27500
|
||||
chaines = {
|
||||
#2M don't support autoconfiguration
|
||||
'600 601 602' : 'ara 2M',
|
||||
'600 603' : 'ara radio 2M',
|
||||
'550' : 'x-ero X Stream'}
|
||||
'600 601 602' : ('ara' , 'ara fra 2M'),
|
||||
'600 603' : ('ara' , 'ara radio 2M'),
|
||||
'550' : ('x-ero' , 'x-ero X Stream')}
|
||||
|
||||
class Hotbird_12558(carte) :
|
||||
class Hotbird_12558(carte) : #outdated
|
||||
pol='v'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'6660 6661 6659' : 'ita Administra.it',
|
||||
'6916 6917 6915 6930' : 'ita 24 Ore' }
|
||||
|
||||
class Hotbird_12577(carte) :
|
||||
pol='h'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'1104' : 'fra telesud',
|
||||
'1109' : 'fra liberty TV',
|
||||
'1139' : 'ned liberty TV' }
|
||||
'6660 6661 6659' : ('ita' , 'ita Administra.it'),
|
||||
'6916 6917 6915 6930' : ('ita' , 'ita 24 Ore')}
|
||||
|
||||
class Hotbird_12597(carte) :
|
||||
pol='v'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'1024' : 'rus sport planeta',
|
||||
'1027' : 'eng BBC World',
|
||||
'1031' : 'rus ORT International',
|
||||
'1034' : 'fra autres Euronews',
|
||||
'1034 2221 2232 768' : 'eng Euronews',
|
||||
'1025' : 'fra KTO' }
|
||||
'1024' : ('rus' , 'rus sport planeta'),
|
||||
'1027' : ('eng' , 'eng BBC World'),
|
||||
'1031' : ('rus' , 'rus ORT International'),
|
||||
'1032' : ('eng' , 'eng CNN'),
|
||||
'1034' : ('fra' , 'fra autres Euronews'),
|
||||
'1034 2221 2232 768' : ('eng' , 'eng Euronews')}
|
||||
|
||||
class Hotbird_12673(carte) :
|
||||
class Hotbird_12673(carte) : #outdated
|
||||
pol='v'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'308 309 306 307' : 'ara Al Maghribiyah',
|
||||
'35 36 33 34 38' : 'ara TVM inter l',
|
||||
'46 47 44 45' : 'ara Arabiaa'}
|
||||
'308 309 306 307' : ('ara' , 'ara Al Maghribiyah'),
|
||||
'35 36 33 34 38' : ('ara' , 'ara TVM inter l'),
|
||||
'46 47 44 45' : ('ara' , 'ara Arabiaa')}
|
||||
|
||||
class TNT_base(carte) :
|
||||
qam="auto"
|
||||
|
@ -413,51 +405,51 @@ class TNT_base(carte) :
|
|||
|
||||
class TNT_R1_586000(TNT_base) :
|
||||
chaines = {
|
||||
'110' : 'fra TNT02 France 2',
|
||||
'210' : 'fra TNT03 France 3',
|
||||
'310' : 'fra TNT05 France 5',
|
||||
'510' : 'fra TNT07 Arte',
|
||||
'510 520 531 542' : 'ger Arte',
|
||||
'610' : 'fra TNT13 LCP Public Senat',
|
||||
'710' : 'fra TNT20 France O' }
|
||||
'110' : ('fra' , 'fra TNT02 France 2'),
|
||||
'210' : ('fra' , 'fra TNT03 France 3'),
|
||||
'310' : ('fra' , 'fra TNT05 France 5'),
|
||||
'510' : ('fra' , 'fra TNT07 Arte'),
|
||||
'510 520 531 542' : ('ger' , 'ger Arte'),
|
||||
'610' : ('fra' , 'fra TNT13 LCP Public Senat'),
|
||||
'710' : ('fra' , 'fra TNT20 France O')}
|
||||
|
||||
class TNT_R2_474000(TNT_base) :
|
||||
chaines = {
|
||||
'1280' : 'fra TNT08 Direct 8',
|
||||
'1282' : 'fra TNT15 BFM TV',
|
||||
'1283' : 'fra TNT16 i tele',
|
||||
'1284' : 'fra TNT17 Virgin17',
|
||||
'1286' : 'fra TNT14 France 4',
|
||||
'1285' : 'fra TNT18 Gulli'}
|
||||
'1280' : ('fra' , 'fra TNT08 Direct 8'),
|
||||
'1282' : ('fra' , 'fra TNT15 BFM TV'),
|
||||
'1283' : ('fra' , 'fra TNT16 i tele'),
|
||||
'1284' : ('fra' , 'fra TNT17 Virgin17'),
|
||||
'1286' : ('fra' , 'fra TNT14 France 4'),
|
||||
'1285' : ('fra' , 'fra TNT18 Gulli')}
|
||||
|
||||
#les pids ont tendance a changer souvent pour canal, on en met le plus possible
|
||||
class TNT_R3_522000(TNT_base) :
|
||||
chaines = {
|
||||
'1280 80 81 83 32 33 170 120 121 123 62 52' : 'fra TNT04 Canal'}
|
||||
'1280 80 81 83 32 33 170 120 121 123 62 52' : ('fra' , 'fra TNT04 Canal')}
|
||||
|
||||
class TNT_R4_498000(TNT_base) :
|
||||
chaines = {
|
||||
'110' : 'fra TNT06 M6',
|
||||
'210' : 'fra TNT09 W9',
|
||||
'310' : 'fra TNT11 NT1'}
|
||||
'110' : ('fra' , 'fra TNT06 M6'),
|
||||
'210' : ('fra' , 'fra TNT09 W9'),
|
||||
'310' : ('fra' , 'fra TNT11 NT1')}
|
||||
|
||||
class TNT_R5_538000(TNT_base) :
|
||||
chaines = {
|
||||
'110 120 131' : 'fra TNT TEST_HD1',
|
||||
'210 220 230 231' : 'fra TNT TEST_HD2',
|
||||
'310 320 331' : 'fra TNT TEST_HD3'}
|
||||
'110 120 131' : ('fra' , 'fra TNT TEST_HD1'),
|
||||
'210 220 230 231' : ('fra' , 'fra TNT TEST_HD2'),
|
||||
'310 320 331' : ('fra' , 'fra TNT TEST_HD3')}
|
||||
|
||||
class TNT_R6_562000(TNT_base) :
|
||||
chaines = {
|
||||
'100' : 'fra TNT01 TF1',
|
||||
'600' : 'fra TNT10 TMC',
|
||||
'200' : 'fra TNT12 NRJ12'}
|
||||
'100' : ('fra' , 'fra TNT01 TF1'),
|
||||
'600' : ('fra' , 'fra TNT10 TMC'),
|
||||
'200' : ('fra' , 'fra TNT12 NRJ12')}
|
||||
|
||||
class TNT_R7_490000(TNT_base) :
|
||||
chaines = {
|
||||
'4321' : 'fra TNT21 Canal 21 : Cinaps TV, BDM TV, Bocal TV, Demain TV',
|
||||
'4322' : 'fra TNT22 IDF1',
|
||||
'4323' : 'fra TNT23 NRJ Paris',
|
||||
'4324' : 'fra TNT24 Cap 24'}
|
||||
'4321' : ('fra' , 'fra TNT21 Canal 21 : Cinaps TV, BDM TV, Bocal TV, Demain TV'),
|
||||
'4322' : ('fra' , 'fra TNT22 IDF1'),
|
||||
'4323' : ('fra' , 'fra TNT23 NRJ Paris'),
|
||||
'4324' : ('fra' , 'fra TNT24 Cap 24')}
|
||||
|
||||
|
||||
|
|
|
@ -11,14 +11,14 @@ host = gethostname()
|
|||
transpondeurs = { 'canard' : [ TNT_R4_498000(0) ,
|
||||
Hotbird_12476(1) ,
|
||||
Hotbird_11240(2) ,
|
||||
Hotbird_12597(3) ,
|
||||
Hotbird_12577(4) ],
|
||||
Hotbird_12597(3) ],
|
||||
# Hotbird_12577(4) ], #to replace
|
||||
'lapin' : [ Hotbird_11604(0) ,
|
||||
Hotbird_11785(1) ,
|
||||
TNT_R1_586000(2) ,
|
||||
TNT_R6_562000(3) ,
|
||||
TNT_R2_474000(4) ],
|
||||
'oie' : [ Hotbird_11785(0) ,
|
||||
'oie' : [ Hotbird_10873(0) ,
|
||||
Hotbird_11766(1) ,
|
||||
Hotbird_12111(2) ,
|
||||
Hotbird_11137(3) ,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue