From 2a4d974965703eafd5f09e3bf5788f684897f877 Mon Sep 17 00:00:00 2001 From: Nazar Kanaev Date: Wed, 25 Sep 2024 11:01:03 +0100 Subject: [PATCH] go fmt --- src/parser/atom_test.go | 30 +++++++++++++++--------------- src/server/auth/middleware.go | 6 +++--- src/server/routes.go | 2 +- src/storage/item.go | 13 ++++++------- src/storage/migration.go | 8 ++++---- src/storage/storage.go | 8 ++++---- 6 files changed, 33 insertions(+), 34 deletions(-) diff --git a/src/parser/atom_test.go b/src/parser/atom_test.go index 46aa935..88b40a3 100644 --- a/src/parser/atom_test.go +++ b/src/parser/atom_test.go @@ -192,23 +192,23 @@ func TestAtomLinkInID(t *testing.T) { have := feed.Items want := []Item{ Item{ - GUID: "https://example.com/posts/1::2003-12-13T09:17:51", - Date: time.Date(2003, time.December, 13, 9, 17, 51, 0, time.UTC), - URL: "https://example.com/posts/1", - Title: "one updated", - }, + GUID: "https://example.com/posts/1::2003-12-13T09:17:51", + Date: time.Date(2003, time.December, 13, 9, 17, 51, 0, time.UTC), + URL: "https://example.com/posts/1", + Title: "one updated", + }, Item{ GUID: "urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6", - Date: time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC), URL: "", - Title: "two", - }, - Item{ - GUID: "https://example.com/posts/1::", - Date: time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC), - URL: "https://example.com/posts/1", - Title: "one", - Content: "", - }, + Date: time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC), URL: "", + Title: "two", + }, + Item{ + GUID: "https://example.com/posts/1::", + Date: time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC), + URL: "https://example.com/posts/1", + Title: "one", + Content: "", + }, } if !reflect.DeepEqual(want, have) { t.Fatalf("\nwant: %#v\nhave: %#v\n", want, have) diff --git a/src/server/auth/middleware.go b/src/server/auth/middleware.go index 424878f..1755789 100644 --- a/src/server/auth/middleware.go +++ b/src/server/auth/middleware.go @@ -51,12 +51,12 @@ func (m *Middleware) Handler(c *router.Context) { c.HTML(http.StatusOK, assets.Template("login.html"), map[string]interface{}{ "username": username, "error": "Invalid username/password", - "settings": m.DB.GetSettings(), + "settings": m.DB.GetSettings(), }) return } } c.HTML(http.StatusOK, assets.Template("login.html"), map[string]interface{}{ - "settings": m.DB.GetSettings(), - }) + "settings": m.DB.GetSettings(), + }) } diff --git a/src/server/routes.go b/src/server/routes.go index eecb2b4..6d05320 100644 --- a/src/server/routes.go +++ b/src/server/routes.go @@ -35,7 +35,7 @@ func (s *Server) handler() http.Handler { Username: s.Username, Password: s.Password, Public: []string{"/static", "/fever"}, - DB: s.db, + DB: s.db, } r.Use(a.Handler) } diff --git a/src/storage/item.go b/src/storage/item.go index 173a213..68c6821 100644 --- a/src/storage/item.go +++ b/src/storage/item.go @@ -79,22 +79,21 @@ type MarkFilter struct { type ItemList []Item func (list ItemList) Len() int { - return len(list) + return len(list) } func (list ItemList) SortKey(i int) string { - return list[i].Date.Format(time.RFC3339) + "::" + list[i].GUID + return list[i].Date.Format(time.RFC3339) + "::" + list[i].GUID } func (list ItemList) Less(i, j int) bool { - return list.SortKey(i) < list.SortKey(j) + return list.SortKey(i) < list.SortKey(j) } func (list ItemList) Swap(i, j int) { - list[i], list[j] = list[j], list[i] + list[i], list[j] = list[j], list[i] } - func (s *Storage) CreateItems(items []Item) bool { tx, err := s.db.Begin() if err != nil { @@ -104,8 +103,8 @@ func (s *Storage) CreateItems(items []Item) bool { now := time.Now().UTC() - itemsSorted := ItemList(items) - sort.Sort(itemsSorted) + itemsSorted := ItemList(items) + sort.Sort(itemsSorted) for _, item := range itemsSorted { _, err = tx.Exec(` diff --git a/src/storage/migration.go b/src/storage/migration.go index ec9b7d4..1f33967 100644 --- a/src/storage/migration.go +++ b/src/storage/migration.go @@ -16,16 +16,16 @@ var migrations = []func(*sql.Tx) error{ m06_fill_missing_dates, m07_add_feed_size, m08_normalize_datetime, - m09_change_item_index, + m09_change_item_index, } var maxVersion = int64(len(migrations)) func migrate(db *sql.DB) error { var version int64 - if err := db.QueryRow("pragma user_version").Scan(&version); err != nil { - return err - } + if err := db.QueryRow("pragma user_version").Scan(&version); err != nil { + return err + } if version >= maxVersion { return nil diff --git a/src/storage/storage.go b/src/storage/storage.go index 25d1c50..28cccfb 100644 --- a/src/storage/storage.go +++ b/src/storage/storage.go @@ -14,10 +14,10 @@ type Storage struct { func New(path string) (*Storage, error) { if pos := strings.IndexRune(path, '?'); pos == -1 { - params := "_journal=WAL&_sync=NORMAL&_busy_timeout=5000&cache=shared" - log.Printf("opening db with params: %s", params) - path = path + "?" + params - } + params := "_journal=WAL&_sync=NORMAL&_busy_timeout=5000&cache=shared" + log.Printf("opening db with params: %s", params) + path = path + "?" + params + } db, err := sql.Open("sqlite3", path) if err != nil {