# HG changeset patch # User Peter Sanchez # Date 1621992706 25200 # Tue May 25 18:31:46 2021 -0700 # Branch refactor # Node ID 810e216b7f7c6a6a4ceef95a570d4c9268fc49e0 # Parent 84fb261a0ba98faec3237dd5435e51dd371f115b Moving db file to the flags struct diff --git a/cmd/clear.go b/cmd/clear.go --- a/cmd/clear.go +++ b/cmd/clear.go @@ -39,7 +39,7 @@ // ClearFiles remove all tags for given file func ClearFiles(cmd *cobra.Command, args []string) error { cmd.SilenceUsage = true // Usage is correct, don't show on errors - qm, err := lib.NewQueryManager(dbFile) + qm, err := lib.NewQueryManager() if err != nil { return err } @@ -64,7 +64,7 @@ // ClearTags remove all tag assignments for given tag func ClearTags(cmd *cobra.Command, args []string) error { cmd.SilenceUsage = true // Usage is correct, don't show on errors - qm, err := lib.NewQueryManager(dbFile) + qm, err := lib.NewQueryManager() if err != nil { return err } diff --git a/cmd/db.go b/cmd/db.go --- a/cmd/db.go +++ b/cmd/db.go @@ -73,7 +73,7 @@ // UpgradeSchema upgrades db schema if needed func UpgradeSchema(cmd *cobra.Command, args []string) error { cmd.SilenceUsage = true // Usage is correct, don't show on errors - qm, err := lib.NewQueryManager(dbFile) + qm, err := lib.NewQueryManager() if err != nil { return err } diff --git a/cmd/delete.go b/cmd/delete.go --- a/cmd/delete.go +++ b/cmd/delete.go @@ -39,7 +39,7 @@ // DeleteFiles deletes files from db func DeleteFiles(cmd *cobra.Command, args []string) error { cmd.SilenceUsage = true // Usage is correct, don't show on errors - qm, err := lib.NewQueryManager(dbFile) + qm, err := lib.NewQueryManager() if err != nil { return err } @@ -64,7 +64,7 @@ // DeleteTags deletes tags from db func DeleteTags(cmd *cobra.Command, args []string) error { cmd.SilenceUsage = true // Usage is correct, don't show on errors - qm, err := lib.NewQueryManager(dbFile) + qm, err := lib.NewQueryManager() if err != nil { return err } diff --git a/cmd/files.go b/cmd/files.go --- a/cmd/files.go +++ b/cmd/files.go @@ -24,7 +24,7 @@ func ListFiles(cmd *cobra.Command, args []string) error { cmd.SilenceUsage = true // Usage is correct, don't show on errors ctype, _ := cmd.Flags().GetString("ctype") - qm, err := lib.NewQueryManager(dbFile) + qm, err := lib.NewQueryManager() if err != nil { return err } diff --git a/cmd/merge.go b/cmd/merge.go --- a/cmd/merge.go +++ b/cmd/merge.go @@ -22,7 +22,7 @@ // MergeTags merges all tags from old-tag into new-tag func MergeTags(cmd *cobra.Command, args []string) error { cmd.SilenceUsage = true // Usage is correct, don't show on errors - qm, err := lib.NewQueryManager(dbFile) + qm, err := lib.NewQueryManager() if err != nil { return err } diff --git a/cmd/search.go b/cmd/search.go --- a/cmd/search.go +++ b/cmd/search.go @@ -29,7 +29,7 @@ ltags, _ := cmd.Flags().GetString("tags") conf := &lib.SearchFilesConfig{Search: args[0]} - qm, err := lib.NewQueryManager(dbFile) + qm, err := lib.NewQueryManager() if err != nil { return err } diff --git a/cmd/stats.go b/cmd/stats.go --- a/cmd/stats.go +++ b/cmd/stats.go @@ -22,7 +22,7 @@ // ListTags lists all tags in the database func ListTags(cmd *cobra.Command, args []string) error { cmd.SilenceUsage = true // Usage is correct, don't show on errors - qm, err := lib.NewQueryManager(dbFile) + qm, err := lib.NewQueryManager() if err != nil { return err } diff --git a/cmd/tag.go b/cmd/tag.go --- a/cmd/tag.go +++ b/cmd/tag.go @@ -41,7 +41,7 @@ ltags, _ := cmd.Flags().GetString("tags") desc, _ := cmd.Flags().GetString("desc") index, _ := cmd.Flags().GetBool("index") - qm, err := lib.NewQueryManager(dbFile) + qm, err := lib.NewQueryManager() if err != nil { return err } diff --git a/cmd/tags.go b/cmd/tags.go --- a/cmd/tags.go +++ b/cmd/tags.go @@ -22,7 +22,7 @@ // ShowFileTags shows tags assigned to given file func ShowFileTags(cmd *cobra.Command, args []string) error { cmd.SilenceUsage = true // Usage is correct, don't show on errors - qm, err := lib.NewQueryManager(dbFile) + qm, err := lib.NewQueryManager() if err != nil { return err } diff --git a/lib/db.go b/lib/db.go --- a/lib/db.go +++ b/lib/db.go @@ -201,8 +201,8 @@ } // NewQueryManager returns a new QueryManager instance -func NewQueryManager(dbFile string) (*QueryManager, error) { - db, err := GetDatabase(dbFile) +func NewQueryManager() (*QueryManager, error) { + db, err := GetDatabase(TagoRunFlags.DbFile) if err != nil { fmt.Fprintf( os.Stderr,