From c5ba1b304188393611916d6cf4904ad6055cf20c Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Tue, 5 May 2015 07:09:10 -0700
Subject: [PATCH] finish title pull

---
 route_handlers.go        | 10 +++++++++-
 templates/pages/add.html |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/route_handlers.go b/route_handlers.go
index 59ddc92..a2b163c 100644
--- a/route_handlers.go
+++ b/route_handlers.go
@@ -9,6 +9,7 @@ import (
 	"time"
 	"io/ioutil"
 	"regexp"
+	"strings"
 )
 
 func GetFlashes(session *sessions.Session) map[string]interface{} {
@@ -102,6 +103,10 @@ func LoginPostHandler(w http.ResponseWriter, r *http.Request) {
 // ?url=
 func addFormHandler(w http.ResponseWriter, r *http.Request, user *user.User) {
     var url = r.URL.Query().Get("url")
+    reHttp := regexp.MustCompile("^http://")
+    if ! reHttp.Match([]byte(url)) {
+        url = "http://" + url
+    } 
     resp, err := http.Get(url)
     if err != nil {
         fmt.Println("Error looking up link", url, ":", err)
@@ -112,7 +117,10 @@ func addFormHandler(w http.ResponseWriter, r *http.Request, user *user.User) {
         } else {
             re := regexp.MustCompile("< *[Tt][Ii][Tt][Ll][Ee] *>(.*)</ *[Tt][Ii][Tt][Ll][Ee] *>")
             title := re.FindStringSubmatch(string(body))
-            fmt.Println(title)
+            if title != nil {
+            	ShowTemplate("add", w, map[string]interface{}{"user": user, "link": url, "title": strings.TrimSpace(title[1])})
+            	return
+            }
         }
     }
     
diff --git a/templates/pages/add.html b/templates/pages/add.html
index b999f4a..e98f6b5 100644
--- a/templates/pages/add.html
+++ b/templates/pages/add.html
@@ -4,7 +4,7 @@
 <form class="form-add" action="/add" method="post" role="form" class="container col-form">
 <div class="row">
     <div class="col-xs-2">Link:</div><div class="col-xs-10"><input type="text" class="form-control" name="link" placeholder="Link" value="{{.link}}"/></div>
-    <div class="col-xs-2">Title:</div><div class="col-xs-10"><input type="text" class="form-control" name="title" placeholder="Title"/></div>
+    <div class="col-xs-2">Title:</div><div class="col-xs-10"><input type="text" class="form-control" name="title" placeholder="Title" value="{{.title}}"/></div>
     <div class="col-xs-2">Path:</div><div class="col-xs-10"><input type="text" class="form-control" name="path" placeholder="Path"/></div>
     <div class="col-xs-2">Description:</div><div class="col-xs-10"><textarea class="form-control" name="description" placeholder="Description"  rows="3" cols="80">{{.task.Description}}</textarea></div>
     <div class="col-xs-2"></div><div class="col-xs-10"><input class="btn btn-lg btn-primary btn-block" type="submit" value="Add Link" /></div>