Rename pages_add_rev to pages_add_rv

[mw] / src / mw / clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index c12663c1e0fcca00d94ea902adf2a0e36fce348f..5bddd62d0be9c12c724fc637b7c9d09ae3433bee 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -91,17 +91,16 @@ 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'))