From 134e966ed960b45cd538e39f234fb3dc14915bfc Mon Sep 17 00:00:00 2001 From: Homer S Date: Thu, 8 Jul 2021 00:03:48 +0200 Subject: [PATCH 1/4] Minor markdown correction --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1ed0803..7494173 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ __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) ## Installation If you like to test this repository you are recommended to use one of the following two options. ### Necessary preparations for both cases @@ -67,4 +67,4 @@ Especially to * https://github.com/jiaaro/pydub/ * https://git.savannah.nongnu.org/cgit/fbvbconv-py.git/ - + \ No newline at end of file From 002858c7cc8ceb24fdf93cdadb4926e8d5acb5ec Mon Sep 17 00:00:00 2001 From: Homer S Date: Thu, 8 Jul 2021 22:50:30 +0200 Subject: [PATCH 2/4] Erroneously had functions twice in code after merge and deleted them. --- fritzab2matrix.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/fritzab2matrix.py b/fritzab2matrix.py index 2f1d8ae..f16881d 100755 --- a/fritzab2matrix.py +++ b/fritzab2matrix.py @@ -71,27 +71,6 @@ def fritzab2matrix(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: return False From 2462cba3c4381470a900436f7fea5674d2c4c3b6 Mon Sep 17 00:00:00 2001 From: Homer S Date: Sat, 10 Jul 2021 09:08:58 +0200 Subject: [PATCH 3/4] Changed base image to alpine:latest. --- docker/Dockerfile | 22 +++++----------------- docker/docker-compose.yml | 2 +- requirements.txt | 4 ++-- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4989b6a..88cf2f2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,9 @@ # syntax=docker/dockerfile:1 -FROM ubuntu:latest +FROM alpine:latest ENV TZ=Europe/Berlin +ENV UNBUFFERED=1 WORKDIR /app VOLUME /app @@ -10,23 +11,10 @@ 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; \ + /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 libffi-dev openssl-dev cargo;' -ENTRYPOINT ["./fritzab2matrix.py "] - - - - - - - - - - - - - - +ENTRYPOINT ["python3", "-u", "fritzab2matrix.py "] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 7c963f5..49e9071 100644 --- a/docker/docker-compose.yml +++ b/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 diff --git a/requirements.txt b/requirements.txt index aed142a..8cdb0c7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,12 +7,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 From 7e2ef5822d00f08ce8ba71ac3f1fa961eddebf72 Mon Sep 17 00:00:00 2001 From: Homer S Date: Sat, 10 Jul 2021 10:22:04 +0200 Subject: [PATCH 4/4] Uncommented deletion of not longer needed packages from docker image. --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 88cf2f2..1091952 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,8 +12,8 @@ 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-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 libffi-dev openssl-dev cargo;' + pip install update pip && pip install -r requirements.txt ; \ + apk del zlib-dev jpeg-dev gcc musl-dev python3-dev libffi-dev openssl-dev cargo;'