refactor and allow sorting by creation date

Author: schollz

Makefile

@@ -1,11 +1,13 @@
 HASH=$(shell git describe --always)
 LDFLAGS=-ldflags "-s -w -X main.Version=${HASH}"
 
-build:
+prereq: 
 	go get -d -v github.com/tdewolff/minify/...
 	go install -v github.com/tdewolff/minify/cmd/minify
 	go get -d -v github.com/jteeuwen/go-bindata/...
 	go install -v github.com/jteeuwen/go-bindata/go-bindata
+
+bundle:
 	rm -rf assets
 	cp -r static assets
 	cd assets && gzip -9 -r *
@@ -15,21 +17,13 @@ build:
 	cp templates/header.html assets/header.html
 	cp templates/viewedit.html assets/viewedit.html
 	cp templates/prism.js assets/prism.js
-	# minify static/css/rwtxt.css | gzip -9   > assets/rwtxt.css
-	# minify static/css/normalize.css | gzip -9   > assets/normalize.css
-	# minify static/css/dropzone.css | gzip -9  > assets/dropzone.css
-	# minify static/js/rwtxt.js | gzip -9  > assets/rwtxt.js
-	# # gzip -9 -c static/js/rwtxt.js > assets/rwtxt.js
-	# minify static/js/dropzone.js | gzip -9 > assets/dropzone.js
-	# minify static/css/prism.css | gzip -9 > assets/prism.css
-	# minify static/js/prism.js | gzip -9  > assets/prism.js
-	# gzip -9 -c static/img/logo.png  > assets/logo.png
-	# cp -r static/img/favicon assets/
-	# cd assets/favicon && gzip -9 *
+
+exec: prereq bundle
 	go-bindata -pkg rwtxt -nocompress assets assets/img assets/js assets/css assets/img/favicon
-	go get -v --tags "fts4" ${LDFLAGS} ./...
+	cd cmd/rwtxt && go build -v --tags "fts4" ${LDFLAGS} && cp rwtxt ../../
 
-exec: build
+quick: bundle
+	go-bindata -pkg rwtxt -nocompress assets assets/img assets/js assets/css assets/img/favicon
 	cd cmd/rwtxt && go build -v --tags "fts4" ${LDFLAGS} && cp rwtxt ../../
 
 run: build

cmd/rwtxt/main.go

@@ -21,16 +21,17 @@ var (
 func main() {
 	var (
 		err             error
-		export        = flag.Bool("export", false, "export uploads to {{TIMESTAMP}}-uploads.zip and posts to {{TIMESTAMP}}-posts.zip")
+		export          = flag.Bool("export", false, "export uploads to {{TIMESTAMP}}-uploads.zip and posts to {{TIMESTAMP}}-posts.zip")
 		resizeWidth     = flag.Int("resizewidth", -1, "image width to resize on the fly")
 		resizeOnUpload  = flag.Bool("resizeonupload", false, "resize on upload")
 		resizeOnRequest = flag.Bool("resizeonrequest", false, "resize on request")
 		debug           = flag.Bool("debug", false, "debug mode")
 		showVersion     = flag.Bool("v", false, "show version")
 		profileMemory   = flag.Bool("memprofile", false, "profile memory")
 		database        = flag.String("db", "rwtxt.db", "name of the database")
-		listen          = flag.String("listen", rwtxt.DefaultBind, "interface:port to listen on")
+		listen          = flag.String("listen", ":8152", "interface:port to listen on")
 		private         = flag.Bool("private", false, "private setup (allows listing of public notes)")
+		created         = flag.Bool("created", false, "order by date created rather than date modified")
 	)
 	flag.Parse()
 
@@ -83,19 +84,19 @@ func main() {
 		return
 	}
 
-	config := rwtxt.Config{Private: *private,
+	config := rwtxt.Config{
+		Bind:            *listen,
+		Private:         *private,
 		ResizeWidth:     *resizeWidth,
 		ResizeOnRequest: *resizeOnRequest,
 		ResizeOnUpload:  *resizeOnUpload,
+		OrderByCreated:  *created,
 	}
 
 	rwt, err := rwtxt.New(fs, config)
 	if err != nil {
 		panic(err)
 	}
-	if listen != nil && *listen != "" {
-		rwt.Bind = *listen
-	}
 
 	err = rwt.Serve()
 	if err != nil {

pkg/db/db.go

@@ -1092,17 +1092,22 @@ func (fs *FileSystem) SetSimilar(id string, similarids []string) (err error) {
 }
 
 // GetAll returns all the files for a given domain
-func (fs *FileSystem) GetAll(domain string) (files []File, err error) {
+func (fs *FileSystem) GetAll(domain string, created ...bool) (files []File, err error) {
 	fs.Lock()
 	defer fs.Unlock()
-	files, err = fs.getAllFromPreparedQuery(`
-	SELECT fs.id,fs.slug,fs.created,fs.modified,fts.data,fs.history,fs.views FROM fs 
+	q := `SELECT fs.id,fs.slug,fs.created,fs.modified,fts.data,fs.history,fs.views FROM fs 
 	INNER JOIN fts ON fs.id=fts.id 
 	INNER JOIN domains ON fs.domainid=domains.id
 	WHERE 
 		domains.name = ?
 		AND LENGTH(fts.data) > 0
-	ORDER BY fs.modified DESC`, domain)
+	`
+	if len(created) > 0 && created[0] {
+		q += "ORDER BY fs.created DESC"
+	} else {
+		q += "ORDER BY fs.modified DESC"
+	}
+	files, err = fs.getAllFromPreparedQuery(q, domain)
 	for i := range files {
 		files[i].Domain = domain
 	}
@@ -1126,17 +1131,24 @@ func (fs *FileSystem) GetSimilar(fileid string) (files []File, err error) {
 }
 
 // GetTopX returns the info from a file
-func (fs *FileSystem) GetTopX(domain string, num int) (files []File, err error) {
+func (fs *FileSystem) GetTopX(domain string, num int, created ...bool) (files []File, err error) {
 	fs.Lock()
 	defer fs.Unlock()
-	return fs.getAllFromPreparedQuery(`
+	q := `
 	SELECT fs.id,fs.slug,fs.created,fs.modified,fts.data,fs.history,fs.views FROM fs 
 	INNER JOIN fts ON fs.id=fts.id 
 	INNER JOIN domains ON fs.domainid=domains.id
 	WHERE 
 		domains.name = ?
 		AND LENGTH(fts.data) > 0
-	ORDER BY fs.modified DESC LIMIT ?`, domain, num)
+		`
+	if len(created) > 0 && created[0] {
+		q += "ORDER BY fs.created DESC"
+	} else {
+		q += "ORDER BY fs.modified DESC"
+	}
+	q += " LIMIT ?"
+	return fs.getAllFromPreparedQuery(q, domain, num)
 }
 
 // GetTopX returns the info from a file

rwtxt.go

@@ -18,35 +18,35 @@ import (
 const DefaultBind = ":8152"
 
 type RWTxt struct {
-	Bind             string // interface:port to listen on, defaults to DefaultBind.
-	config           Config
+	Config           Config
 	viewEditTemplate *template.Template
 	mainTemplate     *template.Template
 	loginTemplate    *template.Template
 	listTemplate     *template.Template
 	prismTemplate    []string
 	fs               *db.FileSystem
 	wsupgrader       websocket.Upgrader
-	ResizeWidth      int
-	ResizeOnUpload   bool
-	ResizeOnRequest  bool
 }
 
 type Config struct {
+	Bind            string // interface:port to listen on, defaults to DefaultBind.
 	Private         bool
 	ResizeWidth     int
 	ResizeOnUpload  bool
 	ResizeOnRequest bool
+	OrderByCreated  bool
 }
 
-func New(fs *db.FileSystem, config Config) (*RWTxt, error) {
+func New(fs *db.FileSystem, configUser ...Config) (*RWTxt, error) {
+	config := Config{
+		Bind: ":8152",
+	}
+	if len(configUser) > 0 {
+		config = configUser[0]
+	}
 	rwt := &RWTxt{
-		Bind:            DefaultBind,
-		fs:              fs,
-		config:          config,
-		ResizeOnUpload:  config.ResizeOnUpload,
-		ResizeOnRequest: config.ResizeOnRequest,
-		ResizeWidth:     config.ResizeWidth,
+		Config: config,
+		fs:     fs,
 		wsupgrader: websocket.Upgrader{
 			ReadBufferSize:  1024,
 			WriteBufferSize: 1024,
@@ -128,9 +128,9 @@ func (rwt *RWTxt) Serve() (err error) {
 			}
 		}
 	}()
-	log.Infof("listening on %v", rwt.Bind)
+	log.Infof("listening on %v", rwt.Config.Bind)
 	http.HandleFunc("/", rwt.Handler)
-	return http.ListenAndServe(rwt.Bind, nil)
+	return http.ListenAndServe(rwt.Config.Bind, nil)
 }
 
 func (rwt *RWTxt) isSignedIn(w http.ResponseWriter, r *http.Request, domain string) (signedin bool, domainkey string, defaultDomain string, domainList []string, domainKeys map[string]string) {
@@ -248,7 +248,7 @@ Disallow: /`))
 		return tr.handleUploads(w, r, tr.Page)
 	} else if tr.Domain != "" && tr.Page == "" {
 		if r.URL.Query().Get("q") != "" {
-			if tr.Domain == "public" && !rwt.config.Private {
+			if tr.Domain == "public" && !rwt.Config.Private {
 				return tr.handleMain(w, r, "can't search public")
 			}
 			return tr.handleSearch(w, r, tr.Domain, r.URL.Query().Get("q"))
@@ -258,11 +258,11 @@ Disallow: /`))
 	} else if tr.Domain != "" && tr.Page != "" {
 		log.Debugf("[%s/%s]", tr.Domain, tr.Page)
 		if tr.Page == "list" {
-			if tr.Domain == "public" && !rwt.config.Private {
+			if tr.Domain == "public" && !rwt.Config.Private {
 				return tr.handleMain(w, r, "can't list public")
 			}
 
-			files, _ := rwt.fs.GetAll(tr.Domain)
+			files, _ := rwt.fs.GetAll(tr.Domain, tr.RWTxtConfig.OrderByCreated)
 			for i := range files {
 				files[i].Data = ""
 				files[i].DataHTML = template.HTML("")

template_render.go

@@ -7,7 +7,6 @@ import (
 	"database/sql"
 	"encoding/json"
 	"fmt"
-	"github.com/disintegration/imaging"
 	"html/template"
 	"image/jpeg"
 	"io"
@@ -18,6 +17,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/disintegration/imaging"
+
 	log "github.com/cihub/seelog"
 	"github.com/schollz/rwtxt/pkg/db"
 	"github.com/schollz/rwtxt/pkg/utils"
@@ -57,6 +58,7 @@ type TemplateRender struct {
 	Languages          []string
 	LanguageJS         []template.JS
 	rwt                *RWTxt
+	RWTxtConfig        Config
 }
 
 type Payload struct {
@@ -110,7 +112,8 @@ func init() {
 
 func NewTemplateRender(rwt *RWTxt) *TemplateRender {
 	tr := &TemplateRender{
-		rwt: rwt,
+		rwt:         rwt,
+		RWTxtConfig: rwt.Config,
 	}
 	return tr
 }
@@ -204,10 +207,10 @@ func (tr *TemplateRender) handleMain(w http.ResponseWriter, r *http.Request, mes
 		signedin = false
 	}
 	tr.SignedIn = signedin
-	tr.DomainIsPrivate = !ispublic && (tr.Domain != "public" || tr.rwt.config.Private)
-	tr.PrivateEnvironment = tr.rwt.config.Private
+	tr.DomainIsPrivate = !ispublic && (tr.Domain != "public" || tr.rwt.Config.Private)
+	tr.PrivateEnvironment = tr.rwt.Config.Private
 	tr.DomainExists = domainErr == nil
-	tr.Files, err = tr.rwt.fs.GetTopX(tr.Domain, 10)
+	tr.Files, err = tr.rwt.fs.GetTopX(tr.Domain, 10, tr.RWTxtConfig.OrderByCreated)
 	if err != nil {
 		log.Debug(err)
 	}
@@ -513,10 +516,10 @@ func (tr *TemplateRender) handleUploads(w http.ResponseWriter, r *http.Request,
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
-	log.Debug("ResizeOnRequest", tr.rwt.ResizeOnRequest)
-	log.Debug("ResizeWidth", tr.rwt.ResizeWidth)
+	log.Debug("ResizeOnRequest", tr.rwt.Config.ResizeOnRequest)
+	log.Debug("ResizeWidth", tr.rwt.Config.ResizeWidth)
 	log.Debug("name", name)
-	if tr.rwt.ResizeWidth > 0 && tr.rwt.ResizeOnRequest && (strings.Contains(strings.ToLower(name), ".jpg") || strings.Contains(strings.ToLower(name), ".jpeg")) {
+	if tr.rwt.Config.ResizeWidth > 0 && tr.rwt.Config.ResizeOnRequest && (strings.Contains(strings.ToLower(name), ".jpg") || strings.Contains(strings.ToLower(name), ".jpeg")) {
 		// Get resized image
 		name, data, _, err = tr.rwt.fs.GetResizedImage(id)
 		if err != nil && err != sql.ErrNoRows {
@@ -554,7 +557,7 @@ func (tr *TemplateRender) handleUploads(w http.ResponseWriter, r *http.Request,
 				return err
 			}
 
-			img = imaging.Resize(img, tr.rwt.ResizeWidth, 0, imaging.Lanczos)
+			img = imaging.Resize(img, tr.rwt.Config.ResizeWidth, 0, imaging.Lanczos)
 
 			var bufout bytes.Buffer
 			gw := gzip.NewWriter(&bufout)
@@ -614,15 +617,15 @@ func (tr *TemplateRender) handleUpload(w http.ResponseWriter, r *http.Request) (
 	}
 	defer file.Close()
 
-	if tr.rwt.ResizeWidth > 0 && tr.rwt.ResizeOnUpload && (strings.Contains(strings.ToLower(info.Filename), ".jpg") || strings.Contains(strings.ToLower(info.Filename), ".jpeg")) {
+	if tr.rwt.Config.ResizeWidth > 0 && tr.rwt.Config.ResizeOnUpload && (strings.Contains(strings.ToLower(info.Filename), ".jpg") || strings.Contains(strings.ToLower(info.Filename), ".jpeg")) {
 		log.Debug("process jpg upload")
 		img, err := jpeg.Decode(file)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 			return err
 		}
 
-		img = imaging.Resize(img, tr.rwt.ResizeWidth, 0, imaging.Lanczos)
+		img = imaging.Resize(img, tr.rwt.Config.ResizeWidth, 0, imaging.Lanczos)
 
 		var bufout bytes.Buffer
 		err = jpeg.Encode(&bufout, img, nil)
@@ -702,7 +705,7 @@ func (tr *TemplateRender) handleExport(w http.ResponseWriter, r *http.Request) (
 	if !tr.SignedIn {
 		return tr.handleMain(w, r, "must sign in")
 	}
-	files, _ := tr.rwt.fs.GetAll(tr.Domain)
+	files, _ := tr.rwt.fs.GetAll(tr.Domain, tr.RWTxtConfig.OrderByCreated)
 	for i := range files {
 		files[i].DataHTML = template.HTML("")
 	}

templates/list.html

@@ -9,7 +9,7 @@ <h1>{{.NumResults}} results for '{{.Search}}'</h1>
     {{range .Files}}
     <p>
         <a href="/{{$.Domain}}/{{.ID}}">{{.Slug}}</a>
-        <small class="grey">{{.Modified.Format "Jan 2 3:04pm 2006"}}</small>
+        <small class="grey">{{ if $.RWTxtConfig.OrderByCreated}}{{.Created.Format "Jan 2 3:04pm 2006"}}{{else}}{{.Modified.Format "Jan 2 3:04pm 2006"}}{{end}}</small>
 
         <blockquote><em>{{.DataHTML}}</em></blockquote>
     </p>

templates/main.html

@@ -53,7 +53,7 @@ <h2>Most recent <small>(<a href="/{{.Domain}}/list">all posts</a>)</small></h2>
 		{{range .Files}}
 		<li>
 			<a href="/{{$.Domain}}/{{if eq (len .Slug) 0}}{{.ID}}{{else}}{{.Slug}}{{end}}">{{if eq (len .Slug) 0}}{{.ID}}{{else}}{{.Slug}}{{end}}</a>
-			&nbsp;<small class="grey">{{.Modified.Format "Mon Jan 2 2006"}}</small>
+			&nbsp;<small class="grey">{{ if $.RWTxtConfig.OrderByCreated}}{{.Created.Format "Jan 2 3:04pm 2006"}}{{else}}{{.Modified.Format "Jan 2 3:04pm 2006"}}{{end}}</small>
 		</li>
 		{{end}}
 	</ul>
@@ -65,7 +65,7 @@ <h2>Most edited</h2>
 			{{range .MostActiveList}}
 			<li>
 				<a href="/{{$.Domain}}/{{if eq (len .Slug) 0}}{{.ID}}{{else}}{{.Slug}}{{end}}">{{if eq (len .Slug) 0}}{{.ID}}{{else}}{{.Slug}}{{end}}</a>
-				&nbsp;<small class="grey">{{.Modified.Format "Mon Jan 2 2006"}}</small>
+				&nbsp;<small class="grey">{{ if $.RWTxtConfig.OrderByCreated}}{{.Created.Format "Jan 2 3:04pm 2006"}}{{else}}{{.Modified.Format "Jan 2 3:04pm 2006"}}{{end}}</small>
 			</li>
 			{{end}}
 		</ul>