From: Ian Weller Date: Mon, 8 Mar 2010 05:18:36 +0000 (-0600) Subject: Move code for status to reusable function X-Git-Url: https://projects.mako.cc/source/mw/commitdiff_plain/9b8e57d467b0a3c0ae3b38fd781f668d409ddac6?ds=sidebyside Move code for status to reusable function --- diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py index 072a03d..c940bd9 100644 --- a/src/mw/clicommands.py +++ b/src/mw/clicommands.py @@ -16,7 +16,6 @@ # with this program. If not, see . ### -import codecs import getpass import mw.api import mw.metadir @@ -127,23 +126,6 @@ class StatusCommand(CommandBase): def _do_command(self): self._die_if_no_init() - check = [] - for root, dirs, files in os.walk(self.metadir.root): - if root == self.metadir.root: - dirs.remove('.mw') - for name in files: - check.append(os.path.join(root, name)) - check.sort() - for full in check: - name = os.path.split(full)[1] - if name[-5:] == '.wiki': - pagename = mw.api.filename_to_pagename(name[:-5]) - pageid = self.metadir.get_pageid_from_pagename(pagename) - if not pageid: - print '? %s' % os.path.relpath(full, self.metadir.root) - else: - rvid = self.metadir.pages_get_rv_list(pageid)[-1] - rv = self.metadir.pages_get_rv(pageid, rvid) - cur_content = codecs.open(full, 'r', 'utf-8').read() - if cur_content != rv['content']: - print 'U %s' % os.path.relpath(full, self.metadir.root) + status = self.metadir.working_dir_status() + for file in status: + print '%s %s' % (status[file], file) diff --git a/src/mw/metadir.py b/src/mw/metadir.py index f7f2fba..7126872 100644 --- a/src/mw/metadir.py +++ b/src/mw/metadir.py @@ -16,8 +16,10 @@ # with this program. If not, see . ### +import codecs import ConfigParser import json +import mw.api import os import sys @@ -122,3 +124,27 @@ class Metadir(object): fd = file(pagefile, 'r') pagedata = json.loads(fd.read()) return pagedata[str(rvid)] + + def working_dir_status(self): + status = {} + check = [] + for root, dirs, files in os.walk(self.root): + if root == self.root: + dirs.remove('.mw') + for name in files: + check.append(os.path.join(root, name)) + check.sort() + for full in check: + name = os.path.split(full)[1] + if name[-5:] == '.wiki': + pagename = mw.api.filename_to_pagename(name[:-5]) + pageid = self.get_pageid_from_pagename(pagename) + if not pageid: + status[os.path.relpath(full, self.root)] = '?' + else: + rvid = self.pages_get_rv_list(pageid)[-1] + rv = self.pages_get_rv(pageid, rvid) + cur_content = codecs.open(full, 'r', 'utf-8').read() + if cur_content != rv['content']: + status[os.path.relpath(full, self.root)] = 'U' + return status