projects
/
mw
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed copyright year
[mw]
/
src
/
mw
/
metadir.py
diff --git
a/src/mw/metadir.py
b/src/mw/metadir.py
index 3b7828dfb5194e4e7e0a79c779549231ec48d006..66641e9ba7a972e3e81f600729714a5b80a5bf8f 100644
(file)
--- a/
src/mw/metadir.py
+++ b/
src/mw/metadir.py
@@
-1,6
+1,6
@@
###
# mw - VCS-like nonsense for MediaWiki websites
###
# mw - VCS-like nonsense for MediaWiki websites
-# Copyright (C) 201
0 Ian Weller <ian@ianweller.org>
+# Copyright (C) 201
1 Ian Weller <ian@ianweller.org> and others
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-20,7
+20,6
@@
import bzrlib.diff
import codecs
import ConfigParser
import json
import codecs
import ConfigParser
import json
-import mw.api
import os
from StringIO import StringIO
import sys
import os
from StringIO import StringIO
import sys
@@
-62,7
+61,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') # XXX THIS API VERSION NOT LOCKED IN YET
+ 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()
@@
-78,16
+77,13
@@
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 clean_page(self, pagename):
def clean_page(self, pagename):
- filename =
mw.api.
pagename_to_filename(pagename) + '.wiki'
+ filename = pagename_to_filename(pagename) + '.wiki'
cur_content = codecs.open(filename, 'r', 'utf-8').read()
cur_content = codecs.open(filename, 'r', 'utf-8').read()
- if ( (len(cur_content) != 0) and (cur_content[-1] == '\n') ):
- cur_content = cur_content[:-1]
-
+ if len(cur_content) != 0 and cur_content[-1] == '\n':
+ cur_content = cur_content[:-1]
fd = file(filename, 'w')
fd = file(filename, 'w')
- fd.write(cur_content.encode('utf-8'))
+ fd.write(cur_content.encode('utf-8'))
fd.close()
def pagedict_add(self, pagename, pageid, currentrv):
fd.close()
def pagedict_add(self, pagename, pageid, currentrv):
@@
-160,7
+156,7
@@
class Metadir(object):
for full in check:
name = os.path.split(full)[1]
if name[-5:] == '.wiki':
for full in check:
name = os.path.split(full)[1]
if name[-5:] == '.wiki':
- pagename =
mw.api.
filename_to_pagename(name[:-5])
+ pagename = filename_to_pagename(name[:-5])
pageid = self.get_pageid_from_pagename(pagename)
if not pageid:
status[os.path.relpath(full, self.root)] = '?'
pageid = self.get_pageid_from_pagename(pagename)
if not pageid:
status[os.path.relpath(full, self.root)] = '?'
@@
-171,13
+167,15
@@
class Metadir(object):
if (len(cur_content) != 0) and (cur_content[-1] == '\n'):
cur_content = cur_content[:-1]
if cur_content != rv['content']:
if (len(cur_content) != 0) and (cur_content[-1] == '\n'):
cur_content = cur_content[:-1]
if cur_content != rv['content']:
- status[os.path.relpath(full, self.root)] = 'U'
+ status[os.path.relpath(full, self.root)] = 'M' # modified
+ else:
+ status[os.path.relpath(full, self.root)] = 'C' # clean
return status
def diff_rv_to_working(self, pagename, oldrvid=0, newrvid=0):
# oldrvid=0 means latest fetched revision
# newrvid=0 means working copy
return status
def diff_rv_to_working(self, pagename, oldrvid=0, newrvid=0):
# oldrvid=0 means latest fetched revision
# newrvid=0 means working copy
- filename =
mw.api.
pagename_to_filename(pagename) + '.wiki'
+ filename = pagename_to_filename(pagename) + '.wiki'
filename = filename.decode('utf-8')
pageid = self.get_pageid_from_pagename(pagename)
if not pageid:
filename = filename.decode('utf-8')
pageid = self.get_pageid_from_pagename(pagename)
if not pageid:
@@
-187,9
+185,11
@@
class Metadir(object):
oldrvid = self.pages_get_rv_list(pageid)[-1]
oldrv = self.pages_get_rv(pageid, oldrvid)
oldname = 'a/%s (revision %i)' % (filename, oldrvid)
oldrvid = self.pages_get_rv_list(pageid)[-1]
oldrv = self.pages_get_rv(pageid, oldrvid)
oldname = 'a/%s (revision %i)' % (filename, oldrvid)
- old = [i + '\n' for i in oldrv['content'].encode('utf-8').split('\n')]
+ old = [i + '\n' for i in \
+ oldrv['content'].encode('utf-8').split('\n')]
if newrvid == 0:
if newrvid == 0:
- cur_content = codecs.open(filename, 'r', 'utf-8').read().encode('utf-8')
+ cur_content = codecs.open(filename, 'r', 'utf-8').read()
+ cur_content = cur_content.encode('utf-8')
if (len(cur_content) != 0) and (cur_content[-1] == '\n'):
cur_content = cur_content[:-1]
newname = 'b/%s (working copy)' % filename
if (len(cur_content) != 0) and (cur_content[-1] == '\n'):
cur_content = cur_content[:-1]
newname = 'b/%s (working copy)' % filename
@@
-204,3
+204,15
@@
class Metadir(object):
if diff[-1] == '\n':
diff = diff[:-1]
return diff
if diff[-1] == '\n':
diff = diff[:-1]
return diff
+
+
+def pagename_to_filename(name):
+ name = name.replace(' ', '_')
+ name = name.replace('/', '!')
+ return name
+
+
+def filename_to_pagename(name):
+ name = name.replace('!', '/')
+ name = name.replace('_', ' ')
+ return name
Benjamin Mako Hill
||
Want to submit a patch?