Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/DocNow/diffengine into re…
Browse files Browse the repository at this point in the history
…quests.exceptions.MissingSchema
  • Loading branch information
ruebot committed Jan 16, 2017
2 parents 4d40d3f + f25a499 commit 547caa2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ NewsDiffs provides a comprehensive framework for watching changes on multiple
sites (Washington Post, New York Times, CNN, BBC, etc) but you need to be a
programmer to add a [parser
module](https://github.com/ecprice/newsdiffs/tree/master/parsers) for a website
that you want to monitor. It is also full on website which involves some
that you want to monitor. It is also a full-on website which involves some
commitment to install and run.

With the help of [feedparser] diffengine takes a different approach of working
With the help of [feedparser], diffengine takes a different approach by working
with any site that publishes an RSS feed of changes. This covers many news
organizations, but also personal blogs and organizational websites that put out
regular updates. And with the [readability] module diffengine is able to
regular updates. And with the [readability] module, diffengine is able to
automatically extract the primary content of pages, without requiring special
parsing to remove boilerplate material. And like NYTDiff, instead of creating
another website for people to watch diffengine pushes updates out to social
another website for people to watch, diffengine pushes updates out to social
media where people are already, while also building a local database of diffs
that can be used for research purposes.

Expand Down
6 changes: 3 additions & 3 deletions diffengine/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# maybe this module should be broken up into multiple files, or maybe not ...

UA = "diffengine/0.0.1 (+https://github.com/edsu/diffengine)"
UA = "diffengine/0.0.25 (+https://github.com/edsu/diffengine)"

import os
import re
Expand Down Expand Up @@ -64,11 +64,10 @@ def get_latest(self):
logging.info("found new entry: %s", e.link)
elif len(entry.feeds.where(Feed.url == self.url)) == 0:
FeedEntry.create(entry=entry, feed=self)
logging.info("found entry from another feed: %s", e.link)
logging.debug("found entry from another feed: %s", e.link)
except Exception as e:
logging.error("unable to feed feed: %s due to %s", self.url, e)


class Entry(BaseModel):
url = CharField()
created = DateTimeField(default=datetime.utcnow)
Expand Down Expand Up @@ -309,6 +308,7 @@ def setup_logging():
filename=path,
filemode="a"
)
logging.getLogger("readability.readability").setLevel(logging.WARNING)

def load_config(prompt=True):
global config
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

setup(
name="diffengine",
version="0.0.24",
version="0.0.25",
author="Ed Summers",
author_email="[email protected]",
packages=find_packages(exclude=['test_diffengine']),
Expand Down

0 comments on commit 547caa2

Please sign in to comment.