diff options
author | Vidhu Kant Sharma <vidhukant@vidhukant.xyz> | 2022-09-30 15:10:58 +0530 |
---|---|---|
committer | Vidhu Kant Sharma <vidhukant@vidhukant.xyz> | 2022-09-30 15:10:58 +0530 |
commit | d67758bdbeb162adadb6b19954e8e22cf04ed388 (patch) | |
tree | 1438369c1d980ebb041a04264da6d9006473e967 /mal | |
parent | 37b5c5457d51b50af1dcadaf7c85be7e7349d682 (diff) |
reading both flags and config for searching commands
Diffstat (limited to 'mal')
-rw-r--r-- | mal/mal.go | 36 |
1 files changed, 0 insertions, 36 deletions
@@ -20,7 +20,6 @@ package mal import ( "github.com/MikunoNaka/macli/auth" - "github.com/spf13/viper" a "github.com/MikunoNaka/MAL2Go/v4/anime" m "github.com/MikunoNaka/MAL2Go/v4/manga" u "github.com/MikunoNaka/MAL2Go/v4/user" @@ -47,41 +46,6 @@ func Init() { } tk := "Bearer " + Secret - /* NOTE: currently, macli is checking wether the specified - * search length, etc is the default value (5) or not. if it is not - * then it wont do anything. if it is, then if a config file - * exists the value in the config file will be used - * this works but flags won't be able to take precedence - * - * i.e if the value in config file is 6 but I want to set it to 5 through - * flags, it will see that the value is the default value so it'll use - * the value in the macli.yaml file which is 6. in this case the - * flags aren't taking precedence. fix that! */ - // load config file vars (if any) - confSearchLength := viper.Get("searching.search_length") - confSearchOffset := viper.Get("searching.search_offset") - confSearchNsfw := viper.Get("searching.search_nsfw") - confSecret := viper.Get("auth.token") - - // if SearchLength is the default value just use the one in config file if any - if confSearchLength != nil && SearchLength == 10 { - SearchLength = confSearchLength.(int) - } - // if SearchOffset is the default value just use the one in config file if any - if confSearchOffset != nil && SearchOffset == 0 { - SearchOffset = confSearchOffset.(int) - } - // if SearchNsfw is the default value just use the one in config file if any - if confSearchNsfw != nil && SearchNSFW == false { - SearchNSFW = confSearchNsfw.(bool) - } - - /* the secret stored in the config file - * takes precedence on the system keyring */ - if confSecret != nil && confSecret != "" { - Secret = confSecret.(string) - } - // initialise MAL2Go Client(s) animeClient.AuthToken = tk mangaClient.AuthToken = tk |