Archives
/
zk
mirror of https://github.com/mickael-menu/zk
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Store dates as UTC

Browse Source
pull/6/head
Mickaël Menu 3 years ago
parent d797b94845
commit 18f8c39d5d
No known key found for this signature in database
GPG Key ID: 53D73664CD359895
5 changed files with 71 additions and 80 deletions
Show Stats Download Patch File Download Diff File

28
adapter/sqlite/fixtures/notes.yml
Unescape Escape View File

@ -4,8 +4,8 @@
body: "A daily note"
word_count: 3
checksum: "qwfpgj"
created: "2020-11-22T16:27:45+01:00"
modified: "2020-11-22T16:27:45+01:00"
created: "2020-11-22T16:27:45Z"
modified: "2020-11-22T16:27:45Z"
- id: 2
path: "log/2021-01-04.md"
@ -13,8 +13,8 @@
body: "A second daily note"
word_count: 4
checksum: "arstde"
created: "2020-11-29T08:20:18+01:00"
modified: "2020-11-29T08:20:18+01:00"
created: "2020-11-29T08:20:18Z"
modified: "2020-11-29T08:20:18Z"
- id: 3
path: "index.md"
@ -22,8 +22,8 @@
body: "Index of the Zettelkasten"
word_count: 4
checksum: "iaefhv"
created: "2019-12-04T11:59:11+01:00"
modified: "2019-12-04T12:17:21+01:00"
created: "2019-12-04T11:59:11Z"
modified: "2019-12-04T12:17:21Z"
- id: 4
path: "f39c8.md"
@ -31,8 +31,8 @@
body: "Its content will surprise you"
word_count: 5
checksum: "irkwyc"
created: "2020-01-19T10:58:41+01:00"
modified: "2020-01-20T08:52:42+01:00"
created: "2020-01-19T10:58:41Z"
modified: "2020-01-20T08:52:42Z"
- id: 5
path: "ref/test/b.md"
@ -40,8 +40,8 @@
body: "This one is in a sub sub directory"
word_count: 8
checksum: "yvwbae"
created: "2019-11-20T20:32:56+01:00"
modified: "2019-11-20T20:34:06+01:00"
created: "2019-11-20T20:32:56Z"
modified: "2019-11-20T20:34:06Z"
- id: 6
path: "ref/test/a.md"
@ -49,8 +49,8 @@
body: "It shall appear before b.md"
word_count: 5
checksum: "iecywst"
created: "2019-11-20T20:32:56+01:00"
modified: "2019-11-20T20:34:06+01:00"
created: "2019-11-20T20:32:56Z"
modified: "2019-11-20T20:34:06Z"
- id: 7
path: "log/2021-02-04.md"
@ -58,5 +58,5 @@
body: "A third daily note"
word_count: 4
checksum: "earkte"
created: "2020-11-29T08:20:18+01:00"
modified: "2020-11-29T08:20:18+01:00"
created: "2020-11-29T08:20:18Z"
modified: "2020-11-29T08:20:18Z"

107
adapter/sqlite/note_dao_test.go
Unescape Escape View File

@ -8,7 +8,6 @@ import (
"github.com/mickael-menu/zk/core/note"
"github.com/mickael-menu/zk/util"
"github.com/mickael-menu/zk/util/paths"
"github.com/mickael-menu/zk/util/test"
"github.com/mickael-menu/zk/util/test/assert"
)
@ -17,31 +16,31 @@ func TestNoteDAOIndexed(t *testing.T) {
expected := []paths.Metadata{
{
Path: "f39c8.md",
Modified: time.Date(2020, 1, 20, 8, 52, 42, 0, time.Local),
Modified: time.Date(2020, 1, 20, 8, 52, 42, 0, time.UTC),
},
{
Path: "index.md",
Modified: time.Date(2019, 12, 4, 12, 17, 21, 0, time.Local),
Modified: time.Date(2019, 12, 4, 12, 17, 21, 0, time.UTC),
},
{
Path: "log/2021-01-03.md",
Modified: time.Date(2020, 11, 22, 16, 27, 45, 0, time.Local),
Modified: time.Date(2020, 11, 22, 16, 27, 45, 0, time.UTC),
},
{
Path: "log/2021-01-04.md",
Modified: time.Date(2020, 11, 29, 8, 20, 18, 0, time.Local),
Modified: time.Date(2020, 11, 29, 8, 20, 18, 0, time.UTC),
},
{
Path: "log/2021-02-04.md",
Modified: time.Date(2020, 11, 29, 8, 20, 18, 0, time.Local),
Modified: time.Date(2020, 11, 29, 8, 20, 18, 0, time.UTC),
},
{
Path: "ref/test/a.md",
Modified: time.Date(2019, 11, 20, 20, 34, 6, 0, time.Local),
Modified: time.Date(2019, 11, 20, 20, 34, 6, 0, time.UTC),
},
{
Path: "ref/test/b.md",
Modified: time.Date(2019, 11, 20, 20, 34, 6, 0, time.Local),
Modified: time.Date(2019, 11, 20, 20, 34, 6, 0, time.UTC),
},
}
@ -63,8 +62,8 @@ func TestNoteDAOAdd(t *testing.T) {
Title: "Added note",
Body: "Note body",
WordCount: 2,
Created: test.Date("2019-11-19T15:33:31+01:00"),
Modified: test.Date("2020-01-16T16:04:59+01:00"),
Created: time.Date(2019, 11, 20, 20, 32, 56, 0, time.UTC),
Modified: time.Date(2020, 11, 22, 16, 49, 47, 0, time.UTC),
Checksum: "check",
})
assert.Nil(t, err)
@ -77,8 +76,8 @@ func TestNoteDAOAdd(t *testing.T) {
Body: "Note body",
WordCount: 2,
Checksum: "check",
Created: test.Date("2019-11-19T15:33:31+01:00"),
Modified: test.Date("2020-01-16T16:04:59+01:00"),
Created: time.Date(2019, 11, 20, 20, 32, 56, 0, time.UTC),
Modified: time.Date(2020, 11, 22, 16, 49, 47, 0, time.UTC),
})
})
}
@ -97,10 +96,10 @@ func TestNoteDAOUpdate(t *testing.T) {
Path: "ref/test/a.md",
Title: "Updated note",
Body: "Updated body",
WordCount: 42,
Created: test.Date("2020-11-22T16:49:47+01:00"),
Modified: test.Date("2020-11-22T16:49:47+01:00"),
Checksum: "updated checksum",
WordCount: 42,
Created: time.Date(2019, 11, 20, 20, 32, 56, 0, time.UTC),
Modified: time.Date(2020, 11, 22, 16, 49, 47, 0, time.UTC),
})
assert.Nil(t, err)
@ -110,10 +109,10 @@ func TestNoteDAOUpdate(t *testing.T) {
Path: "ref/test/a.md",
Title: "Updated note",
Body: "Updated body",
WordCount: 42,
Checksum: "updated checksum",
Created: test.Date("2019-11-20T20:32:56+01:00"),
Modified: test.Date("2020-11-22T16:49:47+01:00"),
WordCount: 42,
Created: time.Date(2019, 11, 20, 20, 32, 56, 0, time.UTC),
Modified: time.Date(2020, 11, 22, 16, 49, 47, 0, time.UTC),
})
})
}
@ -150,8 +149,8 @@ func TestNoteDAOFindAll(t *testing.T) {
Title: "A nested note",
Body: "This one is in a sub sub directory",
WordCount: 8,
Created: time.Date(2019, 11, 20, 20, 32, 56, 0, time.Local),
Modified: time.Date(2019, 11, 20, 20, 34, 6, 0, time.Local),
Created: time.Date(2019, 11, 20, 20, 32, 56, 0, time.UTC),
Modified: time.Date(2019, 11, 20, 20, 34, 6, 0, time.UTC),
Checksum: "yvwbae",
},
},
@ -162,8 +161,8 @@ func TestNoteDAOFindAll(t *testing.T) {
Title: "An interesting note",
Body: "Its content will surprise you",
WordCount: 5,
Created: time.Date(2020, 1, 19, 10, 58, 41, 0, time.Local),
Modified: time.Date(2020, 1, 20, 8, 52, 42, 0, time.Local),
Created: time.Date(2020, 1, 19, 10, 58, 41, 0, time.UTC),
Modified: time.Date(2020, 1, 20, 8, 52, 42, 0, time.UTC),
Checksum: "irkwyc",
},
},
@ -174,8 +173,8 @@ func TestNoteDAOFindAll(t *testing.T) {
Title: "Another nested note",
Body: "It shall appear before b.md",
WordCount: 5,
Created: time.Date(2019, 11, 20, 20, 32, 56, 0, time.Local),
Modified: time.Date(2019, 11, 20, 20, 34, 6, 0, time.Local),
Created: time.Date(2019, 11, 20, 20, 32, 56, 0, time.UTC),
Modified: time.Date(2019, 11, 20, 20, 34, 6, 0, time.UTC),
Checksum: "iecywst",
},
},
@ -186,8 +185,8 @@ func TestNoteDAOFindAll(t *testing.T) {
Title: "February 4, 2021",
Body: "A third daily note",
WordCount: 4,
Created: time.Date(2020, 11, 29, 8, 20, 18, 0, time.Local),
Modified: time.Date(2020, 11, 29, 8, 20, 18, 0, time.Local),
Created: time.Date(2020, 11, 29, 8, 20, 18, 0, time.UTC),
Modified: time.Date(2020, 11, 29, 8, 20, 18, 0, time.UTC),
Checksum: "earkte",
},
},
@ -198,8 +197,8 @@ func TestNoteDAOFindAll(t *testing.T) {
Title: "Index",
Body: "Index of the Zettelkasten",
WordCount: 4,
Created: time.Date(2019, 12, 4, 11, 59, 11, 0, time.Local),
Modified: time.Date(2019, 12, 4, 12, 17, 21, 0, time.Local),
Created: time.Date(2019, 12, 4, 11, 59, 11, 0, time.UTC),
Modified: time.Date(2019, 12, 4, 12, 17, 21, 0, time.UTC),
Checksum: "iaefhv",
},
},
@ -210,8 +209,8 @@ func TestNoteDAOFindAll(t *testing.T) {
Title: "January 3, 2021",
Body: "A daily note",
WordCount: 3,
Created: time.Date(2020, 11, 22, 16, 27, 45, 0, time.Local),
Modified: time.Date(2020, 11, 22, 16, 27, 45, 0, time.Local),
Created: time.Date(2020, 11, 22, 16, 27, 45, 0, time.UTC),
Modified: time.Date(2020, 11, 22, 16, 27, 45, 0, time.UTC),
Checksum: "qwfpgj",
},
},
@ -222,8 +221,8 @@ func TestNoteDAOFindAll(t *testing.T) {
Title: "January 4, 2021",
Body: "A second daily note",
WordCount: 4,
Created: time.Date(2020, 11, 29, 8, 20, 18, 0, time.Local),
Modified: time.Date(2020, 11, 29, 8, 20, 18, 0, time.Local),
Created: time.Date(2020, 11, 29, 8, 20, 18, 0, time.UTC),
Modified: time.Date(2020, 11, 29, 8, 20, 18, 0, time.UTC),
Checksum: "arstde",
},
},
@ -239,8 +238,8 @@ func TestNoteDAOFindLimit(t *testing.T) {
Title: "A nested note",
Body: "This one is in a sub sub directory",
WordCount: 8,
Created: time.Date(2019, 11, 20, 20, 32, 56, 0, time.Local),
Modified: time.Date(2019, 11, 20, 20, 34, 6, 0, time.Local),
Created: time.Date(2019, 11, 20, 20, 32, 56, 0, time.UTC),
Modified: time.Date(2019, 11, 20, 20, 34, 6, 0, time.UTC),
Checksum: "yvwbae",
},
},
@ -251,8 +250,8 @@ func TestNoteDAOFindLimit(t *testing.T) {
Title: "An interesting note",
Body: "Its content will surprise you",
WordCount: 5,
Created: time.Date(2020, 1, 19, 10, 58, 41, 0, time.Local),
Modified: time.Date(2020, 1, 20, 8, 52, 42, 0, time.Local),
Created: time.Date(2020, 1, 19, 10, 58, 41, 0, time.UTC),
Modified: time.Date(2020, 1, 20, 8, 52, 42, 0, time.UTC),
Checksum: "irkwyc",
},
},
@ -272,8 +271,8 @@ func TestNoteDAOFindMatch(t *testing.T) {
Title: "Index",
Body: "Index of the Zettelkasten",
WordCount: 4,
Created: time.Date(2019, 12, 4, 11, 59, 11, 0, time.Local),
Modified: time.Date(2019, 12, 4, 12, 17, 21, 0, time.Local),
Created: time.Date(2019, 12, 4, 11, 59, 11, 0, time.UTC),
Modified: time.Date(2019, 12, 4, 12, 17, 21, 0, time.UTC),
Checksum: "iaefhv",
},
},
@ -284,8 +283,8 @@ func TestNoteDAOFindMatch(t *testing.T) {
Title: "January 3, 2021",
Body: "A daily note",
WordCount: 3,
Created: time.Date(2020, 11, 22, 16, 27, 45, 0, time.Local),
Modified: time.Date(2020, 11, 22, 16, 27, 45, 0, time.Local),
Created: time.Date(2020, 11, 22, 16, 27, 45, 0, time.UTC),
Modified: time.Date(2020, 11, 22, 16, 27, 45, 0, time.UTC),
Checksum: "qwfpgj",
},
},
@ -296,8 +295,8 @@ func TestNoteDAOFindMatch(t *testing.T) {
Title: "January 4, 2021",
Body: "A second daily note",
WordCount: 4,
Created: time.Date(2020, 11, 29, 8, 20, 18, 0, time.Local),
Modified: time.Date(2020, 11, 29, 8, 20, 18, 0, time.Local),
Created: time.Date(2020, 11, 29, 8, 20, 18, 0, time.UTC),
Modified: time.Date(2020, 11, 29, 8, 20, 18, 0, time.UTC),
Checksum: "arstde",
},
},
@ -308,8 +307,8 @@ func TestNoteDAOFindMatch(t *testing.T) {
Title: "February 4, 2021",
Body: "A third daily note",
WordCount: 4,
Created: time.Date(2020, 11, 29, 8, 20, 18, 0, time.Local),
Modified: time.Date(2020, 11, 29, 8, 20, 18, 0, time.Local),
Created: time.Date(2020, 11, 29, 8, 20, 18, 0, time.UTC),
Modified: time.Date(2020, 11, 29, 8, 20, 18, 0, time.UTC),
Checksum: "earkte",
},
},
@ -330,8 +329,8 @@ func TestNoteDAOFindInPath(t *testing.T) {
Title: "January 3, 2021",
Body: "A daily note",
WordCount: 3,
Created: time.Date(2020, 11, 22, 16, 27, 45, 0, time.Local),
Modified: time.Date(2020, 11, 22, 16, 27, 45, 0, time.Local),
Created: time.Date(2020, 11, 22, 16, 27, 45, 0, time.UTC),
Modified: time.Date(2020, 11, 22, 16, 27, 45, 0, time.UTC),
Checksum: "qwfpgj",
},
},
@ -342,8 +341,8 @@ func TestNoteDAOFindInPath(t *testing.T) {
Title: "January 4, 2021",
Body: "A second daily note",
WordCount: 4,
Created: time.Date(2020, 11, 29, 8, 20, 18, 0, time.Local),
Modified: time.Date(2020, 11, 29, 8, 20, 18, 0, time.Local),
Created: time.Date(2020, 11, 29, 8, 20, 18, 0, time.UTC),
Modified: time.Date(2020, 11, 29, 8, 20, 18, 0, time.UTC),
Checksum: "arstde",
},
},
@ -364,8 +363,8 @@ func TestNoteDAOFindInMultiplePath(t *testing.T) {
Title: "A nested note",
Body: "This one is in a sub sub directory",
WordCount: 8,
Created: time.Date(2019, 11, 20, 20, 32, 56, 0, time.Local),
Modified: time.Date(2019, 11, 20, 20, 34, 6, 0, time.Local),
Created: time.Date(2019, 11, 20, 20, 32, 56, 0, time.UTC),
Modified: time.Date(2019, 11, 20, 20, 34, 6, 0, time.UTC),
Checksum: "yvwbae",
},
},
@ -376,8 +375,8 @@ func TestNoteDAOFindInMultiplePath(t *testing.T) {
Title: "Another nested note",
Body: "It shall appear before b.md",
WordCount: 5,
Created: time.Date(2019, 11, 20, 20, 32, 56, 0, time.Local),
Modified: time.Date(2019, 11, 20, 20, 34, 6, 0, time.Local),
Created: time.Date(2019, 11, 20, 20, 32, 56, 0, time.UTC),
Modified: time.Date(2019, 11, 20, 20, 34, 6, 0, time.UTC),
Checksum: "iecywst",
},
},
@ -388,8 +387,8 @@ func TestNoteDAOFindInMultiplePath(t *testing.T) {
Title: "Index",
Body: "Index of the Zettelkasten",
WordCount: 4,
Created: time.Date(2019, 12, 4, 11, 59, 11, 0, time.Local),
Modified: time.Date(2019, 12, 4, 12, 17, 21, 0, time.Local),
Created: time.Date(2019, 12, 4, 11, 59, 11, 0, time.UTC),
Modified: time.Date(2019, 12, 4, 12, 17, 21, 0, time.UTC),
Checksum: "iaefhv",
},
},

6
core/note/index.go
Unescape Escape View File

@ -109,11 +109,11 @@ func metadata(path string, basePath string) (Metadata, error) {
return metadata, err
}
metadata.Modified = times.ModTime()
metadata.Modified = times.ModTime().UTC()
if times.HasBirthTime() {
metadata.Created = times.BirthTime()
metadata.Created = times.BirthTime().UTC()
} else {
metadata.Created = time.Now()
metadata.Created = time.Now().UTC()
}
return metadata, nil

2
util/paths/walk.go
Unescape Escape View File

@ -48,7 +48,7 @@ func Walk(basePath string, extension string, logger util.Logger) <-chan Metadata
c <- Metadata{
Path: path,
Modified: info.ModTime(),
Modified: info.ModTime().UTC(),
}
}

8
util/test/util.go
Unescape Escape View File

@ -1,8 +0,0 @@
package test
import "time"
func Date(s string) time.Time {
date, _ := time.Parse(time.RFC3339, s)
return date
}
Write Preview
Loading…
Cancel
Save