Conditional clauses: Only start script on incoming calls.

Reviewed-on: #10

README.md

@@ -4,7 +4,8 @@ __FritzAB2Matrix__ reads out the answering machine (_TAM_) of a _Fritz!Box_ in y
 
 Uses the python based cmd-line-tool [matrix-commander](https://github.com/8go/matrix-commander) so the matrix-commander.py in this repo is just a copy of that file to ease testing.
 ## Features
- * Since _v0.1.1_ __Multitam__ is integrated so that you can check multiple answering machines __and__ post the messages to different matrix rooms. (Use FRITZ\_TAM_ variable in .env file)
+ * Since _v0.1.1_ __Multitam__ is integrated so that you can check multiple answering machines __and__ post the messages to different matrix rooms. (Use _FRITZ\_TAM_ variable in .env file)
+ * Set _FRITZ\_CALL\_WATCH_=True if you want to receive a message everytime you miss a call.
 ## Installation
 If you like to test this repository you are recommended to use one of the following two options.
 ### Necessary preparations for both cases
@@ -30,6 +31,7 @@ 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
  ```
 __.env__
 

docker/Dockerfile

@@ -1,8 +1,9 @@
 # syntax=docker/dockerfile:1
 
-FROM ubuntu:latest
+FROM python:alpine
 
 ENV TZ=Europe/Berlin
+ENV UNBUFFERED=1
 
 WORKDIR /app
 VOLUME /app
@@ -10,23 +11,20 @@ VOLUME /app
 COPY . .
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone; \
-    /bin/bash -c 'apt update && apt install -y libolm-dev python3-pip ffmpeg htop; \
+    apk --no-cache update && apk add --no-cache  --virtual .build-deps \
-    pip install update pip && pip install -r requirements.txt ;'
+    gcc \
-
+    cargo \
-
+    libffi-dev \
-
+    openssl-dev \
-ENTRYPOINT ["./fritzab2matrix.py "]
+    olm-dev \
-
+    zlib-dev \
-
+    jpeg-dev ; \
-
+    apk add --no-cache olm libmagic ffmpeg speex; \
-
+    pip install pip -U --no-cache-dir; \
-
+    pip install --no-cache-dir -r requirements.txt ; \
-
+    apk del --no-cache .build-deps;
-
-
-
-
-
 
 
 
+# ENTRYPOINT ["python3", "-u", "fritzab2matrix.py"]
+ENTRYPOINT /bin/sh -c "export UNBUFFERED=1 && python3 -u ./fritzab2matrix.py"

docker/docker-compose.yml

@@ -7,7 +7,7 @@ services:
       context: ../.
       dockerfile: ./docker/Dockerfile
     working_dir: /app
-    entrypoint: ./fritzab2matrix.py
+#    entrypoint: /bin/sh -c "export UNBUFFERED=1 && python3 -u ./fritzab2matrix.py"
     volumes:
       - ../.:/app
 

fritzab2matrix.py

@@ -70,13 +70,20 @@ def get_last_call():
     except:
         print("Couldn't connect to Box")
     missed_calls = fc.get_missed_calls(False,1,1)
-    return missed_calls[0]
+    
+    if len(missed_calls) > 0:
+        return missed_calls[0]
+    else:
+        return False
 
 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)
+        if c:
+            c_msg = "{} - {} ({})".format(c.Date, c.Caller, c.Name)
+        else:
+            return False
         
         # ... and send message and file to Matrix Room
         ## if Number of a TAM and the last call match

libs/monitoring/__init__.py

@@ -15,10 +15,17 @@ def watch_disconnect(monitor, event_queue, func, tams, healthcheck_interval=10):
         else:
             # do event processing here:
             print(event)
-            if 'DISCONNECT' in event:
+            if 'DISCONNECT;0' in event:
-                print("Anruf beendet. Jetzt den AB checken.\n")
+                print("Incoming call stopped. Check the TAM.\n")
                 func(tams)
 
+            elif 'DISCONNECT;1' in event:
+                print("Outgoing call stopped. Do nothing.\n")
+
+            else:
+                print("Unknown event.\n")
+
+
 
 
 def endedCall(func, tams, fritz_ip='192.168.1.1'):

requirements.txt

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