X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/8082a398adca9f9db9c38ca86aa6fb91151cbe52..c31798cbda2d783540acfab82452622bb5393ecd:/src/mw/metadir.py diff --git a/src/mw/metadir.py b/src/mw/metadir.py index 27e2fec..377e048 100644 --- a/src/mw/metadir.py +++ b/src/mw/metadir.py @@ -52,7 +52,7 @@ class Metadir(object): else: os.mkdir(self.location, 0755) # metadir versioning - fd = file(os.path.join(self.location, 'version')) + fd = file(os.path.join(self.location, 'version'), 'w') fd.write('1') fd.close() # create config @@ -79,14 +79,16 @@ class Metadir(object): fd.truncate() fd.close() - def pages_add_rev(self, pageid, rv): + def pages_add_rv(self, pageid, rv): pagefile = os.path.join(self.location, 'cache', 'pages', str(pageid)) fd = file(pagefile, 'w+') - pagedata = json.loads(fd.read()) + pagedata_raw = fd.read() + if pagedata_raw == '': + pagedata = {} + else: + pagedata = json.loads(pagedata_raw) rvid = int(rv['revid']) - if pageid not in pagedata.keys(): - pagedata[pageid] = {} - pagedata[pageid][rvid] = { + pagedata[rvid] = { 'user': rv['user'], 'timestamp': rv['timestamp'], 'content': rv['*'], }