@@ -65,7 +65,7 @@ class rss2twitter(): twitApi = twitter.Api() debug = False - def __init__(self, username, password, feeds=None, cacheDir = './', tag=True): + def __init__(self, username, password, feeds=None, cacheDir = './', tag="New %s post"): self.tag = tag self.feeds = feeds self.twitApi.SetCredentials(username, password) @@ -93,19 +93,16 @@ class rss2twitter(): if self.debug is True: print "processing %s" % feedUrl feed = feedparser.parse(feedUrl) - if(feed.feed.title): - feedtitle = feed.feed.title + feedtitle = feed.feed.title for e in feed.entries: if self.wasPublished(hashlib.sha1(feedUrl).hexdigest(), e) is not True: - if (self.tag == True and feedtitle): - txt = "New post from %s: " % feedtitle - elif (self.tag == False or self.tag == ""): + if (self.tag == False or self.tag == ""): txt = "" else: - if(self.tag.find('%') < 0 or not feedtitle): - txt = "%s:" % self.tag - else: + if(self.tag.find('%') > -1): txt = "%s:" % self.tag % feedtitle + else: + txt = "%s:" % self.tag if (e.title is not ""): txt = "%s %s:" % (txt, e.title) link = shorten(e.link) @@ -139,15 +136,15 @@ class rss2twitter(): if errno == 401: if self.debug: print "Rate limited, sleeping for 5 mins" - sleep(300) + time.sleep(300) elif errno == 502: if self.debug: print "Server upgrade, sleeping for 15 mins" - sleep(900) + time.sleep(900) elif errno == 503: if self.debug: print "Server busy, sleeping for 30 mins" - sleep(1800) + time.sleep(1800) else: raise twitter.TwitterError(err.info().items()[0][1]) else: rss2twit.py @@ -3,7 +3,7 @@ from rss2twit import rss2twitter # Two feeds, Default tag of "New post from FeedTitle" -#instance1 = rss2twitter('twitterID', 'twitterPassword', ['http://example.org/feed1.rss', 'http://example.org/feed2.rss'], tag=True) +#instance1 = rss2twitter('twitterID', 'twitterPassword', ['http://example.org/feed1.rss', 'http://example.org/feed2.rss']) #instance1.run(debug=True) #Run the first instance, debugging messages on. # One feed, tag disabled run.py e30f61e7fcd890bebc4fc7543dd597b6f727195a Andrew Kraut akraut@gmail.com http://github.com/opie4624/pyrss2twitter/commit/564783df8373d85f78ff1b88db3158d7c9f0c4fe 564783df8373d85f78ff1b88db3158d7c9f0c4fe 2008-08-31T18:25:55-07:00 2008-08-31T18:25:55-07:00 Fixed default tag information a6823f56b1161e3f95ea19b21244ac02a5e0a490 Andrew Kraut akraut@gmail.com