Keep a version number in the state file, so we don't use state files

[rawdog/.git] / rawdoglib / rawdog.py

diff --git a/rawdoglib/rawdog.py b/rawdoglib/rawdog.py
index 9971ba85e65bffc9a2dc43ab76126f1d7c62108f..da5e7e48895af1a9d4d6f40897c34e1aca7ff7cf 100644 (file)
--- a/rawdoglib/rawdog.py
+++ b/rawdoglib/rawdog.py
@@ -19,6 +19,7 @@
 # MA 02111-1307 USA, or see http://www.gnu.org/.
 
 VERSION = "2.0rc1"
+STATE_VERSION = 2
 import feedparser
 from persister import Persistable, Persister
 import os, time, sha, getopt, sys, re, urlparse, cgi, socket, urllib2
@@ -548,6 +549,16 @@ class Rawdog(Persistable):
        def __init__(self):
                self.feeds = {}
                self.articles = {}
+               self.state_version = STATE_VERSION
+
+       def check_state_version(self):
+               """Check the version of the state file."""
+               try:
+                       version = self.state_version
+               except AttributeError:
+                       # rawdog 1.x didn't keep track of this.
+                       version = 1
+               return version == STATE_VERSION
 
        def list(self):
                for url in self.feeds.keys():
@@ -888,6 +899,12 @@ def main(argv):
                print "This usually means the file is corrupt, and removing it will fix the problem."
                return 1
 
+       if not rawdog.check_state_version():
+               print "The state file " + statedir + "/state was created by an older"
+               print "version of rawdog, and cannot be read by this version."
+               print "Removing the state file will fix it."
+               return 1
+
        for o, a in optlist:
                if o in ("-u", "--update"):
                        rawdog.update(config)