aboutsummaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCédric Bonhomme <kimble.mandel@gmail.com>2013-01-14 17:56:08 +0100
committerCédric Bonhomme <kimble.mandel@gmail.com>2013-01-14 17:56:08 +0100
commitdd68d444bca59b7349dbcdce6d8695614f0a72e7 (patch)
tree359be14be58c2444284d20b94835d4e9600f2a42 /source
parentUpdated README: contact link. (diff)
downloadnewspipe-dd68d444bca59b7349dbcdce6d8695614f0a72e7.tar.gz
newspipe-dd68d444bca59b7349dbcdce6d8695614f0a72e7.tar.bz2
newspipe-dd68d444bca59b7349dbcdce6d8695614f0a72e7.zip
The path of the feeds list is now set in pyAggr3g470r.cfg.
Diffstat (limited to 'source')
-rwxr-xr-xsource/cfg/pyAggr3g470r.cfg-sample1
-rw-r--r--source/conf.py1
-rwxr-xr-xsource/feedgetter.py6
-rwxr-xr-xsource/var/feed.lst1
4 files changed, 6 insertions, 3 deletions
diff --git a/source/cfg/pyAggr3g470r.cfg-sample b/source/cfg/pyAggr3g470r.cfg-sample
index 7300d7d5..a4ac86fb 100755
--- a/source/cfg/pyAggr3g470r.cfg-sample
+++ b/source/cfg/pyAggr3g470r.cfg-sample
@@ -12,3 +12,4 @@ username = your_mail_address@example.com
password = your_password
[misc]
diaspora_pod = joindiaspora.com
+feed_list = ./var/feed.lst
diff --git a/source/conf.py b/source/conf.py
index f5b5a054..e89f0090 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -50,3 +50,4 @@ username = config.get('mail','username')
password = config.get('mail','password')
DIASPORA_POD = config.get('misc', 'diaspora_pod')
+FEED_LIST = config.get('misc', 'feed_list') \ No newline at end of file
diff --git a/source/feedgetter.py b/source/feedgetter.py
index 93d57884..2fe85bb5 100755
--- a/source/feedgetter.py
+++ b/source/feedgetter.py
@@ -20,9 +20,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
__author__ = "Cedric Bonhomme"
-__version__ = "$Revision: 1.2 $"
+__version__ = "$Revision: 1.3 $"
__date__ = "$Date: 2010/09/02 $"
-__revision__ = "$Date: 2012/11/8 $"
+__revision__ = "$Date: 2013/01/14 $"
__copyright__ = "Copyright (c) Cedric Bonhomme"
__license__ = "GPLv3"
@@ -57,7 +57,7 @@ class FeedGetter(object):
"""
Parse the file 'feeds.lst' and launch a thread for each RSS feed.
"""
- with open("./var/feed.lst") as f:
+ with open(conf.FEED_LIST) as f:
for a_feed in f:
# test if the URL is well formed
for url_regexp in utils.url_finders:
diff --git a/source/var/feed.lst b/source/var/feed.lst
index 1662ed45..62bc988b 100755
--- a/source/var/feed.lst
+++ b/source/var/feed.lst
@@ -41,3 +41,4 @@ http://www.bortzmeyer.org/feed-full.atom
http://blog.cr0.org/feeds/posts/default
http://sysc.tl/feed/
http://planetKDE.org/rss20.xml
+http://www.brankovukelic.com/feeds/posts/default
bgstack15