From: Adam Sampson <ats@offog.org>
Date: Sat, 20 Sep 2003 19:07:38 +0000 (+0000)
Subject: Add "statefile" option.
X-Git-Tag: v1.3~5
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=02f05bc68fc8542081ddb3d229d5a12d0998c488;p=rawdog%2F.git

Add "statefile" option.
---

diff --git a/NEWS b/NEWS
index f7fd7aa..7c21e26 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,8 @@ Added --show-template option to show the template currently in use (so
 you can customise it yourself), and "template" config option to allow
 the user to specify their own template.
 
+Added "statefile" config option to allow use of multiple state files.
+
 - rawdog 1.2
 
 Updated feedparser to 2.5.2, which fixes a bug that was making rawdog
diff --git a/config b/config
index 311a1d4..446fc51 100644
--- a/config
+++ b/config
@@ -1,5 +1,7 @@
 # Sample rawdog config file. Copy this into your ~/.rawdog/ directory, and edit
 # it to suit your preferences.
+# All paths in this file should be either absolute, or relative to your .rawdog
+# directory.
 
 # The maximum number of articles to show on the generated page.
 maxarticles 200
@@ -12,6 +14,11 @@ dayformat %A, %d %B
 # a 12-hour clock.
 timeformat %H:%M
 
+# The file that rawdog will store its internal state in. Most users
+# won't need to change this; it's only useful if you want to have
+# multiple sets of feeds.
+statefile state
+
 # The template file to use, or "default" to use the built-in template
 # (which is probably sufficient for most users). Use "rawdog -t" to show
 # the template currently in use as a starting-point for customisation.
diff --git a/rawdoglib/rawdog.py b/rawdoglib/rawdog.py
index 6617ec1..c21b636 100644
--- a/rawdoglib/rawdog.py
+++ b/rawdoglib/rawdog.py
@@ -253,6 +253,7 @@ class Config:
 			"showfeeds" : 1,
 			"timeout" : 30,
 			"template" : "default",
+			"statefile" : "state",
 			}
 
 	def __getitem__(self, key): return self.config[key]
@@ -300,6 +301,8 @@ class Config:
 			self["timeout"] = int(l[1])
 		elif l[0] == "template":
 			self["template"] = l[1]
+		elif l[0] == "statefile":
+			self["statefile"] = l[1]
 		else:
 			raise ConfigError("Unknown config command: " + l[0])
 
@@ -551,7 +554,7 @@ def main(argv):
 		print >>sys.stderr, err
 		return 1
 
-	persister = Persister("state", Rawdog)	
+	persister = Persister(config["statefile"], Rawdog)	
 	rawdog = persister.load()
 
 	for o, a in optlist: