Reduced image size furtherly. Now 329MB and based on python:alpine.

Reviewed-on: #10

README.md

@@ -3,7 +3,8 @@
 __FritzAB2Matrix__ reads out the answering machine (_TAM_) of a _Fritz!Box_ in your LAN and posts the messages into a private chat in the __matrix__ network. While you could let your _Fritz!Box_ send the messages by mail - unencrypted of course - the matrix chat is __e2e encrypted__. Which kindly acknowledges the privacy of any caller that leaves a message for you.
 
 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)
 ## Installation
 If you like to test this repository you are recommended to use one of the following two options.
 ### Necessary preparations for both cases
@@ -23,11 +24,12 @@ If you like to test this repository you are recommended to use one of the follow
  * Inside the repo run `pip install --upgrade pip && pip install -r requirements.txt`
  * Create an `.env` file with your favourite editor:
  ```
-FRITZ_USERNAME="fritzab"
+FRITZ_USERNAME="fritzab2matrix"
-FRITZ_PASSWORD="SomeRand0mPa55word"
+FRITZ_PASSWORD="S0meSecretPa5sw02d"
 FRITZ_IP="192.168.178.1" 
-FRITZ_VOICEBOX_PATH="fritz.nas/FRITZ/voicebox"
 FRITZ_TMP="/tmp" 
+# FRITZ_VOICEBOX_PATH="fritz.nas/FRITZ/voicebox" 
+FRITZ_TAM='{"0" : "!roomhash1:matrix.org", "1" : "!roomhash2:matrix.org"}' 
  ```
 __.env__
 
@@ -54,6 +56,8 @@ Provided you have docker and docker-compose installed on your system:
    * Follow the appearing dialog and input your matrix account data.
  * After all that the running docker container should watch your box and your TAM messages should be posted in the chosen matrix chat.
  
+ 
+   
 ### Special Thx
 Gratitude to all people that enabled that project by their passionate work and will to share it!
 Especially to

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,18 @@ 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 "]
+    zlib-dev \
-
+    jpeg-dev ; \
-
+    apk add --no-cache ffmpeg speex; \
-
+    pip install --no-cache-dir upgrade pip; \
-
+    pip install --no-cache-dir -r requirements.txt ; \
-
+    apk del --no-cache .build-deps;
-
-
-
-
-
-
 
 
 
+ENTRYPOINT ["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

@@ -33,25 +33,9 @@ print(env_tam)
 if env_tmp is None:
     env_tmp = "/tmp"
 
-def fritzab2matrix(tam):
-    ###
-    ### CHECK AND GET MESSAGES FROM FRITZBOX ###
-    ############################################
-
-    ## 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)
-
-
-
-    ## 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']
-
-
 
     # Build the url to download the message via smb
-    def build_download_url(mid, tam=tam):
+def build_download_url(mid, tam=0):
     recording = "rec." + str(tam) + r"." + str(mid).zfill(3)
     url = os.path.join("//",env_ip,env_voicebox,"rec",recording)
     return url
@@ -70,6 +54,23 @@ def fritzab2matrix(tam):
         messages = xmltodict.parse(doc)
         return messages
 
+
+def fritzab2matrix(tam):
+
+    ### CHECK AND GET MESSAGES FROM FRITZBOX ###
+    ############################################
+
+    ## 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)
+
+
+
+    ## 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:
         return False

requirements.txt

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

tests/context.py

@@ -0,0 +1,5 @@
+import os
+import sys
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+
+import fritzab2matrix

tests/test_fritzab2matrix.py

@@ -0,0 +1,5 @@
+from context import fritzab2matrix as fab2m
+
+
+
+