_login() now actually logs in to remote wiki

[mw] / src / mw / clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index 77148934227b3f0167dace94254edb04b1113399..936082205bd3ee102ad714a12fe7d84e86ae0e46 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -13,10 +13,10 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
+import codecs
 import getpass
 import mw.api
 import mw.metadir
@@ -38,6 +38,7 @@ class CommandBase(object):
                                   dest='use_auth', help='force authentication '
                                   'even if not required')
         self.parser.add_option_group(global_options)
+        self.shortcuts = []
 
     def main(self):
         (self.options, self.args) = self.parser.parse_args()
@@ -47,6 +48,11 @@ class CommandBase(object):
     def _login(self):
         user = raw_input('Username: ')
         passwd = getpass.getpass()
+        result = self.api.call({'action': 'login',
+                                'lgname': user,
+                                'lgpassword': passwd})
+        if result['login']['result'] != 'Success':
+            raise Exception('Login error: %s' % result['login']['result'])
 
     def _die_if_no_init(self):
         if self.metadir.config is None:
@@ -71,10 +77,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)
+        CommandBase.__init__(self, 'pull', 'add remote pages to repo', usage)
 
     def _do_command(self):
         self._die_if_no_init()
@@ -90,12 +96,46 @@ class FetchCommand(CommandBase):
             }
             response = self.api.call(data)['query']['pages']
             for pageid in response.keys():
-                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])
-                fd = file(os.path.join(self.metadir.root, \
-                        response[pageid]['title'].replace(' ', '_') + \
-                        '.wiki'), 'w')
+                pagename = response[pageid]['title']
+                if 'missing' in response[pageid].keys():
+                    print '%s: %s: page does not exist, file not created' % \
+                            (self.me, pagename)
+                    continue
+                revids = [x['revid'] for x in response[pageid]['revisions']]
+                revids.sort()
+                self.metadir.pagedict_add(pagename, pageid, revids[-1])
+                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)