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

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index c12663c..c180c6a 100644
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -16,6 +16,7 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
+import codecs
 import getpass
 import mw.api
 import mw.metadir
@@ -71,11 +72,10 @@ class InitCommand(CommandBase):
         self.metadir.create(self.args[0])
 
 
-class FetchCommand(CommandBase):
+class PullCommand(CommandBase):
     def __init__(self):
         usage = '%prog fetch [options] PAGENAME ...'
-        CommandBase.__init__(self, 'fetch', 'fetch remote pages', usage)
-        self.shortcuts.append('ft')
+        CommandBase.__init__(self, 'pull', 'add remote pages to repo', usage)
 
     def _do_command(self):
         self._die_if_no_init()
@@ -91,17 +91,45 @@ class FetchCommand(CommandBase):
             }
             response = self.api.call(data)['query']['pages']
             for pageid in response.keys():
+                pagename = response[pageid]['title']
                 if 'missing' in response[pageid].keys():
                     print '%s: %s: page does not exist, file not created' % \
-                            (self.me, response[pageid]['title'])
+                            (self.me, pagename)
                     continue
                 revid = [x['revid'] for x in response[pageid]['revisions']]
-                self.metadir.add_page_info(int(pageid),
-                                           response[pageid]['title'],
-                                           revid)
-                self.metadir.add_rv_info(response[pageid]['revisions'][0])
-                filename = response[pageid]['title'].replace(' ', '_')
-                filename = filename.replace('/', '!')
+                self.metadir.pagedict_add(pagename, int(pageid))
+                self.metadir.pages_add_rv(int(pageid),
+                                          response[pageid]['revisions'][0])
+                filename = mw.api.pagename_to_filename(pagename)
                 fd = file(os.path.join(self.metadir.root, filename + '.wiki'),
                           'w')
                 fd.write(response[pageid]['revisions'][0]['*'].encode('utf-8'))
+
+
+class StatusCommand(CommandBase):
+    def __init__(self):
+        CommandBase.__init__(self, 'status', 'check repo status')
+        self.shortcuts.append('st')
+
+    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)