Refactor miscellaneous functions.

1 files changed, 15 insertions, 14 deletions

diff --git a/lib/handlers.ml b/lib/handlers.ml
index 21d3ea8..7d2fe8d 100644
--- a/lib/handlers.ml
+++ b/lib/handlers.ml
@@ -22,27 +22,27 @@ module Repo = struct
     let authors = [ "John Pork"; "Sebastian Jellybean" ] in
     Views.Repo.summary (repo req) branches commits authors |> Dream_html.respond
 
-  let refs req =
-    let* branches = all_branches (repo req) in
-    Views.Repo.refs (repo req) branches |> Dream_html.respond
-
   let log req =
     let* commits = recent_commits (repo req) 100 in
     Views.Repo.log (repo req) commits |> Dream_html.respond
 
-  let tree_head req =
+  let files_at_head req =
     let* tree = head_tree (repo req) in
-    Views.Repo.tree (repo req) tree |> Dream_html.respond
+    Views.Repo.files (repo req) tree |> Dream_html.respond
 
-  let tree_id req =
+  let files_id req =
     let id = id_of_req req in
     let* tree = tree_of_id (repo req) id in
-    Views.Repo.tree (repo req) tree |> Dream_html.respond
+    Views.Repo.files (repo req) tree |> Dream_html.respond
 
-  let blob_id req =
+  let file_id req =
     let id = id_of_req req in
     let* blob = blob_of_id (repo req) id in
-    Views.Repo.blob (repo req) blob |> Dream_html.respond
+    Views.Repo.file (repo req) blob |> Dream_html.respond
+
+  let refs req =
+    let* branches = all_branches (repo req) in
+    Views.Repo.refs (repo req) branches |> Dream_html.respond
 
   let commit req =
     let id = id_of_req req in
@@ -58,11 +58,12 @@ let all_handlers =
         Repo.
           [
             get "/" summary;
-            get "/refs/" refs;
+            get "/summary/" summary;
             get "/log/" log;
-            get "/tree/" tree_head;
-            get "/tree/:id" tree_id;
-            get "/blob/:id" blob_id;
+            get "/files/" files_at_head;
+            get "/files/:id" files_id;
+            get "/file/:id" file_id;
+            get "/refs/" refs;
             get "/commit/:id" commit;
           ];
       get "/static/**" (static "./lib/static");