From 4fa0bf4b0c3644078fb9b5c3e7f604f6f6e442d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 14 Jul 2019 10:10:26 +0200 Subject: New upstream version 2.0.5 --- mwc.py | 8 +++++--- mwctools.py | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mwc.py b/mwc.py index 6a48317..22a9dca 100755 --- a/mwc.py +++ b/mwc.py @@ -4,6 +4,8 @@ # Copyright: (2013-2017) Michael Till Beck # License: GPL-2.0+ +#test + import io from lxml import etree import hashlib @@ -78,7 +80,7 @@ def sendmail(receiver, subject, content, sendAsHtml, link, encoding=None): else: if link is not None: content = link + '\n\n' + content - mail = MIMEText(content, 'text', encoding) + mail = MIMEText(content, 'plain', encoding) mail['From'] = config.sender mail['To'] = receiver @@ -93,7 +95,7 @@ def sendmail(receiver, subject, content, sendAsHtml, link, encoding=None): if config.smtpusername is not None: mailsession.login(config.smtpusername, config.smtppwd) - mailsession.sendmail(config.sender, receiver.split(','), mail.as_string()) + mailsession.send_message(mail) # returns a list of all content that is stored locally for a specific site @@ -170,7 +172,7 @@ def pollWebsites(): sessionHashes.append(contenthash) changedContents.append(content) - subject = '[' + site['name'] + '] ' + content.title + subject = '[' + site['name'] + '] ' + ("Update available" if content.title is None else content.title) print(' ' + subject) if config.enableMailNotifications and len(fileHashes) > 0: sendAsHtml = (content.contenttype == 'html') diff --git a/mwctools.py b/mwctools.py index cefbbf0..1dca2e6 100755 --- a/mwctools.py +++ b/mwctools.py @@ -33,12 +33,13 @@ class Receiver(Parser): class Content: - def __init__(self, uri, encoding, title, content, contenttype): + def __init__(self, uri, encoding, title, content, contenttype, additional=None): self.uri = uri self.encoding = encoding self.title = title self.content = content self.contenttype = contenttype + self.additional = additional # returns a short subject line @@ -106,13 +107,13 @@ class CommandReceiver(Receiver): contentList = [] # run command and retrieve output - process = subprocess.Popen(self.command, stdout=subprocess.PIPE, shell=True, close_fds=True) + process = subprocess.Popen(self.command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, close_fds=True) thefile = process.stdout result = thefile.read().decode(self.encoding, errors='ignore') thefile.close() if process.wait() != 0: - raise Exception("process terminated with an error") + raise Exception("process terminated with an error: " + str(process.stderr) + "\n" + result) contentList.append(Content(uri=None, encoding=self.encoding, title=None, content=result, contenttype=self.contenttype)) return contentList -- cgit v1.2.3