# cookies are saved to a file
print 'Login successful! (yay)'
elif result['login']['result'] == 'NeedToken':
# cookies are saved to a file
print 'Login successful! (yay)'
elif result['login']['result'] == 'NeedToken':
self.metadir.pages_add_rv(int(pageid),
response[pageid]['revisions'][0])
filename = mw.api.pagename_to_filename(pagename)
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:
+ data = response[pageid]['revisions'][0]['*'].encode('utf-8')
+ fd.write(data)
self.parser.add_option('-m', '--message', dest='edit_summary',
help='don\'t prompt for edit summary and '
'use this instead')
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)
help='mark actions as a bot (won\'t affect '
'anything if you don\'t have the bot right',
default=False)
'intoken': 'edit',
'titles': mw.api.filename_to_pagename(file[:-5]),
}
response = self.api.call(data)
pageid = response['query']['pages'].keys()[0]
'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 "warning: edit conflict detected on %s (%s -> %s) " \
+ "-- skipping!" % (file , awaitedrevid, revid)
+ continue
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')
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 response['edit'].has_key('nochange'):
+ print "warning: no changes detected in %s - " \
+ "skipping and removing ending LF" % file
+ self.metadir.clean_page(file[:-5])
+ continue
+ if response['edit']['oldrevid'] != revid:
+ print "warning: edit conflict detected on %s -- " \
+ "skipping!" % file
+ continue
self.metadir.pages_add_rv(int(pageid),
response[pageid]['revisions'][0])
else:
self.metadir.pages_add_rv(int(pageid),
response[pageid]['revisions'][0])
else: