Use again ReaderFactory.openStream(URL,String,String) for data-uri.

i-net-software · Dec 7, 2020 · 2752b71 · 2752b71 · jcompagner · Dec 8, 2020
1 parent 88d5e0a
commit 2752b71
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/com/inet/lib/less/UrlUtils.java b/src/com/inet/lib/less/UrlUtils.java
@@ -153,20 +153,18 @@ static void svgGradient( CssFormatter formatter, List<Expression> parameters ) {
      * @throws IOException If any I/O errors occur on reading the content
      */
     static void dataUri( CssFormatter formatter, String relativeUrlStr, final String urlString, String type ) throws IOException {
-        URL url = formatter.getBaseURL();
         String urlStr = removeQuote( urlString );
-        url = new URL( url, urlStr );
-        if( !formatter.isRewriteUrlOff() ) {
-            url = new URL( new URL( formatter.getBaseURL(), relativeUrlStr ), urlStr );
-        }
         InputStream input = null;
         try {
             try {
-                input = formatter.getReaderFactory().openStream( url );
+                input = formatter.getReaderFactory().openStream( formatter.getBaseURL(), urlStr, relativeUrlStr );
             } catch( Exception e ) {
-                // try rewrite location independent of option "rewrite-urls" for backward
-                // compatibility, this is not 100% compatible with Less CSS
                 // also if is a root url, remove that to see if the file can be found right besides the base less file.
+                URL url = formatter.getBaseURL();
+                url = new URL( url, urlStr );
+                if( !formatter.isRewriteUrlOff() ) {
+                    url = new URL( new URL( formatter.getBaseURL(), relativeUrlStr ), urlStr );
+                }
                 url = new URL( formatter.getBaseURL(), urlStr.startsWith( "/" ) ? urlStr.substring( 1 ) : urlStr );
                 input = formatter.getReaderFactory().openStream( url );
             }

diff --git a/test/com/inet/lib/less/RewriteUrls/off.css b/test/com/inet/lib/less/RewriteUrls/off.css
@@ -1,26 +1,26 @@
 .rule2 {
   url1: url('../image.jpg');
-  url2: url('../image.jpg');
+  url2: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
   url3: url('subfolder1/image.jpg');
   url4: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
   url5: url('../DoesNotExists.jpg');
   url6: url('subfolder1/DoesNotExists.jpg');
   url7: url('../../main.jpg');
-  url8: url('../../main.jpg');
+  url8: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
   url9: url('http://test.com');
 }
 .rule1 {
   url1: url('image.jpg');
-  url2: url('image.jpg');
+  url2: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
   url3: url('subfolder1/image.jpg');
   url4: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
   url5: url('DoesNotExists.jpg');
   url6: url('subfolder1/DoesNotExists.jpg');
   url7: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
   url8: url('../main.jpg');
-  url9: url('../main.jpg');
+  url9: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
   url10: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
   url11: url('/main.jpg');
   url12: url('subfolder2/sub.jpg');
-  url13: url('subfolder2/sub.jpg');
+  url13: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
 }