r108695 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r108694‎ \| r108695 \| r108696 >
Date:	23:30, 11 January 2012
Author:	aaron
Status:	reverted (Comments)
Tags:
Comment:	Removed thumb/temp rewrites; such urls are not used anymore
Modified paths:	/trunk/extensions/SwiftMedia/wmf/rewrite.py (modified) (history) /trunk/extensions/SwiftMedia/wmf/tests/rewriteRegexTest.py (modified) (history)

Diff [purge]

Index: trunk/extensions/SwiftMedia/wmf/tests/rewriteRegexTest.py
—	—	@@ -4,18 +4,16 @@
5	5	# (a) http://upload.wikimedia.org/<proj>/<lang>/.*
6	6	# => http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-public/.*
7	7	# (b) http://upload.wikimedia.org/<proj>/<lang>/archive/.*
8		-# => http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-public/archive.*
	8	+# => http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-public/archive/.*
9	9	# (c) http://upload.wikimedia.org/<proj>/<lang>/thumb/.*
10	10	# => http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-thumb/.*
11	11	# (d) http://upload.wikimedia.org/<proj>/<lang>/thumb/archive/.*
12	12	# => http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-thumb/archive/.*
13		-# (e) http://upload.wikimedia.org/<proj>/<lang>/thumb/temp/.*
14		-# => http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-thumb/temp/.*
15		-# (f) http://upload.wikimedia.org/<proj>/<lang>/temp/.*
	13	+# (e) http://upload.wikimedia.org/<proj>/<lang>/temp/.*
16	14	# => http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-temp/.*
17	15
18	16	# The regex to test (for rewrite.py)
19		~~-regex = r'^/(?P<proj>[^/]+)/(?P<lang>[^/]+)/((?P<zone>thumb\|temp)/)?(?P<path>((temp\|archive)/)?[0-9a-f]/(?P<shard>[0-9a-f]{2})/.+)$'~~
	17	+regex = r'^/(?P<proj>[^/]+)/(?P<lang>[^/]+)/((?P<zone>thumb\|temp)/)?(?P<path>(archive/)?[0-9a-f]/(?P<shard>[0-9a-f]{2})/.+)$'
20	18
21	19	# [url,proj,lang,zone,shard,path]
22	20	cases = []
—	—	@@ -27,8 +25,6 @@
28	26	'wikipedia', 'commons', 'thumb', 'ab', 'a/ab/file.jpg'] )
29	27	cases.append( ['/wikipedia/commons/thumb/archive/a/ab/file.jpg',
30	28	'wikipedia', 'commons', 'thumb', 'ab', 'archive/a/ab/file.jpg'] )
31		~~-cases.append( ['/wikipedia/commons/thumb/temp/a/ab/file.jpg',~~
32		~~- 'wikipedia', 'commons', 'thumb', 'ab', 'temp/a/ab/file.jpg'] )~~
33	29	cases.append( ['/wikipedia/commons/temp/a/ab/file.jpg',
34	30	'wikipedia', 'commons', 'temp', 'ab', 'a/ab/file.jpg'] )
35	31
Index: trunk/extensions/SwiftMedia/wmf/rewrite.py
—	—	@@ -177,16 +177,14 @@
178	178	# (a) http://upload.wikimedia.org/<proj>/<lang>/.*
179	179	# => http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-public/.*
180	180	# (b) http://upload.wikimedia.org/<proj>/<lang>/archive/.*
181		- # => http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-public/archive.*
	181	+ # => http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-public/archive/.*
182	182	# (c) http://upload.wikimedia.org/<proj>/<lang>/thumb/.*
183	183	# => http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-thumb/.*
184	184	# (d) http://upload.wikimedia.org/<proj>/<lang>/thumb/archive/.*
185	185	# => http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-thumb/archive/.*
186		- # (e) http://upload.wikimedia.org/<proj>/<lang>/thumb/temp/.*
187		- # => http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-thumb/temp/.*
188		- # (f) http://upload.wikimedia.org/<proj>/<lang>/temp/.*
	186	+ # (e) http://upload.wikimedia.org/<proj>/<lang>/temp/.*
189	187	# => http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-temp/.*
190		~~- match = re.match(r'^/(?P<proj>[^/]+)/(?P<lang>[^/]+)/((?P<zone>thumb\|temp)/)?(?P<path>((temp\|archive)/)?[0-9a-f]/(?P<shard>[0-9a-f]{2})/.+)$', req.path)~~
	188	+ match = re.match(r'^/(?P<proj>[^/]+)/(?P<lang>[^/]+)/((?P<zone>thumb\|temp)/)?(?P<path>(archive/)?[0-9a-f]/(?P<shard>[0-9a-f]{2})/.+)$', req.path)
191	189	if match:
192	190	# Get the repo zone (if not provided that means "public")
193	191	zone = match.group('zone') if match.group('zone') else 'public'

Follow-up revisions

Revision	Commit summary	Author	Date
r108706	Reverted r108695: as these are still used by upload stash and I don't feel li...	aaron	02:39, 12 January 2012

Comments

#Comment by Aaron Schulz (talk | contribs) 23:35, 11 January 2012

Scaptrap due to $wgUploadStashScalerBaseUrl.

#Comment by Bhartshorne (talk | contribs) 00:34, 12 January 2012

from http://noc.wikimedia.org/conf/highlight.php?file=CommonSettings.php:

 $wgUploadStashScalerBaseUrl = "$urlprotocol//upload.wikimedia.org/$site/$lang/thumb/temp";

It should be changed to

 $wgUploadStashScalerBaseUrl = "$urlprotocol//upload.wikimedia.org/$site/$lang/temp";

Aaron - correct me if that's incorrect! :)

Status & tagging log

19:38, 26 January 2012 Reedy (talk | contribs) changed the tags for r108695 [removed: scaptrap]
02:38, 12 January 2012 Aaron Schulz (talk | contribs) changed the status of r108695 [removed: ok added: reverted]
00:35, 12 January 2012 Bhartshorne (talk | contribs) changed the status of r108695 [removed: new added: ok]
23:35, 11 January 2012 Aaron Schulz (talk | contribs) changed the tags for r108695 [added: scaptrap]