jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/577177 )
Change subject: [IMPR] use original tag name
......................................................................
[IMPR] use original tag name
see https://www.flickr.com/services/api/misc.tags.html
Change-Id: I30e563f94da9fc6d17cd79c154aecf90fd497c96
---
M scripts/flickrripper.py
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py
index 18fd6cc..f4c9631 100755
--- a/scripts/flickrripper.py
+++ b/scripts/flickrripper.py
@@ -141,12 +141,16 @@
return site.getFilesFromAnHash(base64.b16encode(hashObject.digest()))
-def getTags(photoInfo):
+def getTags(photoInfo, raw=False):
"""Get all the tags on a photo."""
result = []
for tag in photoInfo.find('photo').find('tags').findall('tag'):
- result.append(tag.text.lower())
-
+ if raw:
+ # use original tag name
+ # see https://www.flickr.com/services/api/misc.tags.html
+ result.append(tag.attrib['raw'].lower())
+ else:
+ result.append(tag.text.lower())
return result
--
To view, visit https://gerrit.wikimedia.org/r/577177
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I30e563f94da9fc6d17cd79c154aecf90fd497c96
Gerrit-Change-Number: 577177
Gerrit-PatchSet: 6
Gerrit-Owner: Shizhao <shizhao(a)gmail.com>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: Shizhao <shizhao(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/577181 )
Change subject: [FIX] Username with illegal characters as titles, need to be cleaned up
......................................................................
[FIX] Username with illegal characters as titles, need to be cleaned up
Change-Id: Idafbd70e2058684c66d9b6340f8b80658b2e0a12
---
M scripts/flickrripper.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Xqt: Looks good to me, approved
Shizhao: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py
index c0038ee..18fd6cc 100755
--- a/scripts/flickrripper.py
+++ b/scripts/flickrripper.py
@@ -171,6 +171,7 @@
if not site:
site = pywikibot.Site('commons', 'commons')
username = photoInfo.find('photo').find('owner').attrib['username']
+ username = cleanUpTitle(username)
title = photoInfo.find('photo').find('title').text
if title:
title = cleanUpTitle(title)
@@ -191,6 +192,7 @@
else:
# Use the id of the photo as last resort.
title = photoInfo.find('photo').attrib['id']
+
fileformat = photoInfo.find('photo').attrib['originalformat']
if pywikibot.Page(site, 'File:{} - {} - {}.{}'
.format(title, project, username, fileformat)).exists():
--
To view, visit https://gerrit.wikimedia.org/r/577181
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Idafbd70e2058684c66d9b6340f8b80658b2e0a12
Gerrit-Change-Number: 577181
Gerrit-PatchSet: 3
Gerrit-Owner: Shizhao <shizhao(a)gmail.com>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: Shizhao <shizhao(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/576071 )
Change subject: Change getFilename() for support all file format in flickr
......................................................................
Change getFilename() for support all file format in flickr
from flickr API get file format
Change-Id: I0faf9be7310b6e12a113c1fcfe29917aa5b7496f
---
M scripts/flickrripper.py
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py
index 610fab0..5873ed5 100755
--- a/scripts/flickrripper.py
+++ b/scripts/flickrripper.py
@@ -191,18 +191,19 @@
else:
# Use the id of the photo as last resort.
title = photoInfo.find('photo').attrib['id']
-
- if pywikibot.Page(site, 'File:{} - {} - {}.jpg'
- .format(title, project, username)).exists():
+ fileformat = photoInfo.find('photo').attrib['originalformat']
+ if pywikibot.Page(site, 'File:{} - {} - {}.{}'
+ .format(title, project, username, fileformat)).exists():
i = 1
while True:
- name = '{} - {} - {} ({}).jpg'.format(title, project, username, i)
+ name = '{} - {} - {} ({}).{}'.format(title, project, username,
+ i, fileformat)
if pywikibot.Page(site, 'File:' + name).exists():
i += 1
else:
return name
else:
- return '{} - {} - {}.jpg'.format(title, project, username)
+ return '{} - {} - {}.{}'.format(title, project, username, fileformat)
def cleanUpTitle(title):
--
To view, visit https://gerrit.wikimedia.org/r/576071
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I0faf9be7310b6e12a113c1fcfe29917aa5b7496f
Gerrit-Change-Number: 576071
Gerrit-PatchSet: 11
Gerrit-Owner: Shizhao <shizhao(a)gmail.com>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
Gerrit-CC: Zoranzoki21 <zorandori4444(a)gmail.com>