'lgtoken': result['login']['token']})
if result['login']['result'] == 'Success':
print 'Login successful! (yay)'
- else:
- print 'Login failed: %s' % result['login']['result']
+ else:
+ print 'Login failed: %s' % result['login']['result']
else:
print 'Login failed: %s' % result['login']['result']
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'))
-
+ with file(os.path.join(self.metadir.root, filename + '.wiki'), 'w') as fd:
+ fd.write(response[pageid]['revisions'][0]['*'].encode('utf-8'))
class StatusCommand(CommandBase):
self.parser.add_option('-m', '--message', dest='edit_summary',
help='don\'t prompt for edit summary and '
'use this instead')
- self.parser.add_option('--bot', dest='bot', action='store_true',
+ self.parser.add_option('-b', '--bot', dest='bot', action='store_true',
help='mark actions as a bot (won\'t affect '
'anything if you don\'t have the bot right',
default=False)
# get edit token
data = {
'action': 'query',
- 'prop': 'info',
+ 'prop': 'info|revisions',
'intoken': 'edit',
'titles': mw.api.filename_to_pagename(file[:-5]),
}
response = self.api.call(data)
pageid = response['query']['pages'].keys()[0]
+ revid = response['query']['pages'][pageid]['revisions'][0]['revid']
+ awaitedrevid = self.metadir.pages_get_rv_list( {'id': pageid } )[0]
+ if revid != awaitedrevid :
+ print "Ignoring %s - Edition conflict detected %s - %s " % ( file , awaitedrevid, revid)
+ continue
+ raw_input()
edittoken = response['query']['pages'][pageid]['edittoken']
# FIXME use basetimestamp and starttimestamp
filename = os.path.join(self.metadir.root, file)
text = codecs.open(filename, 'r', 'utf-8').read()
text = text.encode('utf-8')
- if text[-1] == '\n':
+ if (len(text) != 0) and (text[-1] == '\n'):
text = text[:-1]
md5 = hashlib.md5()
md5.update(text)
data['bot'] = 'bot'
response = self.api.call(data)
if response['edit']['result'] == 'Success':
+ if response['edit'].has_key('nochange') :
+ print "Ignoring %s - No changes were detected - Removing ending lf" % file
+ self.metadir.clean_page(file[:-5])
+ continue
+ if response['edit']['oldrevid'] != revid :
+ print "Ignoring %s - Colision detected " % file
+ continue
data = {
'action': 'query',
'revids': response['edit']['newrevid'],