[MediaWiki-commits] [Gerrit] Make custom file ending optional for thumbnails in MediaFil... - change (analytics...source)

[QChris (Code Review)]

QChris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/194843

Change subject:  Make custom file ending optional for thumbnails in 
MediaFileUrlParser
......................................................................

Make custom file ending optional for thumbnails in MediaFileUrlParser

Change-Id: Idbac5534634858aa8a6bd836b6708b7ed64a6999
---
M changelog.md
M 
refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/MediaFileUrlParser.java
M 
refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestMediaFileUrlParser.java
3 files changed, 14 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source 
refs/changes/43/194843/1

diff --git a/changelog.md b/changelog.md
index d8d11a0..6ebf6aa 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,7 @@
 * Start counting www.wikidata.org hits
 * Start counting www.mediawiki.org hits
 * Consistently count search attempts
+* Make custom file ending optional for thumbnails in MediaFileUrlParser
 
 ## v0.0.7
 * Add Referer classifier
diff --git 
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/MediaFileUrlParser.java
 
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/MediaFileUrlParser.java
index 0574f96..a039988 100644
--- 
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/MediaFileUrlParser.java
+++ 
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/MediaFileUrlParser.java
@@ -82,7 +82,7 @@
                     + "(ogg)"                //   group 12: audio files
                     + "|(gif|jpe?g|png)"     //   group 13: images
                     + "|(webm|ogv)"          //   group 14: movies
-                + "))"
+                + "))?"
             + ")?");
 
     /**
diff --git 
a/refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestMediaFileUrlParser.java
 
b/refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestMediaFileUrlParser.java
index dd9e216..d6b7274 100644
--- 
a/refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestMediaFileUrlParser.java
+++ 
b/refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestMediaFileUrlParser.java
@@ -386,6 +386,18 @@
                 180);
     }
 
+    public void testUpperCaseOriginal() {
+        assertOriginal("/wikipedia/meta/7/74/Wikibooks-logo_sister_1x.PNG");
+    }
+
+    public void testUpperCaseThumbWithoutOwnExtension() {
+        assertImage(
+                
"/wikipedia/commons/thumb/9/93/Rathaus_Wittenberg.JPG/440px-Rathaus_Wittenberg.JPG",
+                "/wikipedia/commons/9/93/Rathaus_Wittenberg.JPG",
+                440
+                );
+    }
+
     // Test uploaded media files; Specialities --------------------------------
 
     public void testMediaThumbQLow() {

-- 
To view, visit https://gerrit.wikimedia.org/r/194843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbac5534634858aa8a6bd836b6708b7ed64a6999
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: QChris <christ...@quelltextlich.at>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits