X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/a58c94092d906cad0611dda3b0fc2b18501b0299..ac7e90d463ab412375247a74083fe8f7385729b5:/src/mw/metadir.py

diff --git a/src/mw/metadir.py b/src/mw/metadir.py
index 22b9c5c..66648e7 100644
--- a/src/mw/metadir.py
+++ b/src/mw/metadir.py
@@ -46,45 +46,75 @@ class Metadir(object):
 
     def create(self, api_url):
         # create the directory
-        try:
-            os.mkdir(self.location, 0755)
-        except OSError, e:
+        if os.path.isdir(self.location):
             print '%s: you are already in a mw repo' % self.me
             sys.exit(1)
+        else:
+            os.mkdir(self.location, 0755)
+        # metadir versioning
+        fd = file(os.path.join(self.location, 'version'), 'w')
+        fd.write('1')
+        fd.close()
         # create config
         self.config = ConfigParser.RawConfigParser()
         self.config.add_section('remote')
         self.config.set('remote', 'api_url', api_url)
         with open(self.config_loc, 'wb') as config_file:
             self.config.write(config_file)
-        # create cache
+        # create cache/
         os.mkdir(os.path.join(self.location, 'cache'))
-        # create cache/page
-        fd = file(os.path.join(self.location, 'cache', 'page'), 'w')
-        fd.write(json.dumps({}))
-        # create cache/rv
-        fd = file(os.path.join(self.location, 'cache', 'rv'), 'w')
+        # 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):
+        fd = file(os.path.join(self.location, 'cache', 'pagedict'), 'r+')
+        pagedict = json.loads(fd.read())
+        pagedict[pagename] = int(pageid)
+        fd.seek(0)
+        fd.write(json.dumps(pagedict))
+        fd.truncate()
+        fd.close()
 
-    def add_page_info(self, pageid, pagename, rvids):
-        lulz = file(os.path.join(self.location, 'cache', 'page'), 'r')
-        conf = json.loads(lulz.read())
-        conf[pageid] = {'name': pagename, 'rv': rvids}
-        fd = file(os.path.join(self.location, 'cache', 'page'), 'w')
-        fd.write(json.dumps(conf))
+    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 add_rv_info(self, rv):
-        lulz = file(os.path.join(self.location, 'cache', 'rv'), 'r')
-        conf = json.loads(lulz.read())
+    def pages_add_rv(self, pageid, rv):
+        pagefile = os.path.join(self.location, 'cache', 'pages', str(pageid))
+        fd = file(pagefile, 'w+')
+        pagedata_raw = fd.read()
+        if pagedata_raw == '':
+            pagedata = {}
+        else:
+            pagedata = json.loads(pagedata_raw)
         rvid = int(rv['revid'])
-        conf[rvid] = {
+        pagedata[rvid] = {
                 'user': rv['user'], 'timestamp': rv['timestamp'],
-                'content': rv['*']
+                'content': rv['*'],
         }
-        conf[rvid]['minor'] = 'minor' in rv
-        if 'comment' in rv:
-            conf[rvid]['comment'] = rv['comment']
-        else:
-            conf[rvid]['comment'] = None
-        fd = file(os.path.join(self.location, 'cache', 'rv'), 'w')
-        fd.write(json.dumps(conf))
+        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))
+        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))
+        fd = file(pagefile, 'r')
+        pagedata = json.loads(fd.read())
+        return pagedata[str(rvid)]