projects
/
mw
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle storing of revision ID in metadir functions
[mw]
/
src
/
mw
/
metadir.py
diff --git
a/src/mw/metadir.py
b/src/mw/metadir.py
index 66648e73eda9f0b7e398b705ff883ff711940a7b..e09c840276cf45bdb9a5fe6a5f693716f8606b69 100644
(file)
--- a/
src/mw/metadir.py
+++ b/
src/mw/metadir.py
@@
-20,9
+20,10
@@
import ConfigParser
import json
import os
import sys
import json
import os
import sys
-import time
+
class Metadir(object):
class Metadir(object):
+
def __init__(self):
self.me = os.path.basename(sys.argv[0])
root = os.getcwd()
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
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
if head == root:
self.root = os.getcwd()
break
@@
-53,7
+54,7
@@
class Metadir(object):
os.mkdir(self.location, 0755)
# metadir versioning
fd = file(os.path.join(self.location, 'version'), 'w')
os.mkdir(self.location, 0755)
# metadir versioning
fd = file(os.path.join(self.location, 'version'), 'w')
- fd.write('1')
+ fd.write('1')
# XXX THIS API VERSION NOT LOCKED IN YET
fd.close()
# create config
self.config = ConfigParser.RawConfigParser()
fd.close()
# create config
self.config = ConfigParser.RawConfigParser()
@@
-70,10
+71,10
@@
class Metadir(object):
# create cache/pages/
os.mkdir(os.path.join(self.location, 'cache', 'pages'), 0755)
# 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())
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.seek(0)
fd.write(json.dumps(pagedict))
fd.truncate()
@@
-106,7
+107,8
@@
class Metadir(object):
fd.close()
def pages_get_rv_list(self, pageid):
fd.close()
def pages_get_rv_list(self, pageid):
- pagefile = os.path.join(self.location, 'cache', 'pages', str(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()]
fd = file(pagefile, 'r')
pagedata = json.loads(fd.read())
rvs = [int(x) for x in pagedata.keys()]
@@
-114,7
+116,8
@@
class Metadir(object):
return rvs
def pages_get_rv(self, pageid, rvid):
return rvs
def pages_get_rv(self, pageid, rvid):
- pagefile = os.path.join(self.location, 'cache', 'pages', str(pageid))
+ pagefile = os.path.join(self.location, 'cache', 'pages',
+ str(pageid['id']))
fd = file(pagefile, 'r')
pagedata = json.loads(fd.read())
return pagedata[str(rvid)]
fd = file(pagefile, 'r')
pagedata = json.loads(fd.read())
return pagedata[str(rvid)]
Benjamin Mako Hill
||
Want to submit a patch?