X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/0b6046450eddcd6c63c7edb7d20c8f7b6b48f64b..29ba1dd35ffcafe1cbd2842fbca15f2ad30238ff:/src/mw/metadir.py?ds=sidebyside diff --git a/src/mw/metadir.py b/src/mw/metadir.py index 18811db..4bf8c42 100644 --- a/src/mw/metadir.py +++ b/src/mw/metadir.py @@ -49,6 +49,10 @@ class Metadir(object): else: self.config = None + def save_config(self): + with open(self.config_loc, 'wb') as config_file: + self.config.write(config_file) + def create(self, api_url): # create the directory if os.path.isdir(self.location): @@ -64,8 +68,7 @@ class Metadir(object): 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) + self.save_config() # create cache/ os.mkdir(os.path.join(self.location, 'cache')) # create cache/pagedict @@ -102,7 +105,8 @@ class Metadir(object): pagedata = json.loads(pagedata_raw) rvid = int(rv['revid']) pagedata[rvid] = { - 'user': rv['user'], 'timestamp': rv['timestamp'] + 'user': rv['user'], + 'timestamp': rv['timestamp'], } if '*' in rv.keys(): pagedata[rvid]['content'] = rv['*'] @@ -165,17 +169,17 @@ 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) - old = [i+'\n' for i in oldrv['content'].split('\n')] + old = [i + '\n' for i in oldrv['content'].split('\n')] if newrvid == 0: cur_content = codecs.open(filename, 'r', 'utf-8').read() if cur_content[-1] == '\n': cur_content = cur_content[:-1] newname = 'b/%s (working copy)' % filename - new = [i+'\n' for i in cur_content.split('\n')] + new = [i + '\n' for i in cur_content.split('\n')] else: newrv = self.pages_get_rv(pageid, newrvid) newname = 'b/%s (revision %i)' % (filename, newrvid) - new = [i+'\n' for i in newrv['content'].split('\n')] + new = [i + '\n' for i in newrv['content'].split('\n')] diff_fd = StringIO() bzrlib.diff.internal_diff(oldname, old, newname, new, diff_fd) diff_fd.seek(0)