.env.sample

@@ -4,4 +4,3 @@ 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"}'
-FRITZ_CALL_WATCH=False

docker/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM alpine:latest 
+FROM alpine:latest
 
 ENV TZ=Europe/Berlin
 ENV UNBUFFERED=1
@@ -11,9 +11,9 @@ VOLUME /app
 COPY . .
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone; \
-    /bin/sh -c 'apk update && apk add --no-cache gcc musl-dev python3-dev py3-wheel py3-pip py3-olm libffi-dev openssl-dev cargo zlib-dev jpeg-dev libmagic speex ffmpeg htop; \
+    /bin/sh -c 'apk update && apk add --no-cache gcc musl-dev python3-dev py3-pip libffi-dev openssl-dev cargo zlib-dev jpeg-dev speex ffmpeg htop; \
     pip install update pip && pip install -r requirements.txt ; \
-    apk del zlib-dev jpeg-dev gcc musl-dev python3-dev openssl-dev cargo;'
+    apk del zlib-dev jpeg-dev gcc musl-dev python3-dev libffi-dev openssl-dev cargo;'
 
 
 

fritzab2matrix.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 from fritzconnection import FritzConnection
-from fritzconnection.lib.fritzcall import FritzCall, Call
 from dotenv import load_dotenv
 from pydub import AudioSegment
 from libs.monitoring import endedCall
@@ -20,15 +19,8 @@ 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_call_watch = eval(os.environ.get('FRITZ_CALL_WATCH'))
 env_tmp = os.environ.get('TEMP_DIR')
 
-if env_call_watch is None:
-    env_call_watch = False
-elif env_call_watch:
-    at_least_one_new_message = False
-
-
 if env_voicebox is None:
     env_voicebox = "/fritz.nas/FRITZ/voicebox/"
 
@@ -36,13 +28,12 @@ if env_tam is None:
     env_tam = {
         "0" : "!MxRrNGhFuQwnIeEWnX:ismus.net"
         }
-#print(env_tam)
+print(env_tam)
 
 if env_tmp is None:
     env_tmp = "/tmp"
 
 
-
     # Build the url to download the message via smb
 def build_download_url(mid, tam=0):
     recording = "rec." + str(tam) + r"." + str(mid).zfill(3)
@@ -63,31 +54,6 @@ def get_message_list(url):
         messages = xmltodict.parse(doc)
         return messages
 
-def get_last_call():
-    """ Get the last Call. """
-    try:
-        fc = FritzCall(address=env_ip,password=env_pass)
-    except:
-        print("Couldn't connect to Box")
-    missed_calls = fc.get_missed_calls(False,1,1)
-    return missed_calls[0]
-
-def lastcall2matrix(tam,tam_no):
-    # Call Watch to Matrix
-    if env_call_watch and not at_least_one_new_message:
-        c = get_last_call()
-        c_msg = "{} - {} ({})".format(c.Date, c.Caller, c.Name)
-        
-        # ... and send message and file to Matrix Room
-        ## if Number of a TAM and the last call match
-        if tam_no == c.CalledNumber:
-            cmd = "python3 matrix-commander.py --room {} -m '{}'".format(env_tam[tam],c_msg)
-            os.system(cmd)
-        
-    else:
-        print("Call Watch is off.")
-
-
 
 def fritzab2matrix(tam):
 
@@ -97,13 +63,13 @@ def fritzab2matrix(tam):
     ## Connect to the FritzBox in the LAN
     # We don't use tls because the self-signed cert of the box leads to a malfunction in urllib later on.
     fc = FritzConnection(address=env_ip, user=env_user, password=env_pass, use_tls=False)
-    at_least_one_new_message = False
+
 
 
     ## Get info about messages from the main answering machine
     message_list = fc.call_action("X_AVM-DE_TAM1", "GetMessageList", NewIndex=tam)
     message_list_url = message_list['NewURL']
-        
+
 
     l = get_message_list(message_list_url)
     if l['Root'] == None or l['Root']['Message'] == None:
@@ -129,7 +95,7 @@ def fritzab2matrix(tam):
         message_new = bool(int(a['New']))
     
         if message_new == True:
-            at_least_one_new_message = True
+
             # Download and convert the speex files to wav
             smb_url = build_download_url(a['Index'])
             speex_fd = download_speex_file(smb_url)
@@ -160,19 +126,19 @@ def fritzab2matrix(tam):
             # Show that message is already read
             print("__ " + msg_info)
 
-    tam_no = a['Called']
-    lastcall2matrix(tam,tam_no)
+            # ## For testing purposes only
+#            if a['Date'].endswith('20:53'):
+#                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__":
 
     

requirements.txt

@@ -1,4 +1,3 @@
-
 fritzconnection
 python-dotenv
 xmltodict
@@ -8,15 +7,12 @@ pydub
 # for matrix-commander
 
 aiohttp
-aiofiles #<0.5.0,>=0.4.0   
+aiofiles
 argparse
 asyncio
-atomicwrites
-cachetools
 datetime
 markdown
-matrix-nio # [e2e]>=0.18.3
-peewee
+matrix-nio
 Pillow
 python_magic
 uuid