From f44adaf6f172681caca78a9040135816f5491ecd Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 1 May 2021 10:28:31 +0200 Subject: [PATCH] [fix] Watch the mmsd folder instead of a test folder --- mms2mail | 9 +++------ mms2mail.ini | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/mms2mail b/mms2mail index 7dd5b6a..bb0e838 100755 --- a/mms2mail +++ b/mms2mail @@ -23,7 +23,6 @@ from messaging.mms.message import MMSMessage from marrow.mailer import Mailer, Message class Watcher: - DIRECTORY_TO_WATCH = "/home/alex/tmp" mms_folder = f"{Path.home()}/.mms/modemmanager" def __init__(self): @@ -31,7 +30,7 @@ class Watcher: def run(self): event_handler = Handler() - self.observer.schedule(event_handler, self.DIRECTORY_TO_WATCH, recursive=False) + self.observer.schedule(event_handler, self.mms_folder, recursive=False) self.observer.start() try: while True: @@ -62,12 +61,9 @@ class MMS2Mail: self.config = configparser.ConfigParser() self.config.read(f"{Path.home()}/.mms/modemmanager/mms2mail.ini") self.mailer = Mailer({'manager.use': 'immediate', 'transport.use': 'mbox', 'transport.file': self.config.get('mail','mailbox', fallback=f"/var/mail/{getpass.getuser()}")}) - self.mailer.start() - - def __del__(self): - self.mailer.stop() def convert(self, path): + self.mailer.start() status = configparser.ConfigParser() status.read_file(open(f"{path}.status")) if 'downloaded' in status['info']['state'] or 'received' in status['info']['state']: @@ -96,6 +92,7 @@ class MMS2Mail: filename = datacontent[1]['Name'] message.attach(filename,data_part.data) self.mailer.send(message) + self.mailer.stop() if __name__ == '__main__': parser = argparse.ArgumentParser() diff --git a/mms2mail.ini b/mms2mail.ini index 1927640..4ec222e 100644 --- a/mms2mail.ini +++ b/mms2mail.ini @@ -1,5 +1,5 @@ [mail] mailbox = /var/mail/mobian account = mobian -domain = "mobian.lan" +domain = mobian.lan attach_mms = false