X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/5c5537b6b5793b41b21191174f9ea30c360486ab..2c860f8d2f73c9d7322953b40b28927cef0187b9:/src/mw/metadir.py

diff --git a/src/mw/metadir.py b/src/mw/metadir.py
index e6d2bc8..e09c840 100644
--- a/src/mw/metadir.py
+++ b/src/mw/metadir.py
@@ -20,9 +20,10 @@ import ConfigParser
 import json
 import os
 import sys
-import time
+
 
 class Metadir(object):
+
     def __init__(self):
         self.me = os.path.basename(sys.argv[0])
         root = os.getcwd()
@@ -30,7 +31,7 @@ class Metadir(object):
             if '.mw' in os.listdir(root):
                 self.root = root
                 break
-            (head, tail) = os.path.split(root)
+            head = os.path.split(root)[0]
             if head == root:
                 self.root = os.getcwd()
                 break
@@ -52,8 +53,9 @@ class Metadir(object):
         else:
             os.mkdir(self.location, 0755)
         # metadir versioning
-        fd = file(os.path.join(self.location, 'version'))
-        fd.write('1')
+        fd = file(os.path.join(self.location, 'version'), 'w')
+        fd.write('1') # XXX THIS API VERSION NOT LOCKED IN YET
+        fd.close()
         # create config
         self.config = ConfigParser.RawConfigParser()
         self.config.add_section('remote')
@@ -65,28 +67,57 @@ class Metadir(object):
         # create cache/pagedict
         fd = file(os.path.join(self.location, 'cache', 'pagedict'), 'w')
         fd.write(json.dumps({}))
+        fd.close()
         # create cache/pages/
         os.mkdir(os.path.join(self.location, 'cache', 'pages'), 0755)
 
-    def pagedict_add(self, pagename, pageid):
+    def pagedict_add(self, pagename, pageid, currentrv):
         fd = file(os.path.join(self.location, 'cache', 'pagedict'), 'r+')
         pagedict = json.loads(fd.read())
-        pagedict[pagename] = int(pageid)
+        pagedict[pagename] = {'id': int(pageid), 'currentrv': int(currentrv)}
         fd.seek(0)
         fd.write(json.dumps(pagedict))
         fd.truncate()
+        fd.close()
+
+    def get_pageid_from_pagename(self, pagename):
+        fd = file(os.path.join(self.location, 'cache', 'pagedict'), 'r')
+        pagedict = json.loads(fd.read())
+        if pagename in pagedict.keys():
+            return pagedict[pagename]
+        else:
+            return None
 
-    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['*'],
         }
         fd.seek(0)
         fd.write(json.dumps(pagedata))
         fd.truncate()
+        fd.close()
+
+    def pages_get_rv_list(self, pageid):
+        pagefile = os.path.join(self.location, 'cache', 'pages',
+                                str(pageid['id']))
+        fd = file(pagefile, 'r')
+        pagedata = json.loads(fd.read())
+        rvs = [int(x) for x in pagedata.keys()]
+        rvs.sort()
+        return rvs
+
+    def pages_get_rv(self, pageid, rvid):
+        pagefile = os.path.join(self.location, 'cache', 'pages',
+                                str(pageid['id']))
+        fd = file(pagefile, 'r')
+        pagedata = json.loads(fd.read())
+        return pagedata[str(rvid)]