Changeset 6 in feed2telegram for trunk

Timestamp:

07/30/17 12:28:35 (7 years ago)

Author:

cheese

Message:

#1 callback is called for only new entries

Location:

trunk

Files:

• feed2telegram.py (modified) (5 diffs)
• implements/hikarinoakariost_feeder.py (modified) (1 diff)

trunk/feed2telegram.py

@@ -1 +1 @@
 #-*- coding: utf-8 -*-
+import datetime
+import email
 import json
 import os
 import sys
 import threading
+import time
 import traceback
 import urlparse
@@ -33 +36 @@
             header = {
                 'accept': 'application/x-www-form-urlencoded',
-                'agent': ('Mozilla/5.0 (Windows NT 10.0; Win64; x64) '
-                          'AppleWebKit/537.36 (KHTML, like Gecko) '
-                          'Chrome/59.0.3071.115 Safari/537.36'),
             }
             return header
@@ -114 +114 @@
         return self.feed
 
+class Datetime:
+    def __init__(self):
+        self.datetime = None
+
+    def setRfc2822(self, value):
+        parsed = email.utils.parsedate(value)
+        self.datetime = datetime.datetime(*parsed[:6])
+        return self
+
+    def toTimestamp(self):
+        timetuple = self.datetime.timetuple()
+        return time.mktime(timetuple)
+
 class Feed2Telegram:
     def __init__(self,
                  feed_url,              # required
                  telegram_token,        # required
-                 callback_get_iterator, # required, method returns iterable object from dictionary parsed by feedparser, prototype: def get_iterator(feed)
-                 callback_get_message,  # required, method returns a message to send with an object of iterable object , prototype: def get_data(obj)
+                 callback_get_message,  # required
+                 callback_get_entries=lambda entries: entries,
                  check_interval=60*60,
+                 new_entries_only=False,
                  send_error=True,
                  continue_on_error=False,
@@ -130 +144 @@
         self.telegram = Telegram(self.token)
 
-        self.get_iterator = callback_get_iterator
-        self.get_message  = callback_get_message
-
+        self.get_message = callback_get_message
+        self.get_entries = callback_get_entries
+
+        self.new_entries_only = new_entries_only
         self.send_error = send_error
         self.continue_on_error = continue_on_error
@@ -141 +156 @@
 
         self.stop_event = threading.Event()
+        self.last_modified = None
+
+    def isSendingEntry(self, entry):
+        if self.new_entries_only and self.last_modified:
+            published = Datetime().setRfc2822(entry.published).toTimestamp()
+            last      = Datetime().setRfc2822(self.last_modified).toTimestamp()
+
+            if published > last:
+                return True
+
+        return False
 
     def run(self):
         while not self.stop_event.is_set():
             try:
+                self.last_modified = self.feed.modified
                 feed = self.feed.get()
 
-                for obj in self.get_iterator(feed):
+                for entry in self.get_entries(feed.entries):
                     if self.stop_event.is_set():
                         break
 
-                    message = self.get_message(obj)
+                    if not self.isSendingEntry(entry):
+                        continue
+
+                    message = self.get_message(entry)
                     self.telegram.sendMessage(message)
 
-                else:
-                    self.feed.save()
+                self.feed.save()
 
             except:

trunk/implements/hikarinoakariost_feeder.py

@@ -7 +7 @@
 Feed2Telegram(url,
               token,
-              lambda feed : reversed(feed.entries),
-              lambda entry: entry['link'],
-              continue_on_error=True
+              lambda entry  : entry['link'],
+              lambda entries: reversed(entries),
+              new_entries_only=True,
+              continue_on_error=True,
              ).start()