Revision: 5519 Author: multichill Date: 2008-06-07 13:03:28 +0000 (Sat, 07 Jun 2008)
Log Message: ----------- *extra moveToCommonsTemplate for en *added check if the image was actually uploaded before changing source image *when image gets a new name at commons, replace all usage (using ImageRobot from image.py)
Modified Paths: -------------- trunk/pywikipedia/imagecopy.py
Modified: trunk/pywikipedia/imagecopy.py =================================================================== --- trunk/pywikipedia/imagecopy.py 2008-06-07 10:38:49 UTC (rev 5518) +++ trunk/pywikipedia/imagecopy.py 2008-06-07 13:03:28 UTC (rev 5519) @@ -58,9 +58,11 @@ succesfully on nl.wp (12k+ files copied and deleted locally) and en.wp (about 100 files copied and SieBot has bot approval for tagging {{ncd}} with this bot) +** Implemented * {{NowCommons|xxx}} requires the namespace prefix Image: on most wikis and can be left out on others. This needs to be taken care of when implementing i18n +** Implemented * This bot should probably get a small tutorial at meta with a few screenshots. """ @@ -88,6 +90,7 @@ import wikipedia, config import pagegenerators, add_text from upload import * +from image import * NL=''
nowCommonsTemplate = { @@ -199,7 +202,7 @@
moveToCommonsTemplate = { 'ar': [u'نقل إلى كومنز'], - 'en': [u'Commons ok', u'Move to commons', u'Copy to Wikimedia Commons', u'To commons'], + 'en': [u'Commons ok', u'Copy to Wikimedia Commons', u'Move to commons', u'Movetocommons', u'To commons'], 'fi':[u'Commonsiin'], 'fr':[u'Image pour Commons'], 'hsb':[u'Kopěruj do Wikimedia Commons'], @@ -214,6 +217,12 @@ 'zh':[u'Copy to Wikimedia Commons'], }
+imageMoveMessage = { + '_default': u'[[:Image:%s|Image]] moved to [[:commons:Image:%s|commons]].', + 'en': u'[[:Image:%s|Image]] moved to [[:commons:Image:%s|commons]].', + 'nl': u'[[:Image:%s|Afbeelding]] is verplaatst naar [[:commons:Image:%s|commons]].', +} + def pageTextPost(url,postinfo): print url m=re.search(ur'http://(.*?)(/.*)%27,url) @@ -268,29 +277,41 @@ bot = UploadRobot(url=self.imagePage.fileUrl(), description=CH, useFilename=self.newname, keepFilename=True, verifyDescription=False, ignoreWarning = True, targetSite = wikipedia.getSite('commons', 'commons')) bot.run()
- #Should maybe check if the image actually was uploaded + #Should check if the image actually was uploaded + if wikipedia.Page(wikipedia.getSite('commons', 'commons'), u'Image:' + self.newname.decode('utf-8')).exists(): + #Get a fresh copy, force to get the page so we dont run into edit conflicts + imtxt=self.imagePage.get(force=True)
- #Get a fresh copy, force to get the page so we dont run into edit conflicts - imtxt=self.imagePage.get(force=True) + #Remove the move to commons templates + if moveToCommonsTemplate.has_key(self.imagePage.site().language()): + for moveTemplate in moveToCommonsTemplate[self.imagePage.site().language()]: + imtxt = re.sub(u'(?i){{' + moveTemplate + u'}}', u'', imtxt)
- #Remove the move to commons templates - if moveToCommonsTemplate.has_key(self.imagePage.site().language()): - for moveTemplate in moveToCommonsTemplate[self.imagePage.site().language()]: - imtxt = re.sub(u'(?i){{' + moveTemplate + u'}}', u'', imtxt) + #add {{NowCommons}} + if nowCommonsTemplate.has_key(self.imagePage.site().language()): + addTemplate = nowCommonsTemplate[self.imagePage.site().language()] % self.newname.decode('utf-8') + else: + addTemplate = nowCommonsTemplate['_default'] % self.newname.decode('utf-8')
- #add {{NowCommons}} - if nowCommonsTemplate.has_key(self.imagePage.site().language()): - addTemplate = nowCommonsTemplate[self.imagePage.site().language()] % self.newname.decode('utf-8') - else: - addTemplate = nowCommonsTemplate['_default'] % self.newname.decode('utf-8') + if nowCommonsMessage.has_key(self.imagePage.site().language()): + commentText = nowCommonsMessage[self.imagePage.site().language()] + else: + commentText = nowCommonsMessage['_default']
- if nowCommonsMessage.has_key(self.imagePage.site().language()): - commentText = nowCommonsMessage[self.imagePage.site().language()] - else: - commentText = nowCommonsMessage['_default'] + wikipedia.showDiff(self.imagePage.get(), imtxt+addTemplate) + self.imagePage.put(imtxt + addTemplate, comment = commentText)
- wikipedia.showDiff(self.imagePage.get(), imtxt+addTemplate) - self.imagePage.put(imtxt + addTemplate, comment = commentText) + self.gen = pagegenerators.FileLinksGenerator(self.imagePage) + self.preloadingGen = pagegenerators.PreloadingGenerator(self.gen) + + #If the image is uploaded under a different name, replace all instances + if self.imagePage.titleWithoutNamespace() != self.newname.decode('utf-8'): + if imageMoveMessage.has_key(self.imagePage.site().language()): + moveSummary = imageMoveMessage[self.imagePage.site().language()] % (self.imagePage.titleWithoutNamespace(), self.newname.decode('utf-8')) + else: + moveSummary = imageMoveMessage['_default'] % (self.imagePage.titleWithoutNamespace(), self.newname.decode('utf-8')) + imagebot = ImageRobot(generator = self.preloadingGen, oldImage = self.imagePage.titleWithoutNamespace(), newImage = self.newname.decode('utf-8'), summary = moveSummary, always = True, loose = True) + imagebot.run() return
#-label ok skip view