Support to other default pages

src/Pretzel/WebHost/FileContentProvider.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.IO;
 
 namespace Pretzel
@@ -33,6 +34,21 @@ public bool IsAvailable(string request)
  return File.Exists(file);
  }
 
+ /// <summary>
+ /// Checks if request points to a directory
+ /// </summary>
+ /// <param name="request"></param>
+ /// <returns></returns>
+ public bool IsDirectory(string request)
+ {
+ if (string.IsNullOrEmpty(basePath))
+ {
+ throw new InvalidOperationException("basePath required");
+ }
+
+ return Directory.Exists(GetFullPath(request));
+ }
+
  /// <summary>
  /// Read file
  /// </summary>
@@ -78,23 +94,40 @@ public byte[] GetBinaryContent(string request)
  return fileContents;
  }
 
+ private static readonly string[] defaultPages = { "index.html", "index.htm", "default.htm" };
+
  /// <summary>
  /// Get the path for the page to send to the user
  /// </summary>
  /// <param name="request"> </param>
  /// <returns>Path to file</returns>
  private string GetRequestedPage(string request)
  {
- string requestString = basePath + request;
- //#AS:2013/05/02: quick and dirty fix for issue #125
- requestString = requestString.Replace("%20", " ");
- if (requestString.EndsWith("/", StringComparison.Ordinal))
+ string requestString = GetFullPath(request);
+
+ //if it's a directory, try to find its default page
+ if (IsDirectory(request))
  {
- // Load index.html as default
- requestString = Path.Combine(requestString, "index.html");
+ string defaultPage = defaultPages
+ .Select(page => Path.Combine(requestString, page))
+ .Where(page => File.Exists(page))
+ .FirstOrDefault();
+
+ if (defaultPage != null)
+ return defaultPage;
  }
 
  return requestString;
  }
+
+ /// <summary>
+ /// Combines and unescapes the path for the request
+ /// </summary>
+ /// <param name="request"></param>
+ /// <returns>Path to the file</returns>
+ private string GetFullPath(string request) 
+ {
+ return Uri.UnescapeDataString(Path.Combine(basePath + request));
+ }
  }
 }

src/Pretzel/WebHost/IWebContent.cs

@@ -6,6 +6,7 @@ public interface IWebContent
  {
  void SetBasePath(string path);
  bool IsAvailable(string request);
+ bool IsDirectory(string request);
  string GetContent(string request);
  byte[] GetBinaryContent(string request);
  }

src/Pretzel/WebHost/MemoryContentProvider.cs

@@ -44,5 +44,16 @@ public byte[] GetBinaryContent(string request)
  {
  throw new NotImplementedException();
  }
+
+ /// <summary>
+ /// Checks if request points to a directory
+ /// </summary>
+ /// <param name="request"></param>
+ /// <returns></returns>
+ public bool IsDirectory(string request)
+ {
+ return false;
+ }
+
  }
 }

src/Pretzel/WebHost/WebHost.cs

@@ -94,6 +94,12 @@ Task NewServerCallback(IDictionary<string, object> env)
  response.Headers["Content-Length"] = new[] { fileContents.Length.ToString(CultureInfo.InvariantCulture) };
  response.Write(new ArraySegment<byte>(fileContents));
  }
+ else if (content.IsDirectory(path) && !path.EndsWith("/")) 
+ {
+ //if path is a directory without trailing slash, redirects to the same url with a trailing slash
+ var response = new Response(env) { Status = "301 Moved Permanently" };
+ response.Headers["Location"] = new[] { String.Format("http://localhost:{0}{1}/", Port, path) };
+ }
  else
  {
  var response = new Response(env) { ContentType = path.MimeType() };