diff --git a/cmd/list.go b/cmd/list.go index 3746bcd..f303200 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -21,14 +21,14 @@ var listCmd = &cobra.Command{ $ diary list today `, Run: func(cmd *cobra.Command, args []string) { - var num_entries *int64 = new(int64) + var num_entries *int64 = new(int64) - q := model.GetDiaryEntriesQuery{} + q := model.GetDiaryEntriesQuery{} - *num_entries = viper.GetInt64("listNumEntries") - if (*num_entries > 0) { - q.NumEntries = num_entries - } + *num_entries = viper.GetInt64("listNumEntries") + if *num_entries > 0 { + q.NumEntries = num_entries + } results := App.Db.GetDiaryEntries(q) PrintEntries(results) @@ -36,7 +36,7 @@ var listCmd = &cobra.Command{ } func init() { - listCmd.PersistentFlags().Int64P("num-entries", "n", 20, "The number of entries to list") - viper.BindPFlag("listNumEntries", listCmd.PersistentFlags().Lookup("num-entries")) + listCmd.PersistentFlags().Int64P("num-entries", "n", 20, "The number of entries to list") + viper.BindPFlag("listNumEntries", listCmd.PersistentFlags().Lookup("num-entries")) rootCmd.AddCommand(listCmd) } diff --git a/cmd/root.go b/cmd/root.go index 8fccc0e..871cb4a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -37,6 +37,6 @@ func Execute() { func init() { cobra.OnInitialize(InitApp) rootCmd.PersistentFlags().String("config", "", "config file (default is $HOME/.diary.toml)") - viper.BindPFlag("config", rootCmd.Flags().Lookup("config")) + viper.BindPFlag("config", rootCmd.Flags().Lookup("config")) rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") } diff --git a/cmd/today.go b/cmd/today.go index bea83bf..237d156 100644 --- a/cmd/today.go +++ b/cmd/today.go @@ -7,9 +7,9 @@ package cmd import ( "time" - "github.com/spf13/viper" "git.nagee.dev/isthisnagee/diary/model" "github.com/spf13/cobra" + "github.com/spf13/viper" ) // todayCmd represents the today command @@ -24,7 +24,7 @@ var todayCmd = &cobra.Command{ Run: func(cmd *cobra.Command, args []string) { var created_after_ts *int64 = new(int64) var created_before_ts *int64 = new(int64) - var num_entries *int64 = new(int64) + var num_entries *int64 = new(int64) var now = time.Now() var startOfToday = time.Date( @@ -41,13 +41,13 @@ var todayCmd = &cobra.Command{ var endOfToday = startOfToday.AddDate(0, 0, 1) *created_before_ts = endOfToday.Unix() - if viper.GetInt64("listNumEntries") > 0 { - *num_entries = viper.GetInt64("listNumEntries") - } + if viper.GetInt64("listNumEntries") > 0 { + *num_entries = viper.GetInt64("listNumEntries") + } results := App.Db.GetDiaryEntries(model.GetDiaryEntriesQuery{ CreatedBeforeTs: created_before_ts, CreatedAfterTs: created_after_ts, - NumEntries: num_entries, + NumEntries: num_entries, }) PrintEntries(results) diff --git a/cmd/util.go b/cmd/util.go index 85f910d..94d850e 100644 --- a/cmd/util.go +++ b/cmd/util.go @@ -34,7 +34,7 @@ func initConfig() Cfg { home, err := os.UserHomeDir() cobra.CheckErr(err) - cfgFile := viper.GetString("config") + cfgFile := viper.GetString("config") if cfgFile != "" { // Use config file from the flag. viper.SetConfigFile(cfgFile) @@ -51,13 +51,13 @@ func initConfig() Cfg { viper.AutomaticEnv() // read in environment variables that match - if err := viper.ReadInConfig(); err != nil { - if _, ok := err.(viper.ConfigFileNotFoundError); ok { - // Config file not found. That's OK - } else { - cobra.CheckErr(err) - } - } + if err := viper.ReadInConfig(); err != nil { + if _, ok := err.(viper.ConfigFileNotFoundError); ok { + // Config file not found. That's OK + } else { + cobra.CheckErr(err) + } + } return Cfg{viper.GetString("db_path")} } diff --git a/model/entry.go b/model/entry.go index bd778da..9d070b5 100644 --- a/model/entry.go +++ b/model/entry.go @@ -105,7 +105,7 @@ type GetDiaryEntriesQuery struct { /// Inclusive CreatedAfterTs *int64 - NumEntries *int64 + NumEntries *int64 } func (app *App) GetDiaryEntries(q GetDiaryEntriesQuery) []*DiaryEntry { @@ -122,10 +122,10 @@ func (app *App) GetDiaryEntries(q GetDiaryEntriesQuery) []*DiaryEntry { whereParams = append(whereParams, *q.CreatedAfterTs) } query += " ORDER BY created_at desc, id desc" - if q.NumEntries != nil { - query += " LIMIT ?" + if q.NumEntries != nil { + query += " LIMIT ?" whereParams = append(whereParams, *q.NumEntries) - } + } rows, err := app.Db.Query( query, diff --git a/model/entry_test.go b/model/entry_test.go index 5acb3e2..54c5010 100644 --- a/model/entry_test.go +++ b/model/entry_test.go @@ -2,34 +2,34 @@ package model import ( "git.nagee.dev/isthisnagee/diary/db" + "runtime/debug" "testing" - "runtime/debug" ) func assert_string(t *testing.T, expected string, actual string) { if actual != expected { - t.Log(string(debug.Stack())) + t.Log(string(debug.Stack())) t.Fatalf("(%v, %v)", expected, actual) } } func assert_int(t *testing.T, expected int64, actual int64) { if actual != expected { - t.Log(string(debug.Stack())) + t.Log(string(debug.Stack())) t.Fatalf("(%v, %v)", expected, actual) } } func assert_bool(t *testing.T, expected bool, actual bool) { if actual != expected { - t.Log(string(debug.Stack())) + t.Log(string(debug.Stack())) t.Fatalf("(%v, %v)", expected, actual) } } func assert_exists(t *testing.T, actual interface{}) { if actual == nil { - t.Log(string(debug.Stack())) + t.Log(string(debug.Stack())) t.Fatalf("Unexpected nil: %s", actual) } } @@ -111,27 +111,25 @@ func TestGetDiaryEntries(t *testing.T) { var result_1 = app.NewDiaryEntry("Met with Nagee @ 1PM") var result_2 = app.NewDiaryEntry("Met with Nagee @ 2PM") - // no numEntries + // no numEntries entries := app.GetDiaryEntries( - GetDiaryEntriesQuery{}, - ) + GetDiaryEntriesQuery{}, + ) - assert_int(t, int64(len(entries)), 2) + assert_int(t, int64(len(entries)), 2) assert_int(t, result_2.Id, entries[0].Id) assert_int(t, result_1.Id, entries[1].Id) - - var numEntries = new(int64) - *numEntries = 1 + var numEntries = new(int64) + *numEntries = 1 entries = app.GetDiaryEntries( - GetDiaryEntriesQuery{ - NumEntries: numEntries, - }, - ) + GetDiaryEntriesQuery{ + NumEntries: numEntries, + }, + ) - assert_int(t, int64(len(entries)), 1) + assert_int(t, int64(len(entries)), 1) assert_int(t, result_2.Id, entries[0].Id) - teardown(app) }