pywikibot October 2008

pywikibot@lists.wikimedia.org

25 participants
195 discussions

[Pywikipedia-l] SVN: [6030] trunk/pywikipedia/checkimages.py
by filnik＠svn.wikimedia.org 26 Oct '08

26 Oct '08

Revision: 6030 Author: filnik Date: 2008-10-26 17:52:05 +0000 (Sun, 26 Oct 2008) Log Message: ----------- Other little bugfixes, sorry but during the deep testing comes these special cases out.. Modified Paths: -------------- trunk/pywikipedia/checkimages.py Modified: trunk/pywikipedia/checkimages.py =================================================================== --- trunk/pywikipedia/checkimages.py 2008-10-26 17:31:12 UTC (rev 6029) +++ trunk/pywikipedia/checkimages.py 2008-10-26 17:52:05 UTC (rev 6030) @@ -60,12 +60,9 @@ ---- Known issues/FIXMEs: ---- * Clean the code, some passages are pretty difficult to understand if you're not the coder. -* Fix the "real-time" regex and function * Add the "catch the language" function for commons. * Fix and reorganise the new documentation * Add a report for the image tagged. -* Duplicates: check the usage, find out which image is most usued and "delete" the other ones. -* -> if the other ones are used, advise it in the message! """ @@ -329,16 +326,16 @@ # because they are already put in the regex). # Warning 3: the part that use this regex is case-insensitive (just to let you know..) HiddenTemplate = { - 'commons':[u'information'], # Put the other in the page on the project defined below - 'ar':[u'معلومات'], - 'de':[u'information'], - 'en':[u'information'], - 'hu':[u'információ', u'enwiki', u'azonnali'], - 'it':[u'edp', u'informazioni file', u'information', u'trademark', u'permissionotrs'], # Put the other in the page on the project defined below - 'ja':[u'Information'], - 'ko':[u'그림 정보'], - 'ta':[u'information'], - 'zh':[u'information'], + 'commons':[u'Template:Information'], # Put the other in the page on the project defined below + 'ar':[u'Template:معلومات'], + 'de':[u'Template:Information'], + 'en':[u'Template:Information'], + 'hu':[u'Template:Információ', u'Template:Enwiki', u'Template:Azonnali'], + 'it':[u'Template:EDP', u'Template:Informazioni file', u'Template:Information', u'Template:Trademark', u'Template:Permissionotrs'], # Put the other in the page on the project defined below + 'ja':[u'Template:Information'], + 'ko':[u'Template:그림 정보'], + 'ta':[u'Template:Information'], + 'zh':[u'Template:Information'], } # A page where there's a list of template to skip. PageWithHiddenTemplates = {

1 0

[Pywikipedia-l] SVN: [6029] trunk/pywikipedia/checkimages.py
by filnik＠svn.wikimedia.org 26 Oct '08

26 Oct '08

Revision: 6029 Author: filnik Date: 2008-10-26 17:31:12 +0000 (Sun, 26 Oct 2008) Log Message: ----------- Other little bugfixes Modified Paths: -------------- trunk/pywikipedia/checkimages.py Modified: trunk/pywikipedia/checkimages.py =================================================================== --- trunk/pywikipedia/checkimages.py 2008-10-26 16:35:06 UTC (rev 6028) +++ trunk/pywikipedia/checkimages.py 2008-10-26 17:31:12 UTC (rev 6029) @@ -375,7 +375,6 @@ 'commons': u'\n{{Dupe|__image__}}', 'en' : None, 'it' : u'\n{{Progetto:Coordinamento/Immagini/Bot/Template duplicati|__images__}}', - 'ko' :'분류:그림 저작권 틀', } # Head of the message given to the author duplicate_user_talk_head = { @@ -1098,6 +1097,8 @@ list_licenses.extend(pages) """ catName = wikipedia.translate(self.site, category_with_licenses) + if catName == None: + raise wikipedia.Error(u'No licenses allowed provided, add that option to the code to make the script working correctly') wikipedia.output(u'\n\t...Loading the licenses allowed...\n') list_licenses = categoryAllPageObjects(catName) @@ -1127,6 +1128,8 @@ regex_find_licenses = re.compile(r'(?<!\{)\{\{(?:[Tt]emplate:|)([^{]*?)[|\n<}]', re.DOTALL) templatesInTheImageRaw = regex_find_licenses.findall(self.imageCheckText) allLicenses = list() + if self.list_licenses == []: + raise wikipedia.Error(u'No licenses allowed provided, add that option to the code to make the script working correctly') # Found the templates ONLY in the image's description for template_selected in templatesInTheImageRaw: for templateReal in self.licenses_found:

1 0

[Pywikipedia-l] SVN: [6028] trunk/pywikipedia/welcome.py
by filnik＠svn.wikimedia.org 26 Oct '08

26 Oct '08

Revision: 6028 Author: filnik Date: 2008-10-26 16:35:06 +0000 (Sun, 26 Oct 2008) Log Message: ----------- Little bugfix Modified Paths: -------------- trunk/pywikipedia/welcome.py Modified: trunk/pywikipedia/welcome.py =================================================================== --- trunk/pywikipedia/welcome.py 2008-10-26 16:18:42 UTC (rev 6027) +++ trunk/pywikipedia/welcome.py 2008-10-26 16:35:06 UTC (rev 6028) @@ -421,7 +421,7 @@ # XXX: That's the regex, if there are problems, take a look here. reg = u'$<a href=\"' + re.escape(wsite.path()) - reg += u'\?title=%s(?P<user>.*?)&(?:amp;|)action=(?:edit|editredlink|edit&redlink=1)\"' % talk + reg += u'\?title=%s(?P<user>.*?)&(?:amp;|)action=(?:edit|editredlink|edit&redlink=1)\"' % re.escape(talk) reg += u'.*?$ (?P<reason>.*?) . </li>' p = re.compile(reg, re.UNICODE) @@ -473,7 +473,7 @@ pos = 0 # The talk page includes "_" between the two names, in this way i replace them to " ". username = wikipedia.url2link(username, wsite, wsite) - regex = username + regex = re.escape(username) n = re.compile(regex, re.UNICODE) y = n.search(text_get, pos) if y == None: @@ -489,7 +489,8 @@ """ The function to understand if the user is blocked or not. """ pathWiki = wsite.family.nicepath(wsite.lang) #A little function to check if the user has already been blocked (to skip him). - reg = r"""<li>\d\d:\d\d, \d(\d)? (.*?) \d\d\d\d <a href=\"""" + pathWiki + r"""(.*?)\" title=\"(.*?)\">(.*?)</a> \(<a href=\"""" + pathWiki + r"""(.*?)\" title=\"(.*?)\">(.*?)</a>""" + reg = r"""<li>\d\d:\d\d, \d(\d)? (.*?) \d\d\d\d <a href=\"""" + re.escape(pathWiki) + \ + r"""(.*?)\" title=\"(.*?)\">(.*?)</a> \(<a href=\"""" + re.escape(pathWiki) + r"""(.*?)\" title=\"(.*?)\">(.*?)</a>""" block_text = wsite.getUrl(wsite.path() + '?title=Special:Log/block&page=User:' + username) numblock = re.findall(reg, block_text) # If the bot doesn't find block-line (that means the user isn't blocked), it will return False otherwise True.

1 0

[Pywikipedia-l] SVN: [6027] trunk/pywikipedia/checkimages.py
by filnik＠svn.wikimedia.org 26 Oct '08

26 Oct '08

Revision: 6027 Author: filnik Date: 2008-10-26 16:18:42 +0000 (Sun, 26 Oct 2008) Log Message: ----------- Another little bugfix Modified Paths: -------------- trunk/pywikipedia/checkimages.py Modified: trunk/pywikipedia/checkimages.py =================================================================== --- trunk/pywikipedia/checkimages.py 2008-10-26 16:11:59 UTC (rev 6026) +++ trunk/pywikipedia/checkimages.py 2008-10-26 16:18:42 UTC (rev 6027) @@ -544,9 +544,8 @@ ns = subcat['ns'] pageid = subcat['pageid'] title = subcat['title'] - if ns == 14: + if ns == 14: allmembers.extend(categoryAllElements(title)) - members.remove(subcat) for member in allmembers: ns = member['ns'] pageid = member['pageid']

1 0

[Pywikipedia-l] SVN: [6026] trunk/pywikipedia/checkimages.py
by filnik＠svn.wikimedia.org 26 Oct '08

26 Oct '08

Revision: 6026 Author: filnik Date: 2008-10-26 16:11:59 +0000 (Sun, 26 Oct 2008) Log Message: ----------- Little bugfixes Modified Paths: -------------- trunk/pywikipedia/checkimages.py Modified: trunk/pywikipedia/checkimages.py =================================================================== --- trunk/pywikipedia/checkimages.py 2008-10-26 14:51:32 UTC (rev 6025) +++ trunk/pywikipedia/checkimages.py 2008-10-26 16:11:59 UTC (rev 6026) @@ -972,7 +972,7 @@ only_report = True break # Delete the image in the list where we're write on - text_for_the_report = re.sub(r'\n\*\[\[:%s\]\]' % (self.image_namespace + image_to_tag), '', text_for_the_report) + text_for_the_report = re.sub(r'\n\*\[\[:%s\]\]' % re.escape(self.image_namespace + image_to_tag), '', text_for_the_report) self.report(text_for_the_report, image_to_tag, commImage = dupComment_image, unver = True) if len(images_to_tag_list) != 0 and not only_report: @@ -1154,7 +1154,7 @@ license_found = license_selected if not seems_ok and license_found != None: rep_text_license_fake = u"\n*[[:Image:%s]] seems to have a ''fake license'', license detected: <nowiki>%s</nowiki>" % (self.imageName, license_found) - regexFakeLicense = r"\* ?\[\[:Image:%s\]\] seems to have a ''fake license'', license detected: <nowiki>%s</nowiki>$" % (self.imageName, license_found) + regexFakeLicense = r"\* ?\[\[:Image:%s\]\] seems to have a ''fake license'', license detected: <nowiki>%s</nowiki>$" % (re.escape(self.imageName), license_found) printWithTimeZone(u"%s seems to have a fake license: %s, reporting..." % (self.imageName, license_found)) self.report_image(self.imageName, rep_text = rep_text_license_fake, addings = False, regex = regexFakeLicense) @@ -1503,9 +1503,9 @@ wait_number = int(arg[6:]) elif arg.startswith('-start'): if len(arg) == 6: - firstPageTitle = str(wikipedia.input(u'From witch page do you want to start?')) + firstPageTitle = wikipedia.input(u'From witch page do you want to start?') elif len(arg) > 6: - firstPageTitle = str(arg[7:]) + firstPageTitle = arg[7:] generator = wikipedia.getSite().allpages(start=firstPageTitle, namespace=6) repeat = False elif arg.startswith('-page'):

1 0

[Pywikipedia-l] SVN: [6025] trunk/pywikipedia/wikipedia.py
by filnik＠svn.wikimedia.org 26 Oct '08

26 Oct '08

Revision: 6025 Author: filnik Date: 2008-10-26 14:51:32 +0000 (Sun, 26 Oct 2008) Log Message: ----------- None -> [] in the getTemplates() function Modified Paths: -------------- trunk/pywikipedia/wikipedia.py Modified: trunk/pywikipedia/wikipedia.py =================================================================== --- trunk/pywikipedia/wikipedia.py 2008-10-26 14:14:07 UTC (rev 6024) +++ trunk/pywikipedia/wikipedia.py 2008-10-26 14:51:32 UTC (rev 6025) @@ -938,7 +938,7 @@ try: templates = data['query']['pages'][pageid]['templates'] except KeyError: - return None + return list() templatesFound = list() for template in templates: templateName = template['title']

1 0

[Pywikipedia-l] SVN: [6024] trunk/pywikipedia/checkimages.py
by filnik＠svn.wikimedia.org 26 Oct '08

26 Oct '08

Revision: 6024 Author: filnik Date: 2008-10-26 14:14:07 +0000 (Sun, 26 Oct 2008) Log Message: ----------- Test page -> official page Modified Paths: -------------- trunk/pywikipedia/checkimages.py Modified: trunk/pywikipedia/checkimages.py =================================================================== --- trunk/pywikipedia/checkimages.py 2008-10-26 14:09:24 UTC (rev 6023) +++ trunk/pywikipedia/checkimages.py 2008-10-26 14:14:07 UTC (rev 6024) @@ -342,7 +342,7 @@ } # A page where there's a list of template to skip. PageWithHiddenTemplates = { - 'commons': u'User:Filbot/White_templates2#White_templates', + 'commons': u'User:Filbot/White_templates#White_templates', 'en':None, 'it':u'Progetto:Coordinamento/Immagini/Bot/WhiteTemplates', 'ko': u'User:Kwjbot_IV/whitetemplates/list',

1 0

[Pywikipedia-l] SVN: [6023] trunk/pywikipedia/checkimages.py
by filnik＠svn.wikimedia.org 26 Oct '08

26 Oct '08

Revision: 6023 Author: filnik Date: 2008-10-26 14:09:24 +0000 (Sun, 26 Oct 2008) Log Message: ----------- Really big rewrite! now the bot uses APIs to do the work really better and really faster! I will fix it a bit in the next days and add the comments, but the most is done Modified Paths: -------------- trunk/pywikipedia/checkimages.py Modified: trunk/pywikipedia/checkimages.py =================================================================== --- trunk/pywikipedia/checkimages.py 2008-10-25 23:48:32 UTC (rev 6022) +++ trunk/pywikipedia/checkimages.py 2008-10-26 14:09:24 UTC (rev 6023) @@ -22,8 +22,6 @@ -duplicatesreport - Report the duplicates in a log *AND* put the template in the images. - -smartdetection - Check in a category if the license found exist in realit or not. - -sendemail - Send an email after tagging. -break - To break the bot after the first check (default: recursive) @@ -336,7 +334,7 @@ 'de':[u'information'], 'en':[u'information'], 'hu':[u'információ', u'enwiki', u'azonnali'], - 'it':[u'edp', u'informazioni[ _]file', u'information', u'trademark', u'permissionotrs'], # Put the other in the page on the project defined below + 'it':[u'edp', u'informazioni file', u'information', u'trademark', u'permissionotrs'], # Put the other in the page on the project defined below 'ja':[u'Information'], 'ko':[u'그림 정보'], 'ta':[u'information'], @@ -344,7 +342,7 @@ } # A page where there's a list of template to skip. PageWithHiddenTemplates = { - 'commons': u'User:Filbot/White_templates#White_templates', + 'commons': u'User:Filbot/White_templates2#White_templates', 'en':None, 'it':u'Progetto:Coordinamento/Immagini/Bot/WhiteTemplates', 'ko': u'User:Kwjbot_IV/whitetemplates/list', @@ -387,7 +385,7 @@ } # Message to put in the talk duplicates_user_talk_text = { - 'commons': u'{{subst:User:Filnik/duplicates|Image:%s|Image:%s}}', + 'commons': u'{{subst:User:Filnik/duplicates|Image:%s|Image:%s}}', # FIXME: it doesn't exist 'en' : None, 'it' : u"{{subst:Progetto:Coordinamento/Immagini/Bot/Messaggi/Duplicati|%s|%s|__botnick__}} --~~~~", } @@ -502,10 +500,69 @@ wikipedia.output(u'No data found.') return False +def categoryElementsNumber(CatName): + #action=query&prop=categoryinfo&titles=Category:License_tags + """ + """ + params = { + 'action' :'query', + 'prop' :'categoryinfo', + 'titles' :CatName, + } + + data = query.GetData(params, + useAPI = True, encodeTitle = False) + pageid = data['query']['pages'].keys()[0] + elements = data['query']['pages'][pageid]['categoryinfo']['size'] + return elements + +def categoryAllElements(CatName): + #action=query&list=categorymembers&cmlimit=500&cmtitle=Category:License_tags + """ + """ + wikipedia.output("Loading %s..." % CatName) + elements = int(categoryElementsNumber(CatName)) + elements += 20 # better to be sure that all the elements are loaded + if (elements - 20) > 5000: + raise wikipedia.Error(u'The category selected as more than 5.000 elements, limit reached') + elif elements > 5000: # if they are less then 5000, but for few elements + elements = 5000 + params = { + 'action' :'query', + 'list' :'categorymembers', + 'cmlimit' :str(elements), + 'cmtitle' :CatName, + } + + data = query.GetData(params, + useAPI = True, encodeTitle = False) + + members = data['query']['categorymembers'] + allmembers = members + results = list() + for subcat in members: + ns = subcat['ns'] + pageid = subcat['pageid'] + title = subcat['title'] + if ns == 14: + allmembers.extend(categoryAllElements(title)) + members.remove(subcat) + for member in allmembers: + ns = member['ns'] + pageid = member['pageid'] + title = member['title'] + results.append(member) + return results +def categoryAllPageObjects(CatName): + final = list() + for element in categoryAllElements(CatName): + final.append(wikipedia.Page(wikipedia.getSite(), element['title'])) + return final + # Here there is the main class. class main: def __init__(self, site, logFulNumber = 25000, sendemailActive = False, - duplicatesReport = False, smartdetection = False): + duplicatesReport = False): """ Constructor, define some global variable """ self.site = site self.logFulNumber = logFulNumber @@ -513,7 +570,7 @@ self.rep_page = wikipedia.translate(self.site, report_page) self.rep_text = wikipedia.translate(self.site, report_text) self.com = wikipedia.translate(self.site, comm10) - self.hiddentemplate = wikipedia.translate(self.site, HiddenTemplate) + self.hiddentemplates = wikipedia.translate(self.site, HiddenTemplate) self.pageHidden = wikipedia.translate(self.site, PageWithHiddenTemplates) self.pageAllowed = wikipedia.translate(self.site, PageWithAllowedTemplates) # Commento = Summary in italian @@ -533,9 +590,7 @@ image_n = self.site.image_namespace() self.image_namespace = u"%s:" % image_n # Example: "Image:" # Load the licenses only once, so do it once - self.smartdetection = smartdetection - if self.smartdetection: - self.list_licenses = self.load_licenses() + self.list_licenses = self.load_licenses() def setParameters(self, imageName, timestamp, uploader): """ Function to set parameters, now only image but maybe it can be used for others in "future" """ self.imageName = imageName @@ -736,17 +791,18 @@ """ Function to load the white templates """ # A template as {{en is not a license! Adding also them in the whitelist template... for langK in wikipedia.Family(u'wikipedia').langs.keys(): - self.hiddentemplate.append(u'%s' % langK) + self.hiddentemplates.append(wikipedia.Page(self.site, u'Template:%s' % langK)) # The template #if: and #switch: aren't something to care about - self.hiddentemplate.extend([u'#if:', u'#switch:']) + #self.hiddentemplates.extend([u'#if:', u'#switch:']) FIXME # Hidden template loading if self.pageHidden != None: try: pageHiddenText = wikipedia.Page(self.site, self.pageHidden).get() except (wikipedia.NoPage, wikipedia.IsRedirectPage): pageHiddenText = '' - self.hiddentemplate.extend(self.load(pageHiddenText)) - return self.hiddentemplate + for element in self.load(pageHiddenText): + self.hiddentemplates.append(wikipedia.Page(self.site, element)) + return self.hiddentemplates def returnOlderTime(self, listGiven, timeListGiven): """ Get some time and return the oldest of them """ @@ -1029,6 +1085,7 @@ def load_licenses(self): """ Load the list of the licenses """ + """ catName = wikipedia.translate(self.site, category_with_licenses) cat = catlib.Category(wikipedia.getSite(), catName) categories = [page.title() for page in pagegenerators.SubCategoriesPageGenerator(cat)] @@ -1040,6 +1097,10 @@ gen = pagegenerators.CategorizedPageGenerator(cat) pages = [page for page in gen] list_licenses.extend(pages) + """ + catName = wikipedia.translate(self.site, category_with_licenses) + wikipedia.output(u'\n\t...Loading the licenses allowed...\n') + list_licenses = categoryAllPageObjects(catName) # Add the licenses set in the default page as licenses # to check @@ -1049,95 +1110,57 @@ except (wikipedia.NoPage, wikipedia.IsRedirectPage): pageAllowedText = '' for nameLicense in self.load(pageAllowedText): - if not 'template:' in nameLicense.lower(): - nameLicense = u'Template:%s' % nameLicense pageLicense = wikipedia.Page(self.site, nameLicense) if pageLicense not in list_licenses: list_licenses.append(pageLicense) # the list has wiki-pages return list_licenses - def giveMeTheTemplate(self, license_selected): - """ From the name of a template see if it's template:something or just - an inclusion of another namespace != template. If it's a redirect - gets the real page, if there's a NoPage, return None. - """ - #print template.exists() - template = wikipedia.Page(self.site, u'Template:%s' % license_selected) - try: - template.pageAPInfo() - except wikipedia.NoPage: - try: - template = wikipedia.Page(self.site, license_selected) - template.pageAPInfo() - except (wikipedia.NoPage, wikipedia.IsRedirectPage): - return None # break and exit - except wikipedia.IsRedirectPage: - template = template.getRedirectTarget() - return template - - def smartDetection(self, image_text): + def smartDetection(self): """ The bot instead of checking if there's a simple template in the image's description, checks also if that template is a license or something else. In this sense this type of check is smart. """ seems_ok = False license_found = None - regex_find_licenses = re.compile(r'\{\{(?:[Tt]emplate:|)(.*?)(?:[|\n<].*?|)\}\}', re.DOTALL) - licenses_found = regex_find_licenses.findall(image_text) - second_round = False - - exit_cicle = False # howTo exit from both the for and the while cicle - while 1: - if exit_cicle: # howTo exit from the while - break - if licenses_found != []: - for license_selected in licenses_found: - # put the first, if there is problem, this will be reported in the log - if license_found == None: - license_found = license_selected + self.hiddentemplates = self.loadHiddenTemplates() + self.licenses_found = self.image.getTemplates() + whiteTemplatesFound = False + regex_find_licenses = re.compile(r'(?<!\{)\{\{(?:[Tt]emplate:|)([^{]*?)[|\n<}]', re.DOTALL) + templatesInTheImageRaw = regex_find_licenses.findall(self.imageCheckText) + allLicenses = list() + # Found the templates ONLY in the image's description + for template_selected in templatesInTheImageRaw: + for templateReal in self.licenses_found: + if self.convert_to_url(template_selected).lower().replace('template:', '') == \ + self.convert_to_url(templateReal.title().lower().replace('template:', '')): + allLicenses.append(templateReal) + if self.licenses_found != []: + for template in self.licenses_found: + license_selected = template.title().replace('Template:', '') + if template in self.list_licenses: # the list_licenses are loaded in the __init__ (not to load them multimple times) + seems_ok = True + license_found = license_selected # let the last "fake" license normally detected + break + if template in self.hiddentemplates: + # if the whitetemplate is not in the images description, we don't care try: - template = self.giveMeTheTemplate(license_selected) - if template == None: - continue - except wikipedia.BadTitle: - # Template with wrong name, no need to report, simply skip + allLicenses.remove(template) + except ValueError: continue - if template in self.list_licenses: # the list_licenses are loaded in the __init__ (not to load them multimple times) - seems_ok = True - exit_cicle = True - license_found = license_selected # let the last "fake" license normally detected - break - # previous block was unsuccessful? Try with the next one - for license_selected in licenses_found: - try: - template = self.giveMeTheTemplate(license_selected) - if template == None: - continue # ok, this template it's not ok, continue.. - except wikipedia.BadTitle: - # Template with wrong name, no need to report, simply skip - continue - try: - template_text = template.get() - except wikipedia.NoPage: - continue # ok, this template it's not ok, continue.. - regex_noinclude = re.compile(r'<noinclude>(.*?)</noinclude>', re.DOTALL) - template_text = regex_noinclude.sub('', template_text) - if second_round == False: - licenses_found = regex_find_licenses.findall(template_text) - second_round = True - break # only exit from the for, not from the while else: - exit_cicle = True - break - if not seems_ok: + whiteTemplatesFound = True + continue + if license_found == None and allLicenses != list(): + license_found = license_selected + if not seems_ok and license_found != None: rep_text_license_fake = u"\n*[[:Image:%s]] seems to have a ''fake license'', license detected: <nowiki>%s</nowiki>" % (self.imageName, license_found) regexFakeLicense = r"\* ?\[\[:Image:%s\]\] seems to have a ''fake license'', license detected: <nowiki>%s</nowiki>$" % (self.imageName, license_found) printWithTimeZone(u"%s seems to have a fake license: %s, reporting..." % (self.imageName, license_found)) self.report_image(self.imageName, rep_text = rep_text_license_fake, addings = False, regex = regexFakeLicense) - else: + elif license_found != None: printWithTimeZone(u"%s seems ok, license found: %s..." % (self.imageName, license_found)) - return license_found + return (license_found, whiteTemplatesFound) def load(self, raw): """ Load a list of object from a string using regex. """ @@ -1252,31 +1275,8 @@ return True elif i.lower() in self.imageCheckText: return True - return False # Nothing Found? Ok: False + return False # Nothing Found? Ok: False - def whiteTemplateEraser(self): - """ Erase the white template from the checking text and return how many have been found. """ - # Load the white templates(hidden template is the same as white template, regarding the meaning) - white_templates_found = 0 - hiddentemplate = self.loadHiddenTemplates() - for regexWhiteLicense in hiddentemplate: - fullRegexWL = r'\{\{(?:template:|)(?:%s[ \n]*?(?:\n|\||\}|<)|creator:)' % regexWhiteLicense.lower() - if self.tagged == False: - # why creator? Because on commons there's a template such as {{creator:name}} that.. works - res = re.findall(fullRegexWL, self.imageCheckText.lower()) - if res != []: - for element in res: # if a regex gives more than 1 results, are more than 1 template found. - white_templates_found += 1 - if regexWhiteLicense != '' and regexWhiteLicense != ' ': # Check that regexWhiteLicense is not nothing or a space - # Deleting! (replace the template with nothing) - regex_white_template = re.compile(fullRegexWL, re.IGNORECASE) - self.imageCheckText = regex_white_template.sub(r'', self.imageCheckText) - if white_templates_found == 1: - wikipedia.output(u'A white template found, skipping the template...') - elif white_templates_found > 1: - wikipedia.output(u'White templates found: %s; skipping those templates...' % white_templates_found) - return white_templates_found - def findAdditionalProblems(self): # In every tupla there's a setting configuration for tupla in self.settingsData: @@ -1322,7 +1322,7 @@ self.mex_used = mexCatched continue - def checkStep(self, smartdetection): + def checkStep(self): # nothing = Defining an empty image description nothing = ['', ' ', ' ', ' ', '\n', '\n ', '\n ', '\n\n', '\n \n', ' \n', ' \n ', ' \n \n'] # something = Minimal requirements for an image description. @@ -1369,11 +1369,10 @@ # Deleting the useless template from the description (before adding something # in the image the original text will be reloaded, don't worry). self.tagged = self.isTagged() - white_templates_found = self.whiteTemplateEraser() - if white_templates_found != 0: - hiddenTemplateFound = True - else: - hiddenTemplateFound = False + if self.tagged == True: + # Tagged? Yes, skip. + printWithTimeZone(u'%s is already tagged...' % self.imageName) + return True for a_word in something: # something is the array with {{, MIT License and so on. if a_word in self.imageCheckText: # There's a template, probably a license (or I hope so) @@ -1382,6 +1381,7 @@ for parl in notallowed: if parl.lower() in extension.lower(): delete = True + (license_found, hiddenTemplateFound) = self.smartDetection() self.some_problem = False # If it has "some_problem" it must check # the additional settings. # if self.settingsData, use addictional settings @@ -1392,10 +1392,6 @@ #if p.exists(): <-- improve thebot, better to make as # less call to the server as possible # Here begins the check block. - if self.tagged == True: - # Tagged? Yes, skip. - printWithTimeZone(u'%s is already tagged...' % self.imageName) - return True if self.some_problem == True: if self.mex_used in self.imageCheckText: wikipedia.output(u'Image already fixed. Skip.') @@ -1414,13 +1410,8 @@ wikipedia.output(u"Skipping the image...") self.some_problem = False return True - elif brackets == True: + elif brackets == True and license_found != None: seems_ok = False - license_found = None - if smartdetection: - license_found = self.smartDetection(self.imageCheckText) - else: - printWithTimeZone(u"%s seems ok..." % self.imageName) # It works also without this... but i want only to be sure ^^ brackets = False return True @@ -1469,7 +1460,6 @@ duplicatesActive = False # Use the duplicate option duplicatesReport = False # Use the duplicate-report option sendemailActive = False # Use the send-email - smartdetection = False # Enable the smart detection # Here below there are the parameters. for arg in wikipedia.handleArgs(): @@ -1497,8 +1487,6 @@ duplicatesReport = True elif arg == '-sendemail': sendemailActive = True - elif arg == '-smartdetection': - smartdetection = True elif arg.startswith('-skip'): if len(arg) == 5: skip = True @@ -1597,7 +1585,7 @@ # Main Loop while 1: # Defing the Main Class. - mainClass = main(site, sendemailActive = sendemailActive, duplicatesReport = duplicatesReport, smartdetection = smartdetection) + mainClass = main(site, sendemailActive = sendemailActive, duplicatesReport = duplicatesReport) # Untagged is True? Let's take that generator if untagged == True: generator = mainClass.untaggedGenerator(projectUntagged, limit) @@ -1674,7 +1662,7 @@ response2 = mainClass.checkImageDuplicated(duplicates_rollback) if response2 == False: continue - resultCheck = mainClass.checkStep(smartdetection) + resultCheck = mainClass.checkStep() if resultCheck: continue # A little block to perform the repeat or to break. @@ -1694,5 +1682,5 @@ final = datetime.datetime.strptime(str(datetime.datetime.utcnow()).split('.')[0], "%Y-%m-%d %H:%M:%S") #timezones are UTC delta = final - old secs_of_diff = delta.seconds - print "seconds: %s" % secs_of_diff + wikipedia.output("Execution time: %s" % secs_of_diff) wikipedia.stopme()

1 0

[Pywikipedia-l] SVN: [6022] trunk/pywikipedia/imageuncat.py
by multichill＠svn.wikimedia.org 25 Oct '08

25 Oct '08

Revision: 6022 Author: multichill Date: 2008-10-25 23:48:32 +0000 (Sat, 25 Oct 2008) Log Message: ----------- Some more templates to ignore. Modified Paths: -------------- trunk/pywikipedia/imageuncat.py Modified: trunk/pywikipedia/imageuncat.py =================================================================== --- trunk/pywikipedia/imageuncat.py 2008-10-25 21:20:32 UTC (rev 6021) +++ trunk/pywikipedia/imageuncat.py 2008-10-25 23:48:32 UTC (rev 6022) @@ -262,6 +262,7 @@ u'Cz', u'Da', u'De', + u'De-cc-by-sa-2.0', u'Debora Cordeiro', u'Diq', u'DMonniaux', @@ -343,6 +344,7 @@ u'GFDL-retouched', u'GFDL-Samoborac', u'GFDL-self', + u'GFDL-Self', u'GFDL-self-en', u'GFDL-user', u'GFDL-user-als', @@ -547,6 +549,7 @@ u'Na', u'Nah', u'Namespace', + u'NAMESPACE', u'Nap', u'NAUMANN', u'Nb', @@ -589,6 +592,7 @@ u'Open Font', u'Openphotoreview', u'Or', + u'Originally uploaded', u'Os', u'OsborneFossils', u'OTrondal', @@ -597,6 +601,8 @@ u'OTRS pending', u'Pa', u'Pag', + u'PAGENAME', + u'PAGENAMEE', u'Painting', u'Pam', u'Pap', @@ -1123,6 +1129,7 @@ u'Tet', u'Tg', u'Tgl', + u'Tintazul', u'Th', u'ThomasBredolCredit2', u'ThomasBredolCredit3', @@ -1150,6 +1157,8 @@ u'UN map', u'Ur', u'User:FlickreviewR/reviewed-pass', + u'User:Fir0002/20D', + u'USDA', u'UWiscCIMSS', u'Uz', u'Ve',

1 0

[Pywikipedia-l] SVN: [6021] trunk/pywikipedia/commonsdelinker/delinker.py
by btongminh＠svn.wikimedia.org 25 Oct '08

25 Oct '08

Revision: 6021 Author: btongminh Date: 2008-10-25 21:20:32 +0000 (Sat, 25 Oct 2008) Log Message: ----------- Apparently UserBlocked is not always two items long. Modified Paths: -------------- trunk/pywikipedia/commonsdelinker/delinker.py Modified: trunk/pywikipedia/commonsdelinker/delinker.py =================================================================== --- trunk/pywikipedia/commonsdelinker/delinker.py 2008-10-25 20:27:59 UTC (rev 6020) +++ trunk/pywikipedia/commonsdelinker/delinker.py 2008-10-25 21:20:32 UTC (rev 6021) @@ -135,7 +135,7 @@ try: result = self.replace_image(image, site, title, summary, replacement) except wikipedia.UserBlocked, e: - output(u'Warning! Blocked on %s by %s.' % (e[0], e[1])) + output(u'Warning! Blocked %s.' % tuple(e)) except wikipedia.CaptchaError, e: output(u'%s Warning! Captcha encountered at %s.' % (self, site)) if (lang, family) not in skipped_images:

1 0

← Newer
1
2
3
4
5
6
7
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

pywikibot October 2008