Added an envdot variable FRITZ_TAM which takes a string with a json formated dictionary of the tam index as key and a matrix room id as value. The script for-loops now every TAM of the dictionary and posts message into the certain rooms. Also added a .env.sample file.

README.md

@@ -3,8 +3,7 @@
 __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
@@ -24,12 +23,11 @@ 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="fritzab2matrix"
-FRITZ_PASSWORD="S0meSecretPa5sw02d"
+FRITZ_USERNAME="fritzab"
+FRITZ_PASSWORD="SomeRand0mPa55word"
 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__
 
@@ -56,8 +54,6 @@ 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

fritzab2matrix.py

@@ -33,9 +33,25 @@ 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=0):
+    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
@@ -54,23 +70,6 @@ def get_message_list(url):
             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

tests/context.py

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

tests/test_fritzab2matrix.py

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