From f98c949e2e0b9cbe2ab501de13cf528e4b58b909 Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Wed, 17 Dec 2014 20:35:36 +0100 Subject: [PATCH] Utilisation de playlist pour des url vers la tv MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Parce que les navigateurs ne savent pas trop gérer les uri en udp:// --- tv/radio/config.py | 12 +++++++++++- wiki/macro/TV.py | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tv/radio/config.py b/tv/radio/config.py index 06110356..07767492 100644 --- a/tv/radio/config.py +++ b/tv/radio/config.py @@ -5,6 +5,8 @@ def dir(path): l=collections.deque(["%s%s" % (path,i) for i in os.listdir(path)]) l.rotate(random.randrange(0,len(l))) return l +#dico groupe => (Nom => (tag, multicast ip, multicast port, list de source)) +# dans les fait, seule la première source est utilisé multicast={ 'Radio': { 'Armitunes': ('armitunes','239.231.140.162','1234',['http://198.27.80.17:8000/','http://95.31.11.136:9010/','http://95.31.3.225:9010/']), @@ -26,7 +28,7 @@ multicast={ 'Nostalgie': ('nostalgie', '239.231.140.179', '1234', ['http://95.81.155.10/5010/nrj_121955.mp3']), 'le mouv\'': ('lemouv', '239.231.140.180', '1234', ['http://95.81.147.3/lemouv/all/lemouvhautdebit.mp3']), 'NRJ': ('nrj', '239.231.140.181', '1234', ['http://95.81.147.24/8470/nrj_165631.mp3']), - 'rts': ('rtsfm', '239.231.140.182', '1234', ['http://stream.rtsfm.com:8000/']), + 'RTS Fm': ('rtsfm', '239.231.140.182', '1234', ['http://stream.rtsfm.com:8000/']), 'Sud Radio': ('sud_radio', '239.231.140.183', '1234', ['http://95.81.147.10/5726/gie_105741.mp3']), 'France Bleu': ('bleu', '239.231.140.184', '1234', ['http://mp3.live.tv-radio.com/fbidf/all/fbidfhautdebit.mp3']), 'RFM': ('rfm', '239.231.140.185', '1234', ['http://mp3lg4.tdf-cdn.com/8376/goo_091150.mp3']), @@ -38,3 +40,11 @@ multicast={ for i in range(1, 5): multicast['Radio']['BBC Radio %s' % i]=('bbc%s' % i, '239.231.140.19%s' % i, '1234', ['http://bbcmedia.ic.llnwd.net/stream/bbcmedia_intl_lc_radio%s_p' % i ]) + +# dico groupe => (tag => (nom, ...)) +multicast_tag = {} +for groupe, infos in multicast.items(): + info_tags = {} + for nom, params in infos.items(): + info_tags[params[0]] = (nom, ) + params[1:] + multicast_tag[groupe] = info_tags diff --git a/wiki/macro/TV.py b/wiki/macro/TV.py index d4cd9b1a..80d64638 100644 --- a/wiki/macro/TV.py +++ b/wiki/macro/TV.py @@ -32,7 +32,8 @@ def get_channel_list(): for a_line in s: try: ch_name, ch_ip = a_line.split(":") - url = unicode("udp://@%s:1234" % tv.dns.idn(unicode(ch_name, 'utf-8'), True), 'utf-8') + #url = unicode("udp://@%s:1234" % tv.dns.idn(unicode(ch_name, 'utf-8'), True), 'utf-8') + url = u"https://intranet2.crans.org/tv/%s.m3u" % unicode(ch_name, 'utf-8') d = { "name": ch_name, "url": url,