KB8PMY
/
ADN-DMR-Peer-Server
mirror of https://github.com/Amateur-Digital-Network/ADN-DMR-Peer-Server.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32 from ea5gvk/pruebas

Browse Source 
Añadido locuciones y tts infinitas en voice.cfg
develop
Joaquin Madrid Belando 4 days ago committed by GitHub
parent f43ba8efa9 ecc3632887
commit 91f44a9500
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 111 additions and 63 deletions
Show Stats Download Patch File Download Diff File

37
bridge_master.py
Unescape View File

@ -43,7 +43,7 @@ import importlib.util
import re import re
import copy import copy
from setproctitle import setproctitle from setproctitle import setproctitle
from collections import deque from collections import deque, defaultdict
from random import randint from random import randint
import secrets import secrets
@ -907,11 +907,11 @@ def ident():
_pkt_time = time() _pkt_time = time()
reactor.callFromThread(sendVoicePacket,systems[system],pkt,_source_id,_dst_id,_slot) reactor.callFromThread(sendVoicePacket,systems[system],pkt,_source_id,_dst_id,_slot)
_announcement_last_hour = {1: -1, 2: -1, 3: -1, 4: -1} _announcement_last_hour = defaultdict(lambda: -1)
_announcement_running = {1: False, 2: False, 3: False, 4: False} _announcement_running = defaultdict(bool)
_tts_last_hour = {1: -1, 2: -1, 3: -1, 4: -1} _tts_last_hour = defaultdict(lambda: -1)
_tts_running = {1: False, 2: False, 3: False, 4: False} _tts_running = defaultdict(bool)
_voice_cfg_mtime = 0 _voice_cfg_mtime = 0
_voice_cfg_file = '' _voice_cfg_file = ''
@ -1299,7 +1299,16 @@ def _checkVoiceConfigReload():
logger.error('(VOICE-RELOAD) Error recargando voice.cfg') logger.error('(VOICE-RELOAD) Error recargando voice.cfg')
return return
for _ann_num in range(1, 5): _active_ann_nums = set(CONFIG['GLOBAL'].get('_ANN_NUMS', []))
for _ann_num in list(_ann_tasks.keys()):
if _ann_num not in _active_ann_nums:
if _ann_tasks[_ann_num].running:
_ann_tasks[_ann_num].stop()
_old_label = 'LOCUCION' if _ann_num == 1 else 'LOCUCION-{}'.format(_ann_num)
logger.info('(VOICE-RELOAD) %s eliminada (ya no existe en voice.cfg)', _old_label)
del _ann_tasks[_ann_num]
for _ann_num in _active_ann_nums:
_prefix = 'ANNOUNCEMENT' if _ann_num == 1 else 'ANNOUNCEMENT{}'.format(_ann_num) _prefix = 'ANNOUNCEMENT' if _ann_num == 1 else 'ANNOUNCEMENT{}'.format(_ann_num)
_label = 'LOCUCION' if _ann_num == 1 else 'LOCUCION-{}'.format(_ann_num) _label = 'LOCUCION' if _ann_num == 1 else 'LOCUCION-{}'.format(_ann_num)
_enabled = CONFIG['GLOBAL'].get('{}_ENABLED'.format(_prefix), False) _enabled = CONFIG['GLOBAL'].get('{}_ENABLED'.format(_prefix), False)
@ -1324,7 +1333,15 @@ def _checkVoiceConfigReload():
CONFIG['GLOBAL']['{}_FILE'.format(_prefix)], CONFIG['GLOBAL']['{}_FILE'.format(_prefix)],
CONFIG['GLOBAL']['{}_TG'.format(_prefix)]) CONFIG['GLOBAL']['{}_TG'.format(_prefix)])
for _tts_num in range(1, 5): _active_tts_nums = set(CONFIG['GLOBAL'].get('_TTS_NUMS', []))
for _tts_num in list(_tts_tasks.keys()):
if _tts_num not in _active_tts_nums:
if _tts_tasks[_tts_num].running:
_tts_tasks[_tts_num].stop()
logger.info('(VOICE-RELOAD) TTS-%s eliminada (ya no existe en voice.cfg)', _tts_num)
del _tts_tasks[_tts_num]
for _tts_num in _active_tts_nums:
_prefix = 'TTS_ANNOUNCEMENT{}'.format(_tts_num) _prefix = 'TTS_ANNOUNCEMENT{}'.format(_tts_num)
_label = 'TTS-{}'.format(_tts_num) _label = 'TTS-{}'.format(_tts_num)
_enabled = CONFIG['GLOBAL'].get('{}_ENABLED'.format(_prefix), False) _enabled = CONFIG['GLOBAL'].get('{}_ENABLED'.format(_prefix), False)
@ -3835,10 +3852,10 @@ if __name__ == '__main__':
killserver = killserver_task.start(5) killserver = killserver_task.start(5)
killserver.addErrback(loopingErrHandle) killserver.addErrback(loopingErrHandle)
for _ann_num in range(1, 5): for _ann_num in CONFIG['GLOBAL'].get('_ANN_NUMS', []):
_prefix = 'ANNOUNCEMENT' if _ann_num == 1 else 'ANNOUNCEMENT{}'.format(_ann_num) _prefix = 'ANNOUNCEMENT' if _ann_num == 1 else 'ANNOUNCEMENT{}'.format(_ann_num)
_label = 'LOCUCION' if _ann_num == 1 else 'LOCUCION-{}'.format(_ann_num) _label = 'LOCUCION' if _ann_num == 1 else 'LOCUCION-{}'.format(_ann_num)
if CONFIG['GLOBAL']['{}_ENABLED'.format(_prefix)]: if CONFIG['GLOBAL'].get('{}_ENABLED'.format(_prefix), False):
_ann_mode = CONFIG['GLOBAL']['{}_MODE'.format(_prefix)] _ann_mode = CONFIG['GLOBAL']['{}_MODE'.format(_prefix)]
if _ann_mode == 'hourly': if _ann_mode == 'hourly':
_ann_check_interval = 30 _ann_check_interval = 30
@ -3857,7 +3874,7 @@ if __name__ == '__main__':
if _ann_mode == 'interval': if _ann_mode == 'interval':
logger.info('(%s) Interval: every %s seconds', _label, _ann_check_interval) logger.info('(%s) Interval: every %s seconds', _label, _ann_check_interval)
for _tts_num in range(1, 5): for _tts_num in CONFIG['GLOBAL'].get('_TTS_NUMS', []):
_prefix = 'TTS_ANNOUNCEMENT{}'.format(_tts_num) _prefix = 'TTS_ANNOUNCEMENT{}'.format(_tts_num)
_label = 'TTS-{}'.format(_tts_num) _label = 'TTS-{}'.format(_tts_num)
if CONFIG['GLOBAL'].get('{}_ENABLED'.format(_prefix), False): if CONFIG['GLOBAL'].get('{}_ENABLED'.format(_prefix), False):

123
config.py
Unescape View File

@ -32,6 +32,7 @@ change.
import configparser import configparser
import sys import sys
import os import os
import re
import const import const
import socket import socket
@ -409,31 +410,35 @@ def build_config(_config_file):
_voice_section = 'VOICE' _voice_section = 'VOICE'
_has_voice = voice_config.has_section(_voice_section) _has_voice = voice_config.has_section(_voice_section)
CONFIG['GLOBAL'].update({ _ann_nums = []
'ANNOUNCEMENT_ENABLED': voice_config.getboolean(_voice_section, 'ANNOUNCEMENT_ENABLED', fallback=False) if _has_voice else False, _tts_nums = []
'ANNOUNCEMENT_FILE': voice_config.get(_voice_section, 'ANNOUNCEMENT_FILE', fallback='locucion') if _has_voice else 'locucion', if _has_voice:
'ANNOUNCEMENT_TG': voice_config.getint(_voice_section, 'ANNOUNCEMENT_TG', fallback=9) if _has_voice else 9, for _key in voice_config.options(_voice_section):
'ANNOUNCEMENT_MODE': voice_config.get(_voice_section, 'ANNOUNCEMENT_MODE', fallback='hourly') if _has_voice else 'hourly', _key_upper = _key.upper()
'ANNOUNCEMENT_INTERVAL': voice_config.getint(_voice_section, 'ANNOUNCEMENT_INTERVAL', fallback=3600) if _has_voice else 3600, _m = re.match(r'^ANNOUNCEMENT(\d*)_ENABLED$', _key_upper)
'ANNOUNCEMENT_LANGUAGE': voice_config.get(_voice_section, 'ANNOUNCEMENT_LANGUAGE', fallback='es_ES') if _has_voice else 'es_ES', if _m:
'ANNOUNCEMENT2_ENABLED': voice_config.getboolean(_voice_section, 'ANNOUNCEMENT2_ENABLED', fallback=False) if _has_voice else False, _ann_nums.append(1 if _m.group(1) == '' else int(_m.group(1)))
'ANNOUNCEMENT2_FILE': voice_config.get(_voice_section, 'ANNOUNCEMENT2_FILE', fallback='locucion') if _has_voice else 'locucion', _m = re.match(r'^TTS_ANNOUNCEMENT(\d+)_ENABLED$', _key_upper)
'ANNOUNCEMENT2_TG': voice_config.getint(_voice_section, 'ANNOUNCEMENT2_TG', fallback=9) if _has_voice else 9, if _m:
'ANNOUNCEMENT2_MODE': voice_config.get(_voice_section, 'ANNOUNCEMENT2_MODE', fallback='hourly') if _has_voice else 'hourly', _tts_nums.append(int(_m.group(1)))
'ANNOUNCEMENT2_INTERVAL': voice_config.getint(_voice_section, 'ANNOUNCEMENT2_INTERVAL', fallback=3600) if _has_voice else 3600, _ann_nums = sorted(set(_ann_nums))
'ANNOUNCEMENT2_LANGUAGE': voice_config.get(_voice_section, 'ANNOUNCEMENT2_LANGUAGE', fallback='es_ES') if _has_voice else 'es_ES', _tts_nums = sorted(set(_tts_nums))
'ANNOUNCEMENT3_ENABLED': voice_config.getboolean(_voice_section, 'ANNOUNCEMENT3_ENABLED', fallback=False) if _has_voice else False,
'ANNOUNCEMENT3_FILE': voice_config.get(_voice_section, 'ANNOUNCEMENT3_FILE', fallback='locucion') if _has_voice else 'locucion', _voice_data = {
'ANNOUNCEMENT3_TG': voice_config.getint(_voice_section, 'ANNOUNCEMENT3_TG', fallback=9) if _has_voice else 9, '_ANN_NUMS': list(_ann_nums),
'ANNOUNCEMENT3_MODE': voice_config.get(_voice_section, 'ANNOUNCEMENT3_MODE', fallback='hourly') if _has_voice else 'hourly', '_TTS_NUMS': list(_tts_nums),
'ANNOUNCEMENT3_INTERVAL': voice_config.getint(_voice_section, 'ANNOUNCEMENT3_INTERVAL', fallback=3600) if _has_voice else 3600, }
'ANNOUNCEMENT3_LANGUAGE': voice_config.get(_voice_section, 'ANNOUNCEMENT3_LANGUAGE', fallback='es_ES') if _has_voice else 'es_ES',
'ANNOUNCEMENT4_ENABLED': voice_config.getboolean(_voice_section, 'ANNOUNCEMENT4_ENABLED', fallback=False) if _has_voice else False, for _ann_num in _ann_nums:
'ANNOUNCEMENT4_FILE': voice_config.get(_voice_section, 'ANNOUNCEMENT4_FILE', fallback='locucion') if _has_voice else 'locucion', _prefix = 'ANNOUNCEMENT' if _ann_num == 1 else 'ANNOUNCEMENT{}'.format(_ann_num)
'ANNOUNCEMENT4_TG': voice_config.getint(_voice_section, 'ANNOUNCEMENT4_TG', fallback=9) if _has_voice else 9, _voice_data['{}_ENABLED'.format(_prefix)] = voice_config.getboolean(_voice_section, '{}_ENABLED'.format(_prefix), fallback=False) if _has_voice else False
'ANNOUNCEMENT4_MODE': voice_config.get(_voice_section, 'ANNOUNCEMENT4_MODE', fallback='hourly') if _has_voice else 'hourly', _voice_data['{}_FILE'.format(_prefix)] = voice_config.get(_voice_section, '{}_FILE'.format(_prefix), fallback='locucion') if _has_voice else 'locucion'
'ANNOUNCEMENT4_INTERVAL': voice_config.getint(_voice_section, 'ANNOUNCEMENT4_INTERVAL', fallback=3600) if _has_voice else 3600, _voice_data['{}_TG'.format(_prefix)] = voice_config.getint(_voice_section, '{}_TG'.format(_prefix), fallback=9) if _has_voice else 9
'ANNOUNCEMENT4_LANGUAGE': voice_config.get(_voice_section, 'ANNOUNCEMENT4_LANGUAGE', fallback='es_ES') if _has_voice else 'es_ES', _voice_data['{}_MODE'.format(_prefix)] = voice_config.get(_voice_section, '{}_MODE'.format(_prefix), fallback='hourly') if _has_voice else 'hourly'
_voice_data['{}_INTERVAL'.format(_prefix)] = voice_config.getint(_voice_section, '{}_INTERVAL'.format(_prefix), fallback=3600) if _has_voice else 3600
_voice_data['{}_LANGUAGE'.format(_prefix)] = voice_config.get(_voice_section, '{}_LANGUAGE'.format(_prefix), fallback='es_ES') if _has_voice else 'es_ES'
_voice_data.update({
'RECORDING_ENABLED': voice_config.getboolean(_voice_section, 'RECORDING_ENABLED', fallback=False) if _has_voice else False, 'RECORDING_ENABLED': voice_config.getboolean(_voice_section, 'RECORDING_ENABLED', fallback=False) if _has_voice else False,
'RECORDING_TG': voice_config.getint(_voice_section, 'RECORDING_TG', fallback=9) if _has_voice else 9, 'RECORDING_TG': voice_config.getint(_voice_section, 'RECORDING_TG', fallback=9) if _has_voice else 9,
'RECORDING_TIMESLOT': voice_config.getint(_voice_section, 'RECORDING_TIMESLOT', fallback=2) if _has_voice else 2, 'RECORDING_TIMESLOT': voice_config.getint(_voice_section, 'RECORDING_TIMESLOT', fallback=2) if _has_voice else 2,
@ -444,32 +449,19 @@ def build_config(_config_file):
'TTS_AMBESERVER_PORT': voice_config.getint(_voice_section, 'TTS_AMBESERVER_PORT', fallback=2460) if _has_voice else 2460, 'TTS_AMBESERVER_PORT': voice_config.getint(_voice_section, 'TTS_AMBESERVER_PORT', fallback=2460) if _has_voice else 2460,
'TTS_VOLUME': voice_config.getint(_voice_section, 'TTS_VOLUME', fallback=-3) if _has_voice else -3, 'TTS_VOLUME': voice_config.getint(_voice_section, 'TTS_VOLUME', fallback=-3) if _has_voice else -3,
'TTS_SPEED': voice_config.getfloat(_voice_section, 'TTS_SPEED', fallback=1.0) if _has_voice else 1.0, 'TTS_SPEED': voice_config.getfloat(_voice_section, 'TTS_SPEED', fallback=1.0) if _has_voice else 1.0,
'TTS_ANNOUNCEMENT1_ENABLED': voice_config.getboolean(_voice_section, 'TTS_ANNOUNCEMENT1_ENABLED', fallback=False) if _has_voice else False,
'TTS_ANNOUNCEMENT1_FILE': voice_config.get(_voice_section, 'TTS_ANNOUNCEMENT1_FILE', fallback='texto1') if _has_voice else 'texto1',
'TTS_ANNOUNCEMENT1_TG': voice_config.getint(_voice_section, 'TTS_ANNOUNCEMENT1_TG', fallback=9) if _has_voice else 9,
'TTS_ANNOUNCEMENT1_MODE': voice_config.get(_voice_section, 'TTS_ANNOUNCEMENT1_MODE', fallback='hourly') if _has_voice else 'hourly',
'TTS_ANNOUNCEMENT1_INTERVAL': voice_config.getint(_voice_section, 'TTS_ANNOUNCEMENT1_INTERVAL', fallback=3600) if _has_voice else 3600,
'TTS_ANNOUNCEMENT1_LANGUAGE': voice_config.get(_voice_section, 'TTS_ANNOUNCEMENT1_LANGUAGE', fallback='es_ES') if _has_voice else 'es_ES',
'TTS_ANNOUNCEMENT2_ENABLED': voice_config.getboolean(_voice_section, 'TTS_ANNOUNCEMENT2_ENABLED', fallback=False) if _has_voice else False,
'TTS_ANNOUNCEMENT2_FILE': voice_config.get(_voice_section, 'TTS_ANNOUNCEMENT2_FILE', fallback='texto2') if _has_voice else 'texto2',
'TTS_ANNOUNCEMENT2_TG': voice_config.getint(_voice_section, 'TTS_ANNOUNCEMENT2_TG', fallback=9) if _has_voice else 9,
'TTS_ANNOUNCEMENT2_MODE': voice_config.get(_voice_section, 'TTS_ANNOUNCEMENT2_MODE', fallback='hourly') if _has_voice else 'hourly',
'TTS_ANNOUNCEMENT2_INTERVAL': voice_config.getint(_voice_section, 'TTS_ANNOUNCEMENT2_INTERVAL', fallback=3600) if _has_voice else 3600,
'TTS_ANNOUNCEMENT2_LANGUAGE': voice_config.get(_voice_section, 'TTS_ANNOUNCEMENT2_LANGUAGE', fallback='es_ES') if _has_voice else 'es_ES',
'TTS_ANNOUNCEMENT3_ENABLED': voice_config.getboolean(_voice_section, 'TTS_ANNOUNCEMENT3_ENABLED', fallback=False) if _has_voice else False,
'TTS_ANNOUNCEMENT3_FILE': voice_config.get(_voice_section, 'TTS_ANNOUNCEMENT3_FILE', fallback='texto3') if _has_voice else 'texto3',
'TTS_ANNOUNCEMENT3_TG': voice_config.getint(_voice_section, 'TTS_ANNOUNCEMENT3_TG', fallback=9) if _has_voice else 9,
'TTS_ANNOUNCEMENT3_MODE': voice_config.get(_voice_section, 'TTS_ANNOUNCEMENT3_MODE', fallback='hourly') if _has_voice else 'hourly',
'TTS_ANNOUNCEMENT3_INTERVAL': voice_config.getint(_voice_section, 'TTS_ANNOUNCEMENT3_INTERVAL', fallback=3600) if _has_voice else 3600,
'TTS_ANNOUNCEMENT3_LANGUAGE': voice_config.get(_voice_section, 'TTS_ANNOUNCEMENT3_LANGUAGE', fallback='es_ES') if _has_voice else 'es_ES',
'TTS_ANNOUNCEMENT4_ENABLED': voice_config.getboolean(_voice_section, 'TTS_ANNOUNCEMENT4_ENABLED', fallback=False) if _has_voice else False,
'TTS_ANNOUNCEMENT4_FILE': voice_config.get(_voice_section, 'TTS_ANNOUNCEMENT4_FILE', fallback='texto4') if _has_voice else 'texto4',
'TTS_ANNOUNCEMENT4_TG': voice_config.getint(_voice_section, 'TTS_ANNOUNCEMENT4_TG', fallback=9) if _has_voice else 9,
'TTS_ANNOUNCEMENT4_MODE': voice_config.get(_voice_section, 'TTS_ANNOUNCEMENT4_MODE', fallback='hourly') if _has_voice else 'hourly',
'TTS_ANNOUNCEMENT4_INTERVAL': voice_config.getint(_voice_section, 'TTS_ANNOUNCEMENT4_INTERVAL', fallback=3600) if _has_voice else 3600,
'TTS_ANNOUNCEMENT4_LANGUAGE': voice_config.get(_voice_section, 'TTS_ANNOUNCEMENT4_LANGUAGE', fallback='es_ES') if _has_voice else 'es_ES',
}) })
for _tts_num in _tts_nums:
_prefix = 'TTS_ANNOUNCEMENT{}'.format(_tts_num)
_voice_data['{}_ENABLED'.format(_prefix)] = voice_config.getboolean(_voice_section, '{}_ENABLED'.format(_prefix), fallback=False) if _has_voice else False
_voice_data['{}_FILE'.format(_prefix)] = voice_config.get(_voice_section, '{}_FILE'.format(_prefix), fallback='texto{}'.format(_tts_num)) if _has_voice else 'texto{}'.format(_tts_num)
_voice_data['{}_TG'.format(_prefix)] = voice_config.getint(_voice_section, '{}_TG'.format(_prefix), fallback=9) if _has_voice else 9
_voice_data['{}_MODE'.format(_prefix)] = voice_config.get(_voice_section, '{}_MODE'.format(_prefix), fallback='hourly') if _has_voice else 'hourly'
_voice_data['{}_INTERVAL'.format(_prefix)] = voice_config.getint(_voice_section, '{}_INTERVAL'.format(_prefix), fallback=3600) if _has_voice else 3600
_voice_data['{}_LANGUAGE'.format(_prefix)] = voice_config.get(_voice_section, '{}_LANGUAGE'.format(_prefix), fallback='es_ES') if _has_voice else 'es_ES'
CONFIG['GLOBAL'].update(_voice_data)
return CONFIG return CONFIG
@ -493,7 +485,23 @@ def reload_voice_config(CONFIG, config_file):
_voice_keys = {} _voice_keys = {}
for _ann_num in range(1, 5): _ann_nums = []
_tts_nums = []
for _key in voice_config.options(_voice_section):
_key_upper = _key.upper()
_m = re.match(r'^ANNOUNCEMENT(\d*)_ENABLED$', _key_upper)
if _m:
_ann_nums.append(1 if _m.group(1) == '' else int(_m.group(1)))
_m = re.match(r'^TTS_ANNOUNCEMENT(\d+)_ENABLED$', _key_upper)
if _m:
_tts_nums.append(int(_m.group(1)))
_ann_nums = sorted(set(_ann_nums))
_tts_nums = sorted(set(_tts_nums))
_voice_keys['_ANN_NUMS'] = list(_ann_nums)
_voice_keys['_TTS_NUMS'] = list(_tts_nums)
for _ann_num in _ann_nums:
_prefix = 'ANNOUNCEMENT' if _ann_num == 1 else 'ANNOUNCEMENT{}'.format(_ann_num) _prefix = 'ANNOUNCEMENT' if _ann_num == 1 else 'ANNOUNCEMENT{}'.format(_ann_num)
_voice_keys['{}_ENABLED'.format(_prefix)] = voice_config.getboolean(_voice_section, '{}_ENABLED'.format(_prefix), fallback=False) _voice_keys['{}_ENABLED'.format(_prefix)] = voice_config.getboolean(_voice_section, '{}_ENABLED'.format(_prefix), fallback=False)
_voice_keys['{}_FILE'.format(_prefix)] = voice_config.get(_voice_section, '{}_FILE'.format(_prefix), fallback='locucion') _voice_keys['{}_FILE'.format(_prefix)] = voice_config.get(_voice_section, '{}_FILE'.format(_prefix), fallback='locucion')
@ -514,7 +522,7 @@ def reload_voice_config(CONFIG, config_file):
_voice_keys['TTS_VOLUME'] = voice_config.getint(_voice_section, 'TTS_VOLUME', fallback=-3) _voice_keys['TTS_VOLUME'] = voice_config.getint(_voice_section, 'TTS_VOLUME', fallback=-3)
_voice_keys['TTS_SPEED'] = voice_config.getfloat(_voice_section, 'TTS_SPEED', fallback=1.0) _voice_keys['TTS_SPEED'] = voice_config.getfloat(_voice_section, 'TTS_SPEED', fallback=1.0)
for _tts_num in range(1, 5): for _tts_num in _tts_nums:
_prefix = 'TTS_ANNOUNCEMENT{}'.format(_tts_num) _prefix = 'TTS_ANNOUNCEMENT{}'.format(_tts_num)
_voice_keys['{}_ENABLED'.format(_prefix)] = voice_config.getboolean(_voice_section, '{}_ENABLED'.format(_prefix), fallback=False) _voice_keys['{}_ENABLED'.format(_prefix)] = voice_config.getboolean(_voice_section, '{}_ENABLED'.format(_prefix), fallback=False)
_voice_keys['{}_FILE'.format(_prefix)] = voice_config.get(_voice_section, '{}_FILE'.format(_prefix), fallback='texto{}'.format(_tts_num)) _voice_keys['{}_FILE'.format(_prefix)] = voice_config.get(_voice_section, '{}_FILE'.format(_prefix), fallback='texto{}'.format(_tts_num))
@ -523,6 +531,19 @@ def reload_voice_config(CONFIG, config_file):
_voice_keys['{}_INTERVAL'.format(_prefix)] = voice_config.getint(_voice_section, '{}_INTERVAL'.format(_prefix), fallback=3600) _voice_keys['{}_INTERVAL'.format(_prefix)] = voice_config.getint(_voice_section, '{}_INTERVAL'.format(_prefix), fallback=3600)
_voice_keys['{}_LANGUAGE'.format(_prefix)] = voice_config.get(_voice_section, '{}_LANGUAGE'.format(_prefix), fallback='es_ES') _voice_keys['{}_LANGUAGE'.format(_prefix)] = voice_config.get(_voice_section, '{}_LANGUAGE'.format(_prefix), fallback='es_ES')
_old_ann = CONFIG['GLOBAL'].get('_ANN_NUMS', [])
for _old_num in _old_ann:
if _old_num not in _ann_nums:
_old_prefix = 'ANNOUNCEMENT' if _old_num == 1 else 'ANNOUNCEMENT{}'.format(_old_num)
for _sfx in ('_ENABLED', '_FILE', '_TG', '_MODE', '_INTERVAL', '_LANGUAGE'):
CONFIG['GLOBAL'].pop('{}{}'.format(_old_prefix, _sfx), None)
_old_tts = CONFIG['GLOBAL'].get('_TTS_NUMS', [])
for _old_num in _old_tts:
if _old_num not in _tts_nums:
_old_prefix = 'TTS_ANNOUNCEMENT{}'.format(_old_num)
for _sfx in ('_ENABLED', '_FILE', '_TG', '_MODE', '_INTERVAL', '_LANGUAGE'):
CONFIG['GLOBAL'].pop('{}{}'.format(_old_prefix, _sfx), None)
CONFIG['GLOBAL'].update(_voice_keys) CONFIG['GLOBAL'].update(_voice_keys)
return True return True

14
config/voice.cfg
Unescape View File

@ -1,5 +1,10 @@
[VOICE] [VOICE]
; Locuciones programadas ; Locuciones programadas (AMBE pregrabado)
; Se pueden definir tantas locuciones como se necesiten.
; La primera usa prefijo ANNOUNCEMENT_, las siguientes ANNOUNCEMENT2_, ANNOUNCEMENT3_, etc.
; Para anadir mas, duplicar el bloque con el siguiente numero (ANNOUNCEMENT5_, ANNOUNCEMENT6_...)
; No hay limite en el numero de locuciones.
;
; ANNOUNCEMENT_FILE: Nombre del archivo .ambe (sin extension, se busca en Audio/<lang>/ondemand/) ; ANNOUNCEMENT_FILE: Nombre del archivo .ambe (sin extension, se busca en Audio/<lang>/ondemand/)
; ANNOUNCEMENT_TG: Talkgroup donde se emite la locucion ; ANNOUNCEMENT_TG: Talkgroup donde se emite la locucion
; ANNOUNCEMENT_MODE: interval (cada X segundos) o hourly (a las horas en punto) ; ANNOUNCEMENT_MODE: interval (cada X segundos) o hourly (a las horas en punto)
@ -7,6 +12,7 @@
; ANNOUNCEMENT_ENABLED: True/False para activar/desactivar ; ANNOUNCEMENT_ENABLED: True/False para activar/desactivar
; ANNOUNCEMENT_LANGUAGE: Idioma para buscar el archivo (ej: es_ES, en_GB) ; ANNOUNCEMENT_LANGUAGE: Idioma para buscar el archivo (ej: es_ES, en_GB)
; NOTA: El timeslot se determina automaticamente segun BRIDGES (se emite en TS1, TS2 o ambos) ; NOTA: El timeslot se determina automaticamente segun BRIDGES (se emite en TS1, TS2 o ambos)
; NOTA: Los cambios en este archivo se aplican automaticamente (hot-reload cada 15s)
ANNOUNCEMENT_ENABLED: False ANNOUNCEMENT_ENABLED: False
ANNOUNCEMENT_FILE: locucion ANNOUNCEMENT_FILE: locucion
ANNOUNCEMENT_TG: 2 ANNOUNCEMENT_TG: 2
@ -84,7 +90,11 @@ TTS_VOLUME: -3
; Por defecto: 1.0 ; Por defecto: 1.0
TTS_SPEED: 1.0 TTS_SPEED: 1.0
; TTS programada 1 ; TTS programadas (Text-to-Speech desde archivos .txt)
; Se pueden definir tantas TTS como se necesiten: TTS_ANNOUNCEMENT1_, TTS_ANNOUNCEMENT2_, etc.
; Para anadir mas, duplicar el bloque con el siguiente numero (TTS_ANNOUNCEMENT5_, TTS_ANNOUNCEMENT6_...)
; No hay limite en el numero de anuncios TTS.
;
; TTS_ANNOUNCEMENT1_FILE: Nombre del archivo .txt (sin extension, se busca en Audio/<lang>/ondemand/) ; TTS_ANNOUNCEMENT1_FILE: Nombre del archivo .txt (sin extension, se busca en Audio/<lang>/ondemand/)
; TTS_ANNOUNCEMENT1_TG: Talkgroup donde se emite la locucion TTS ; TTS_ANNOUNCEMENT1_TG: Talkgroup donde se emite la locucion TTS
; TTS_ANNOUNCEMENT1_MODE: interval (cada X segundos) o hourly (a las horas en punto) ; TTS_ANNOUNCEMENT1_MODE: interval (cada X segundos) o hourly (a las horas en punto)

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.