Move the URL resolving for data-uri into the ReaderFactory. This can be used for custom error messages on url resolving. #54

Author: Horcrux7

src/com/inet/lib/less/ReaderFactory.java

@@ -52,6 +52,30 @@ public InputStream openStream( URL url ) throws IOException {
         return url.openStream();
     }
 
+    /**
+     * Open an InputStream for the given URL. This is used for inlining images via data-uri.
+     * 
+     * @param baseURL
+     *            the URL of the top less file
+     * @param urlStr
+     *            the absolute or relative URL that should be open
+     * @param relativeUrlStr
+     *            relative URL of the less script
+     * @return the stream, never null
+     * @throws IOException
+     *             If any I/O error occur on reading the URL.
+     */
+    public InputStream openStream( URL baseURL, String urlStr, String relativeUrlStr ) throws IOException {
+        URL url = new URL( baseURL, urlStr );
+        try {
+            return openStream( url );
+        } catch( Exception e ) {
+            // try rewrite location independent of option "rewrite-urls" for backward compatibility, this is not 100% compatible with Less CSS
+            url = new URL( new URL( baseURL, relativeUrlStr ), urlStr );
+            return openStream( url );
+        }
+    }
+
     /**
      * Create a Reader for the given URL.
      * 

src/com/inet/lib/less/UrlUtils.java

@@ -169,18 +169,10 @@ static double getColor( Expression param, CssFormatter formatter ) throws LessEx
      * @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 );
         InputStream input;
-        url = new URL( url, urlStr );
         try {
-            try {
-                input = formatter.getReaderFactory().openStream( url );
-            } catch( Exception e ) {
-                // try rewrite location independent of option "rewrite-urls" for backward compatibility, this is not 100% compatible with Less CSS
-                url = new URL( new URL( formatter.getBaseURL(), relativeUrlStr ), urlStr );
-                input = formatter.getReaderFactory().openStream( url );
-            }
+            input = formatter.getReaderFactory().openStream( formatter.getBaseURL(), urlStr, relativeUrlStr );
         } catch( Exception e ) {
             boolean quote = urlString != urlStr;
             String rewrittenUrl;