From 722ba1444f93cc8237c06d5a9e4415015e0a8b46 Mon Sep 17 00:00:00 2001 From: Ben Lebherz Date: Fri, 16 Jun 2023 09:41:41 +0200 Subject: [PATCH] make path to degendata repo configurable, read jsons after initializing other stuff --- cmd/live.go | 22 ++++++++++++---------- degendata | 2 +- internal/degendb/degendata/degendata.go | 1 + 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/cmd/live.go b/cmd/live.go index c41a2d1..1582cc6 100644 --- a/cmd/live.go +++ b/cmd/live.go @@ -128,14 +128,6 @@ func runGloomberg(_ *cobra.Command, _ []string) { gb.Pr(fmt.Sprintf("connected to %s providers: %s", style.AlmostWhiteStyle.Render(fmt.Sprint(len(providers))), style.AlmostWhiteStyle.Render(strings.Join(nodeNames, ", ")))) } - // - // degendata - ranks - go func() { - if err := degendata.LoadOpenseaRanks(gb); err != nil { - gbl.Log.Errorf("error loading opensea ranks: %v", err) - } - }() - // // queue for everything to print to the console terminalPrinterQueue := make(chan string, 256) @@ -418,6 +410,14 @@ func runGloomberg(_ *cobra.Command, _ []string) { }() } + // + // degendata - ranks + go func() { + if err := degendata.LoadOpenseaRanks(gb); err != nil { + gbl.Log.Errorf("error loading opensea ranks: %v", err) + } + }() + // // web ui if viper.GetBool("web.enabled") { @@ -447,6 +447,8 @@ func runGloomberg(_ *cobra.Command, _ []string) { select {} } +var degendataPath string + func init() { //nolint:gochecknoinits rootCmd.AddCommand(liveCmd) @@ -512,8 +514,8 @@ func init() { //nolint:gochecknoinits _ = viper.BindPFlag("show.unknown", liveCmd.Flags().Lookup("show-unknown")) // degendb - // liveCmd.Flags().StringVar(&ddbPath, "dd-path", "degendata", "path to degendata dir") - viper.SetDefault("degendata.path", "degendata") + liveCmd.Flags().StringVar(°endataPath, "degendata", "degendata", "path to degendata repo") + _ = viper.BindPFlag("degendata.path", liveCmd.Flags().Lookup("degendata")) // worker settings viper.SetDefault("trapri.numOpenSeaEventhandlers", 3) diff --git a/degendata b/degendata index 4f97757..8a4f6f9 160000 --- a/degendata +++ b/degendata @@ -1 +1 @@ -Subproject commit 4f97757d6614ba5b7ede001be594791404599c90 +Subproject commit 8a4f6f9fcb808ee7db4100992153547a946ba5da diff --git a/internal/degendb/degendata/degendata.go b/internal/degendb/degendata/degendata.go index 7f0a0ce..7ec7b0f 100644 --- a/internal/degendb/degendata/degendata.go +++ b/internal/degendb/degendata/degendata.go @@ -20,6 +20,7 @@ import ( func LoadOpenseaRanks(gb *gloomberg.Gloomberg) error { ddPathRanks := path.Join(viper.GetString("degendata.path"), "ranks") + log.Debugf("loading opensea ranks from %s", ddPathRanks) ranksFiles, err := os.ReadDir(ddPathRanks) if err != nil {