Changeset 16988 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-08-30T23:20:05+02:00 (4 years ago)

Author:

simon04

Message:

Extract and test Mediawiki.getImageUrl

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (1 diff)
• Mediawiki.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -1085 +1085 @@
                 }
             } else {
-                final String fnMD5 = Utils.md5Hex(fn);
-                url = b + fnMD5.substring(0, 1) + '/' + fnMD5.substring(0, 2) + '/' + fn;
+                url = Mediawiki.getImageUrl(b, fn);
             }
             result = getIfAvailableHttp(url, type);

trunk/src/org/openstreetmap/josm/tools/Mediawiki.java

@@ -74 +74 @@
         return Optional.empty();
     }
+
+    /**
+     * Computes the URL for the given filename on the MediaWiki server
+     * @param fileBaseUrl the base URL of the file MediaWiki storage, such as {@code "https://upload.wikimedia.org/wikipedia/commons/"}
+     * @param filename    the filename
+     * @return the URL for the given filename on the MediaWiki server
+     * @see <a href="https://www.mediawiki.org/wiki/Manual:$wgHashedUploadDirectory">MediaWiki $wgHashedUploadDirectory</a>
+     */
+    public static String getImageUrl(String fileBaseUrl, String filename) {
+        final String md5 = Utils.md5Hex(filename);
+        return String.join("/", Utils.strip(fileBaseUrl, "/"), md5.substring(0, 1), md5.substring(0, 2), filename);
+    }
 }