diff --git a/layouts.go b/layouts.go index 40e4270..4030fd6 100644 --- a/layouts.go +++ b/layouts.go @@ -1,23 +1,62 @@ package main import ( - "html/template" + //"html/template" + "text/template" "io" ) var emptyInterface interface{} + var headTemplate = template.Must(template.New("head").Parse(headTemplateHTML)) var headTemplateHTML = ` + {{.title}} ` +var navbarTemplate = template.Must(template.New("navbar").Parse(navbarTemplateHTML)) +var navbarTemplateHTML = ` +
+
+
+ + + + + + filesrv +
+

+

+ +
+
+
+
+ +` +var containerBeginTemplate = template.Must(template.New("containerBegin").Parse(containerBeginTemplateHTML)) +var containerBeginTemplateHTML = ` +
+
+
+
+` + var tailTemplate = template.Must(template.New("tail").Parse(tailTemplateHTML)) var tailTemplateHTML = ` +
+
+
{{if .}} {{end}} @@ -27,11 +66,22 @@ var tailTemplateHTML = ` var formFileUploadTemplate = template.Must(template.New("formFileUpload").Parse(formFileUploadTemplateHTML)) var formFileUploadTemplateHTML = ` -
-
-
-
-
+
+
+
+ + + + + +
+ + +
+
+
+
{{/* hero-unit */}} +
{{/* span9 */}} ` var listTemplate = template.Must(template.New("list").Parse(listTemplateHTML)) @@ -39,10 +89,12 @@ var listTemplateHTML = ` {{if .}} +{{end}} ` func UploadPage(w io.Writer) (err error) { @@ -50,11 +102,19 @@ func UploadPage(w io.Writer) (err error) { if (err != nil) { return err } + err = navbarTemplate.Execute(w, nil) + if (err != nil) { + return err + } + err = containerBeginTemplate.Execute(w, nil) + if (err != nil) { + return err + } err = formFileUploadTemplate.Execute(w, &emptyInterface) if (err != nil) { return err } - err = tailTemplate.Execute(w, map[string]string{}) + err = tailTemplate.Execute(w, map[string]string{"footer" : ""}) if (err != nil) { return err } @@ -66,15 +126,42 @@ func ListFilesPage(w io.Writer, files []File) (err error) { if (err != nil) { return err } + err = navbarTemplate.Execute(w, nil) + if (err != nil) { + return err + } + err = containerBeginTemplate.Execute(w, nil) + if (err != nil) { + return err + } err = listTemplate.Execute(w, files) if (err != nil) { return err } - //err = tailTemplate.Execute(w, map[string]string{"footer" : "herp til you derp 2013"}) - err = tailTemplate.Execute(w, &emptyInterface) + err = tailTemplate.Execute(w, map[string]string{"footer" : ""}) if (err != nil) { return err } return } + + + + + + + + + + +// Bootstrap Responsive v2.2.2 +// Copyright 2012 Twitter, Inc +// Licensed under the Apache License v2.0 +// http://www.apache.org/licenses/LICENSE-2.0 +// Designed and built with all the love in the world @twitter by @mdo and @fat. +var bootstrapCSS = ` + @-ms-viewport{width:device-width}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .dropdown-menu a:hover{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:hover{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}} +` + + diff --git a/server.go b/server.go index e8b44bb..aed9e71 100644 --- a/server.go +++ b/server.go @@ -13,6 +13,8 @@ import ( "time" ) +var defaultPageLimit int = 25 + func serverErr(w http.ResponseWriter, r *http.Request, e error) { log.Printf("Error: %s", e) LogRequest(r,503) @@ -44,19 +46,6 @@ func chunkURI(uri string) (chunks []string) { return strings.Split(str, "/") } -/* given an url.URL.RawQuery, get a dictionary in return */ -func parseRawQuery(qry string) (params map[string]string) { - qryChunks := strings.Split(qry, "&") - params = make(map[string]string, len(qryChunks)) - for _, chunk := range qryChunks { - p := strings.SplitN(chunk, "=", 2) - if (len(p) == 2) { - params[p[0]] = p[1] - } - } - return params -} - /* kindof a common log type output */ func LogRequest(r *http.Request, statusCode int) { var addr string @@ -192,8 +181,6 @@ func routeFilesPOST(w http.ResponseWriter, r *http.Request) { filename = fmt.Sprintf("%s%s", str, p_ext) } } - log.Printf("%q\n", filename) - log.Printf("%t\n", p_ext) exists, err := HasFileByFilename(filename) if (err == nil && !exists) { @@ -244,8 +231,12 @@ func routeFilesPOST(w http.ResponseWriter, r *http.Request) { return } - io.WriteString(w, - fmt.Sprintf("/f/%s\n", filename, filename)) + if (strings.Contains(r.Header.Get("Accept"), "text/html")) { + io.WriteString(w, + fmt.Sprintf("/f/%s\n", filename, filename)) + } else { + io.WriteString(w, fmt.Sprintf("/f/%s\n", filename)) + } LogRequest(r,200) } @@ -310,9 +301,9 @@ func routeRoot(w http.ResponseWriter, r *http.Request) { // Show a page of most recent images, and tags, and uploaders ... w.Header().Set("Content-Type", "text/html") - //iter := gfs.Find(bson.M{"uploadDate": bson.M{"$gt": time.Now().Add(-time.Hour)}}).Limit(10).Iter() + //iter := gfs.Find(bson.M{"uploadDate": bson.M{"$gt": time.Now().Add(-time.Hour)}}).Limit(defaultPageLimit).Iter() var files []File - err := gfs.Find(nil).Sort("-metadata.timestamp").Limit(40).All(&files) + err := gfs.Find(nil).Sort("-metadata.timestamp").Limit(defaultPageLimit).All(&files) if (err != nil) { serverErr(w,r,err) return @@ -358,23 +349,22 @@ func routeKeywords(w http.ResponseWriter, r *http.Request) { LogRequest(r,404) http.NotFound(w,r) return + } else if (len(uriChunks) == 1 || (len(uriChunks) == 2 && len(uriChunks[1]) == 0)) { + routeRoot(w,r) + return } log.Printf("K: %s (%d)", uriChunks, len(uriChunks)) - params := parseRawQuery(r.URL.RawQuery) - log.Printf("K: params: %s", params) var iter *mgo.Iter - if (len(uriChunks) == 1) { - // show a sorted list of tag name links - iter = gfs.Find(bson.M{"metadata": bson.M{"keywords": uriChunks[1] } }).Sort("$natural").Limit(100).Iter() - } else if (len(uriChunks) == 2) { - iter = gfs.Find(bson.M{"metadata": bson.M{"keywords": uriChunks[1] } }).Limit(10).Iter() - } else if (uriChunks[2] == "r") { + if (uriChunks[len(uriChunks)-1] == "r") { // TODO determine how to show a random image by keyword ... log.Println("random isn't built yet") LogRequest(r,404) return + } else if (len(uriChunks) == 2) { + log.Println(uriChunks[1]) + iter = gfs.Find(bson.M{"metadata.keywords": uriChunks[1] }).Sort("-metadata.timestamp").Limit(defaultPageLimit).Iter() } var files []File @@ -383,24 +373,36 @@ func routeKeywords(w http.ResponseWriter, r *http.Request) { serverErr(w,r,err) return } + log.Println(len(files)) + ListFilesPage(w, files) + + LogRequest(r,200) +} + +func routeMD5s(w http.ResponseWriter, r *http.Request) { + uriChunks := chunkURI(r.URL.Path) + if (r.Method != "GET") { + LogRequest(r,404) + http.NotFound(w,r) + return + } else if (len(uriChunks) != 2) { + // they didn't give an MD5, re-route + routeRoot(w,r) + return + } + + var files []File + err := gfs.Find(bson.M{"md5": uriChunks[1]}).Sort("-metadata.timestamp").Limit(defaultPageLimit).All(&files) + if (err != nil) { + serverErr(w,r,err) + return + } ListFilesPage(w, files) LogRequest(r,200) } -func writeList(w http.ResponseWriter, iter *mgo.Iter) { - var this_file File - fmt.Fprintf(w, "\n") -} - -// Show a page of all the uploader's IPs, and the images +// Show a page of file extensions, and allow paging by ext func routeExt(w http.ResponseWriter, r *http.Request) { if (r.Method != "GET") { LogRequest(r,404) @@ -422,15 +424,24 @@ func routeIPs(w http.ResponseWriter, r *http.Request) { LogRequest(r,200) } +/* + GET /upload + POST /upload +*/ func routeUpload(w http.ResponseWriter, r *http.Request) { if (r.Method == "POST") { info := Info{ Ip: r.RemoteAddr, Random: Rand64(), + TimeStamp: time.Now(), } // handle the form posting to this route - r.ParseMultipartForm(1024*5) + err := r.ParseMultipartForm(1024*5) + if (err != nil) { + serverErr(w,r,err) + return + } log.Printf("%q", r.MultipartForm.Value) for k, v := range r.MultipartForm.Value { if (k == "keywords") { @@ -490,6 +501,20 @@ func routeUpload(w http.ResponseWriter, r *http.Request) { LogRequest(r,200) // if we make it this far, then log success } +func routeAssets(w http.ResponseWriter, r *http.Request) { + path, err := filepath.Rel("/assets", r.URL.Path) + if (err != nil) { + serverErr(w,r,err) + return + } + + switch path { + case "bootstrap.css": + fmt.Fprint(w,bootstrapCSS) + w.Header().Set("Content-Type", "text/css") + } +} + func initMongo() { mongo_session, err := mgo.Dial(MongoHost) if err != nil { @@ -513,13 +538,14 @@ func runServer(ip, port string) { defer mongo_session.Close() http.HandleFunc("/", routeRoot) + http.HandleFunc("/assets/", routeAssets) http.HandleFunc("/upload", routeUpload) http.HandleFunc("/all", routeAll) http.HandleFunc("/f/", routeFiles) http.HandleFunc("/k/", routeKeywords) http.HandleFunc("/ip/", routeIPs) http.HandleFunc("/ext/", routeExt) - //http.HandleFunc("/md5/", routeMD5s) + http.HandleFunc("/md5/", routeMD5s) log.Printf("Serving on %s ...", addr) log.Fatal(http.ListenAndServe(addr, nil))