rschaten/Atomstrom
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

implemented fetch-frequency for feeds

Browse Source
This commit is contained in:
Ronald Schaten 2013-03-19 21:18:38 +01:00
parent bc1b0655e0
commit 3333d1fcaf
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
atomstrom.py
View File

@ -3,7 +3,7 @@
from sqlalchemy import create_engine, Table, Column, Integer, Text, Boolean, DateTime, MetaData, ForeignKey, desc from sqlalchemy import create_engine, Table, Column, Integer, Text, Boolean, DateTime, MetaData, ForeignKey, desc
from sqlalchemy.orm import sessionmaker, relation, backref from sqlalchemy.orm import sessionmaker, relation, backref
from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.ext.declarative import declarative_base
from datetime import datetime from datetime import datetime, timedelta
from time import mktime from time import mktime
import feedparser import feedparser
import re import re
@ -12,6 +12,7 @@ import urllib
import hn import hn
import html2text import html2text
import ConfigParser import ConfigParser
import pprint
import smtplib import smtplib
from email.mime.text import MIMEText from email.mime.text import MIMEText
from optparse import OptionParser from optparse import OptionParser
@ -23,6 +24,7 @@ class Feed(Base):
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
url = Column(Text) url = Column(Text)
frequency = Column(Integer)
daily = Column(Boolean) daily = Column(Boolean)
readability = Column(Boolean) readability = Column(Boolean)
fullpage = Column(Boolean) fullpage = Column(Boolean)
@ -225,17 +227,27 @@ def process_feed_entry(session, feed, entry):
return 1 return 1
def fetch_single_feed(session, feed): def fetch_single_feed(session, feed):
print 'fetching %s' % feed.url print 'processing %s' % feed.url
parser = feedparser.parse(feed.url)
print 'processing feed info...'
query = session.query(Feedinfo).filter(Feedinfo.feed_id==feed.id) query = session.query(Feedinfo).filter(Feedinfo.feed_id==feed.id)
fetched = False
try: try:
feed.feedinfo = query.one() feed.feedinfo = query.one()
nextfetch = (feed.feedinfo.lastfetched + timedelta(minutes=feed.frequency))
if datetime.now() > nextfetch:
print 'fetching...'
parser = feedparser.parse(feed.url)
fetched = True
feed.feedinfo.update(parser) feed.feedinfo.update(parser)
else:
print 'not fetching before: %s' % nextfetch
except Exception, e: except Exception, e:
print 'this feed seems to be new' print 'this feed seems to be new'
print 'fetching...'
parser = feedparser.parse(feed.url)
fetched = True
feed.feedinfo = Feedinfo(parser) feed.feedinfo = Feedinfo(parser)
if fetched:
print 'processing feed entries:' print 'processing feed entries:'
entries_new = 0 entries_new = 0
entries_total = 0 entries_total = 0