From 0e85b6186842ece40e75fc769fdc257d0f571f3b Mon Sep 17 00:00:00 2001 From: Homer S Date: Wed, 7 Jul 2021 22:31:05 +0200 Subject: [PATCH] Merge with multitam branch. --- .env.sample | 6 +++++ fritzab2matrix.py | 52 +++++++++++++++++++++++++++++-------- libs/monitoring/__init__.py | 8 +++--- 3 files changed, 51 insertions(+), 15 deletions(-) create mode 100644 .env.sample diff --git a/.env.sample b/.env.sample new file mode 100644 index 0000000..b1c8423 --- /dev/null +++ b/.env.sample @@ -0,0 +1,6 @@ +FRITZ_USERNAME="fritzab2matrix" +FRITZ_PASSWORD="S0meSecretPa5sw02d" +FRITZ_IP="192.168.178.1" +FRITZ_TMP="/tmp" +FRITZ_VOICEBOX_PATH="fritz.nas/FRITZ/voicebox" +FRITZ_TAM='{"0" : "!roomhash1:matrix.org", "1" : "!roomhash2:matrix.org"}' diff --git a/fritzab2matrix.py b/fritzab2matrix.py index fd19757..761ff8b 100755 --- a/fritzab2matrix.py +++ b/fritzab2matrix.py @@ -6,7 +6,7 @@ from pydub import AudioSegment from libs.monitoring import endedCall from libs.message import conversion as conv import urllib.request -import xmltodict +import xmltodict, json import sys, os import smbclient @@ -18,11 +18,18 @@ env_user = os.environ.get('FRITZ_USERNAME') env_pass = os.environ.get('FRITZ_PASSWORD') env_ip = os.environ.get('FRITZ_IP') env_voicebox = os.environ.get('FRITZ_VOICEBOX_PATH') +env_tam = json.loads(os.environ.get('FRITZ_TAM')) env_tmp = os.environ.get('TEMP_DIR') if env_voicebox is None: env_voicebox = "/fritz.nas/FRITZ/voicebox/" +if env_tam is None: + env_tam = { + "0" : "!MxRrNGhFuQwnIeEWnX:ismus.net" + } +print(env_tam) + if env_tmp is None: env_tmp = "/tmp" @@ -60,11 +67,30 @@ def fritzab2matrix(): ## Get info about messages from the main answering machine - message_list = fc.call_action("X_AVM-DE_TAM1", "GetMessageList", NewIndex=0) + message_list = fc.call_action("X_AVM-DE_TAM1", "GetMessageList", NewIndex=tam) message_list_url = message_list['NewURL'] + # Build the url to download the message via smb + def build_download_url(mid, tam=tam): + recording = "rec." + str(tam) + r"." + str(mid).zfill(3) + url = os.path.join("//",env_ip,env_voicebox,"rec",recording) + return url + + def download_speex_file(smb_url): + smbclient.register_session(server=env_ip, username=env_user, password=env_pass, auth_protocol="ntlm") + fd = smbclient.open_file(smb_url, mode="rb") + return fd + + + def get_message_list(url): + """ Get and and convert the xml formatted list of messages into a dictionary. """ + with urllib.request.urlopen(url) as f: + doc = f.read() + # Convert the xml formatted message list to dict + messages = xmltodict.parse(doc) + return messages l = get_message_list(message_list_url) if l['Root'] == None or l['Root']['Message'] == None: @@ -94,17 +120,17 @@ def fritzab2matrix(): # Download and convert the speex files to wav smb_url = build_download_url(a['Index']) speex_fd = download_speex_file(smb_url) - conv.speex_convert(speex_fd, os.path.join(env_tmp,"message.wav")) + conv.speex_convert(speex_fd, os.path.join(env_tmp,"message{}.wav".format(tam))) # Convert wav to ogg - msg = AudioSegment.from_wav(os.path.join(env_tmp,"message.wav")) + msg = AudioSegment.from_wav(os.path.join(env_tmp,"message{}.wav".format(tam))) # Only if message is longer than 5 seconds ... if msg.duration_seconds > 5.0: # ... export to ogg ... - msg.export(os.path.join(env_tmp,"message.ogg"), format="ogg", tags=msg_tags) + msg.export(os.path.join(env_tmp,"message{}.ogg".format(tam)), format="ogg", tags=msg_tags) # ... and send message and file to Matrix Room - command = "python3 matrix-commander.py -a " + os.path.join(env_tmp,"message.ogg") + " -m '{}'".format(msg_info) + command = "python3 matrix-commander.py --room {} -a ".format(env_tam[tam]) + os.path.join(env_tmp,"message{}.ogg".format(tam)) + " -m '{}'".format(msg_info) os.system(command) else: @@ -115,7 +141,7 @@ def fritzab2matrix(): print("** " + msg_info) # Mark processed messages as 'read' - fc.call_action("X_AVM-DE_TAM1", "MarkMessage", NewIndex=0, NewMessageIndex=int(a['Index']), NewMarkedAsRead=1) + fc.call_action("X_AVM-DE_TAM1", "MarkMessage", NewIndex=tam, NewMessageIndex=int(a['Index']), NewMarkedAsRead=1) else: # Show that message is already read @@ -123,20 +149,24 @@ def fritzab2matrix(): # ## For testing purposes only # if a['Date'].endswith('20:53'): -# fc.call_action("X_AVM-DE_TAM1", "MarkMessage", NewIndex=0, NewMessageIndex=int(a['Index']), NewMarkedAsRead=0) +# fc.call_action("X_AVM-DE_TAM1", "MarkMessage", NewIndex=1, NewMessageIndex=int(a['Index']), NewMarkedAsRead=0) continue continue - +def multitam(tams): + for tam in tams.keys(): + print("Check TAM {}.".format(tam)) + fritzab2matrix(tam) if __name__ == "__main__": - fritzab2matrix() + + multitam(env_tam) ### Monitor the FritzBox and trigger the main script whenever a call disconnects ### ################################################################################### - endedCall(fritzab2matrix, env_ip) + endedCall(multitam,env_tam, env_ip) diff --git a/libs/monitoring/__init__.py b/libs/monitoring/__init__.py index c137fc2..9bb647f 100644 --- a/libs/monitoring/__init__.py +++ b/libs/monitoring/__init__.py @@ -4,7 +4,7 @@ from fritzconnection.core.fritzmonitor import FritzMonitor ### Monitor the calls of a fritzbox continously ### ################################################### -def watch_disconnect(monitor, event_queue, func, healthcheck_interval=10): +def watch_disconnect(monitor, event_queue, func, tams, healthcheck_interval=10): while True: try: event = event_queue.get(timeout=healthcheck_interval) @@ -17,11 +17,11 @@ def watch_disconnect(monitor, event_queue, func, healthcheck_interval=10): print(event) if 'DISCONNECT' in event: print("Anruf beendet. Jetzt den AB checken.\n") - func() + func(tams) -def endedCall(func, fritz_ip='192.168.1.1'): +def endedCall(func, tams, fritz_ip='192.168.1.1'): """ Call this to trigger a given function if a call is disconnected """ @@ -29,7 +29,7 @@ def endedCall(func, fritz_ip='192.168.1.1'): # as a context manager FritzMonitor will shut down the monitor thread with FritzMonitor(address=fritz_ip) as monitor: event_queue = monitor.start() - watch_disconnect(monitor, event_queue, func) + watch_disconnect(monitor, event_queue, func, tams) except (OSError, KeyboardInterrupt) as err: print(err)