Mercurial Hosting > luan

diff src/luan/webserver/handlers/FileHandler.java @ 1167:7e6f28c769a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
better handlers
author Franklin Schmidt <fschmidt@gmail.com>
date Thu, 08 Feb 2018 19:06:31 -0700
parents 668f29bc52ea
children 312e4cadd508
line wrap: on
line diff
--- a/src/luan/webserver/handlers/FileHandler.java	Thu Feb 08 02:22:51 2018 -0700
+++ b/src/luan/webserver/handlers/FileHandler.java	Thu Feb 08 19:06:31 2018 -0700
@@ -14,9 +14,8 @@
 import luan.webserver.ResponseOutputStream;
 
 
-public final class FileHandler implements Handler {
-	public boolean showDirs = true;
-	private final File dir;
+public class FileHandler implements Handler {
+	final File dir;
 
 	public FileHandler() {
 		this(".");
@@ -35,40 +34,18 @@
 	public Response handle(Request request) {
 		try {
 			File file = new File(dir,request.path);
-			if( file.isFile() ) {
-				Response response = new Response();
-				response.body = new Response.Body( file.length(), new FileInputStream(file) );
-				return response;
-			}
-			if( request.path.endsWith("/") && file.isDirectory() && showDirs ) {
-				DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss zzz");
-				Response response = new Response();
-				response.headers.put( "content-type", "text/html; charset=utf-8" );
-				Writer writer = new OutputStreamWriter( new ResponseOutputStream(response) );
-				writer.write( "<!doctype html><html>" );
-				writer.write( "<head><style>td{padding: 2px 8px}</style></head>" );
-				writer.write( "<body>" );
-				writer.write( "<h1>Directory: "+request.path+"</h1>" );
-				writer.write( "<table border=0>" );
-				for( File child : file.listFiles() ) {
-					String name = child.getName();
-					if( child.isDirectory() )
-						name += '/';
-					writer.write( "<tr>" );
-					writer.write( "<td><a href='"+name+"'>"+name+"</a></td>" );
-					writer.write( "<td>"+child.length()+" bytes</td>" );
-					writer.write( "<td>"+fmt.format(new Date(child.lastModified()))+"</td>" );
-					writer.write( "</tr>" );
-				}
-				writer.write( "</table>" );
-				writer.write( "</body>" );
-				writer.write( "</html>" );
-				writer.close();
-				return response;
-			}
-			return null;
+			return handle(request,file);
 		} catch(IOException e) {
 			throw new RuntimeException(e);
 		}
 	}
+
+	Response handle(Request request,File file) throws IOException {
+		if( file.isFile() ) {
+			Response response = new Response();
+			response.body = new Response.Body( file.length(), new FileInputStream(file) );
+			return response;
+		}
+		return null;
+	}
 }