Use the ReaderFactory also for loading of Image URLs. fix #55

Author: Horcrux7

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

@@ -116,6 +116,8 @@ private static class SharedState {
 
     private LessExtendMap                   lessExtends = state.lessExtends;
 
+    private ReaderFactory                   readerFactory;
+
     private CssOutput currentOutput;
 
     private final static char[]             DIGITS    = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
@@ -170,12 +172,18 @@ private CssFormatter copy( @Nullable StringBuilder output ) {
     /**
      * Format the a parsed less file.
      *
-     * @param parser the parser result
-     * @param baseURL the URL of the less file
-     * @param target the output of the resulting string
-     */
-    void format( LessParser parser, URL baseURL, StringBuilder target ) {
+     * @param parser
+     *            the parser result
+     * @param baseURL
+     *            the URL of the less file
+     * @param readerFactory
+     *            A factory for the readers for imports.
+     * @param target
+     *            the output of the resulting string
+     */
+    void format( LessParser parser, URL baseURL, ReaderFactory readerFactory, StringBuilder target ) {
         state.baseURL = baseURL;
+        this.readerFactory = readerFactory;
         addVariables( parser.getVariables() );
         state.isReference = false;
 
@@ -304,6 +312,14 @@ URL getBaseURL() {
         return state.baseURL;
     }
 
+    /**
+     * Get the reader factory.
+     * @return the factory
+     */
+    ReaderFactory getReaderFactory() {
+        return readerFactory;
+    }
+
     /**
      * Get a variable expression from the current stack
      *

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

@@ -78,7 +78,7 @@ public static String compile( URL baseURL, String lessData, boolean compress, Re
             StringBuilder builder = new StringBuilder();
             CssFormatter formatter = compress ? new CompressCssFormatter() :  new CssFormatter();
             parser.parseLazy( formatter );
-            formatter.format( parser, baseURL, builder );
+            formatter.format( parser, baseURL, readerFactory, builder );
             return builder.toString();
         } catch( LessException ex ) {
             throw ex;

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

@@ -27,17 +27,31 @@
 package com.inet.lib.less;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 
 /**
- * A factory to create a reader for parsing. You can override it to resolve the URL, implement a cache or use another
+ * A factory to create a reader and streams for parsing. You can override it to resolve the URL, implement a cache or use another
  * encoding as UFT-8.
  */
 public class ReaderFactory {
 
+    /**
+     * Open an InputStream for the given URL.
+     * 
+     * @param url
+     *            the url, not null
+     * @return the stream, never null
+     * @throws IOException
+     *             If any I/O error occur on reading the URL.
+     */
+    public InputStream openStream( URL url ) throws IOException {
+        return url.openStream();
+    }
+
     /**
      * Create a Reader for the given URL.
      * 
@@ -48,6 +62,6 @@ public class ReaderFactory {
      *             If any I/O error occur on reading the URL.
      */
     public Reader create( URL url ) throws IOException {
-        return new InputStreamReader( url.openStream(), StandardCharsets.UTF_8 );
+        return new InputStreamReader( openStream( url ), StandardCharsets.UTF_8 );
     }
 }

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

@@ -174,7 +174,7 @@ static void dataUri( CssFormatter formatter, String relativeURL, final String ur
         url = new URL( url, urlStr );
         InputStream input;
         try {
-            input = url.openStream();
+            input = formatter.getReaderFactory().openStream( url );
         } catch( Exception e ) {
             formatter.append( "url(" ).append( urlString ).append( ')' );
             return;