code cleanup

server/crawler.go

@@ -1,19 +1,18 @@
 package server
 
 import (
-	"net/url"
-	"net/http"
 	"github.com/PuerkitoBio/goquery"
+	"net/http"
+	"net/url"
 )
 
 type FeedSource struct {
 	Title string `json:"title"`
-	Url string `json:"url"`
+	Url   string `json:"url"`
 }
 
 const feedLinks = `link[type='application/rss+xml'],link[type='application/atom+xml']`
 
-
 func FindFeeds(r *http.Response) ([]FeedSource, error) {
 	sources := make([]FeedSource, 0, 0)
 	doc, err := goquery.NewDocumentFromResponse(r)

server/handlers.go

@@ -1,23 +1,23 @@
 package server
 
 import (
-	"github.com/nkanaev/yarr/storage"
-	"github.com/mmcdole/gofeed"
-	"net/http"
-	"html/template"
 	"encoding/json"
 	"encoding/xml"
-	"os"
-	"log"
+	"fmt"
+	"github.com/mmcdole/gofeed"
+	"github.com/nkanaev/yarr/storage"
+	"html"
+	"html/template"
 	"io"
+	"io/ioutil"
+	"log"
+	"math"
 	"mime"
-	"strings"
+	"net/http"
+	"os"
 	"path/filepath"
 	"strconv"
-	"math"
-	"html"
-	"fmt"
-	"io/ioutil"
+	"strings"
 )
 
 func IndexHandler(rw http.ResponseWriter, req *http.Request) {
@@ -46,7 +46,7 @@ func StaticHandler(rw http.ResponseWriter, req *http.Request) {
 func StatusHandler(rw http.ResponseWriter, req *http.Request) {
 	writeJSON(rw, map[string]interface{}{
 		"running": handler(req).fetchRunning,
-		"stats": db(req).FeedStats(),
+		"stats":   db(req).FeedStats(),
 	})
 }
 
@@ -78,10 +78,9 @@ func FolderListHandler(rw http.ResponseWriter, req *http.Request) {
 	}
 }
 
-
 type UpdateFolder struct {
-	Title *string `json:"title,omitempty"`
-	IsExpanded *bool `json:"is_expanded,omitempty"`
+	Title      *string `json:"title,omitempty"`
+	IsExpanded *bool   `json:"is_expanded,omitempty"`
 }
 
 func FolderHandler(rw http.ResponseWriter, req *http.Request) {
@@ -111,13 +110,13 @@ func FolderHandler(rw http.ResponseWriter, req *http.Request) {
 }
 
 type NewFeed struct {
-	Url string	    `json:"url"`
+	Url      string `json:"url"`
 	FolderID *int64 `json:"folder_id,omitempty"`
 }
 
 type UpdateFeed struct {
-	Title *string `json:"title,omitempty"`
-	FolderID *int64 `json:"folder_id,omitempty"`
+	Title    *string `json:"title,omitempty"`
+	FolderID *int64  `json:"folder_id,omitempty"`
 }
 
 func FeedListHandler(rw http.ResponseWriter, req *http.Request) {
@@ -133,7 +132,7 @@ func FeedListHandler(rw http.ResponseWriter, req *http.Request) {
 		}
 
 		feedUrl := feed.Url
-		res, err := http.Get(feedUrl)	
+		res, err := http.Get(feedUrl)
 		if err != nil {
 			log.Print(err)
 			rw.WriteHeader(http.StatusBadRequest)
@@ -192,24 +191,24 @@ func convertItems(items []*gofeed.Item, feed storage.Feed) []storage.Item {
 			author = item.Author.Name
 		}
 		result = append(result, storage.Item{
-			GUID: item.GUID,
-			FeedId: feed.Id,
-			Title: item.Title,
-			Link: item.Link,
+			GUID:        item.GUID,
+			FeedId:      feed.Id,
+			Title:       item.Title,
+			Link:        item.Link,
 			Description: item.Description,
-			Content: item.Content,
-			Author: author,
-			Date: item.PublishedParsed,
+			Content:     item.Content,
+			Author:      author,
+			Date:        item.PublishedParsed,
 			DateUpdated: item.UpdatedParsed,
-			Status: storage.UNREAD,
-			Image: imageURL,
+			Status:      storage.UNREAD,
+			Image:       imageURL,
 		})
 	}
 	return result
 }
 
 func listItems(f storage.Feed) []storage.Item {
-	fp := gofeed.NewParser()	
+	fp := gofeed.NewParser()
 	feed, err := fp.ParseURL(f.FeedLink)
 	if err != nil {
 		log.Print(err)
@@ -365,12 +364,12 @@ type opml struct {
 }
 
 type outline struct {
-	Type     string    `xml:"type,attr,omitempty"`
-	Title     string    `xml:"text,attr"`
-	FeedURL  string    `xml:"xmlUrl,attr,omitempty"`
-	SiteURL  string    `xml:"htmlUrl,attr,omitempty"`
-	Description  string    `xml:"description,attr,omitempty"`
-	Outlines []outline `xml:"outline,omitempty"`
+	Type        string    `xml:"type,attr,omitempty"`
+	Title       string    `xml:"text,attr"`
+	FeedURL     string    `xml:"xmlUrl,attr,omitempty"`
+	SiteURL     string    `xml:"htmlUrl,attr,omitempty"`
+	Description string    `xml:"description,attr,omitempty"`
+	Outlines    []outline `xml:"outline,omitempty"`
 }
 
 func (o outline) AllFeeds() []outline {
@@ -437,8 +436,8 @@ func OPMLExportHandler(rw http.ResponseWriter, req *http.Request) {
 
 		feedline := func(feed storage.Feed, indent int) {
 			line(
-				strings.Repeat(" ", indent) +
-				`<outline type="rss" text="%s" description="%s" xmlUrl="%s" htmlUrl="%s"/>`,
+				strings.Repeat(" ", indent)+
+					`<outline type="rss" text="%s" description="%s" xmlUrl="%s" htmlUrl="%s"/>`,
 				feed.Title, feed.Description,
 				feed.FeedLink, feed.Link,
 			)
@@ -479,7 +478,7 @@ func OPMLExportHandler(rw http.ResponseWriter, req *http.Request) {
 func PageCrawlHandler(rw http.ResponseWriter, req *http.Request) {
 	query := req.URL.Query()
 	if url := query.Get("url"); len(url) > 0 {
-		res, err := http.Get(url)	
+		res, err := http.Get(url)
 		if err == nil {
 			body, err := ioutil.ReadAll(res.Body)
 			if err == nil {

server/server.go

@@ -1,26 +1,26 @@
 package server
 
 import (
-	"encoding/json"
 	"context"
-	"regexp"
-	"net/http"
+	"encoding/json"
 	"github.com/nkanaev/yarr/storage"
 	"log"
+	"net/http"
+	"regexp"
 )
 
 type Route struct {
-	url string
+	url      string
 	urlRegex *regexp.Regexp
-	handler func(http.ResponseWriter, *http.Request)
+	handler  func(http.ResponseWriter, *http.Request)
 }
 
 type Handler struct {
-	db *storage.Storage
+	db           *storage.Storage
 	fetchRunning bool
-	feedQueue chan storage.Feed
-	counter chan int
-	queueSize int
+	feedQueue    chan storage.Feed
+	counter      chan int
+	queueSize    int
 }
 
 func (h *Handler) startJobs() {
@@ -35,14 +35,14 @@ func (h *Handler) startJobs() {
 		for {
 			val := <-h.counter
 			h.queueSize += val
-		}			
+		}
 	}()
 	go h.db.SyncSearch()
 	h.fetchAllFeeds()
 }
 
 func (h *Handler) fetchFeed(feed storage.Feed) {
-	h.queueSize += 1	
+	h.queueSize += 1
 	h.feedQueue <- feed
 }
 
@@ -62,9 +62,9 @@ func p(path string, handler func(http.ResponseWriter, *http.Request)) Route {
 	})
 	urlRegexp = "^" + urlRegexp + "$"
 	return Route{
-		url: path,
+		url:      path,
 		urlRegex: regexp.MustCompile(urlRegexp),
-		handler: handler,
+		handler:  handler,
 	}
 }
 
@@ -104,8 +104,8 @@ func handler(req *http.Request) *Handler {
 }
 
 const (
-	ctxDB = 1
-	ctxVars = 2
+	ctxDB      = 1
+	ctxVars    = 2
 	ctxHandler = 3
 )
 
@@ -143,9 +143,9 @@ func New() *http.Server {
 	db, _ := storage.New()
 	db.DeleteOldItems()
 	h := Handler{
-		db: db,
+		db:        db,
 		feedQueue: make(chan storage.Feed),
-		counter: make(chan int),
+		counter:   make(chan int),
 	}
 	s := &http.Server{Addr: "127.0.0.1:8000", Handler: h}
 	//h.startJobs()