From e987dda3cae5d7cfe2403b98a565d7c028f19651 Mon Sep 17 00:00:00 2001 From: Ronald Schaten Date: Wed, 17 Apr 2013 20:59:50 +0200 Subject: [PATCH] no enclosures in text for daily digests --- atomstrom.py | 6 +++--- models/entry.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/atomstrom.py b/atomstrom.py index c5074d9..953302b 100755 --- a/atomstrom.py +++ b/atomstrom.py @@ -51,7 +51,7 @@ def mail_daily_digest(session, sender, receiver, prefix): link = entry.link if entry.resolvedlink: link = entry.resolvedlink - text = truncate_text(entry.get_text(), 250) + text = truncate_text(entry.get_text(enclosures=False), 250) text = textwrap.fill(text, width=78) try: body += '=> %s - %s\n' % (entry.firstfetched.strftime('%Y-%m-%dT%H:%M'), feedinfo.title) @@ -70,8 +70,8 @@ def mail_daily_digest(session, sender, receiver, prefix): if prefix != '': subject = '%s %s' % (prefix, subject) send_mail(sender, receiver, subject, body) - for feed, feedinfo, entry in entries: - entry.sent = datetime.now() + #for feed, feedinfo, entry in entries: + # entry.sent = datetime.now() else: print 'no unmailed digest-entries found... not sending mail.' diff --git a/models/entry.py b/models/entry.py index f8ef0dd..b6ac4b4 100644 --- a/models/entry.py +++ b/models/entry.py @@ -130,7 +130,7 @@ class Entry(Base): def __repr__(self): return "" % (self.id, self.title) - def get_text(self): + def get_text(self, enclosures=True): text = '' if self.feed.contentcolumn == 'summary' and self.summary: text = self.summary @@ -140,7 +140,7 @@ class Entry(Base): text = self.fullpage elif self.feed.contentcolumn == 'readability' and self.readability: text = self.readability - if self.enclosures: + if self.enclosures and enclosures: text += '\n\nEnclosures:\n%s' % self.enclosures return text