From 563ab5814e38044dc8f22e64e4b39f55a868d721 Mon Sep 17 00:00:00 2001
From: Vidhu Kant Sharma <vidhukant@vidhukant.com>
Date: Fri, 28 Jul 2023 17:42:18 +0530
Subject: removed version command, added -v flag to root

---
 cmd/root.go    | 52 +++++++++++++++++++++++-----------------------------
 cmd/version.go | 40 ----------------------------------------
 2 files changed, 23 insertions(+), 69 deletions(-)
 delete mode 100644 cmd/version.go

(limited to 'cmd')

diff --git a/cmd/root.go b/cmd/root.go
index 413e6f2..67a24c9 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -21,6 +21,7 @@ package cmd
 import (
 	"os"
 	"fmt"
+  "runtime"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -29,21 +30,13 @@ import (
 var (
 	queryOnlyMode, mangaMode bool
 	entryId int
-
-	// // auth
-	// saveClientId string = "yes"
-	// // searching
-    // promptLength, searchLength, searchOffset int = 5, 10, 0
-	// searchNsfw bool = false
-	// // lists
-	// listOffset, listLength int = 0, 15
-	// listIncludeNsfw bool = false
 )
 
 var rootCmd = &cobra.Command{
 	Use: "macli",
 	Short: "macli - Unofficial CLI-Based MyAnimeList Client.",
 	Long: "macli is an unofficial MyAnimeList Client for use inside the terminal.",
+  Version: "v1.17.1" + " " + runtime.GOOS + "/" + runtime.GOARCH,
 }
 
 func init() {
@@ -51,33 +44,34 @@ func init() {
 }
 
 func initConfig() {
-	viper.SetConfigName("macli")
-	//viper.SetConfigType("yaml")
-    viper.AddConfigPath(".")
-    viper.AddConfigPath("$HOME/.config")
-    viper.AddConfigPath("/etc")
+  viper.SetConfigName("macli")
+  viper.AddConfigPath(".")
+  viper.AddConfigPath("$HOME/.config")
+  viper.AddConfigPath("/etc")
 
 	// dont show error if file not found
 	// macli doesnt need a config file to work properly
-    if err := viper.ReadInConfig(); err != nil {
-		// error if config file found but has errors
-	    if _, ok := err.(viper.ConfigFileNotFoundError); !ok {
-			fmt.Println("Error while reading macli config file:", err)
-			fmt.Println("Exiting... Please check the macli config file.")
-			os.Exit(1)
-	    }
+  if err := viper.ReadInConfig(); err != nil {
+    // error if config file found but has errors
+
+    if _, ok := err.(viper.ConfigFileNotFoundError); !ok {
+      // if config file isn't found
+      fmt.Println("Error while reading macli config file:", err)
+      fmt.Println("Exiting... Please check the macli config file.")
+      os.Exit(1)
+    }
 	}
 
-	viper.SetDefault("searching.prompt_length", 5)
-	viper.SetDefault("searching.search_length", 10)
-	viper.SetDefault("searching.search_offset", 0)
-	viper.SetDefault("searching.search_nsfw", false)
+  viper.SetDefault("searching.prompt_length", 5)
+  viper.SetDefault("searching.search_length", 10)
+  viper.SetDefault("searching.search_offset", 0)
+  viper.SetDefault("searching.search_nsfw", false)
 
-	viper.SetDefault("lists.list_offset", 0)
-	viper.SetDefault("lists.list_length", 15)
-	viper.SetDefault("lists.include_nsfw_results", false)
+  viper.SetDefault("lists.list_offset", 0)
+  viper.SetDefault("lists.list_length", 15)
+  viper.SetDefault("lists.include_nsfw_results", false)
 
-	viper.SetDefault("auth.save_client_id", "yes")
+  viper.SetDefault("auth.save_client_id", "yes")
 }
 
 func Execute() {
diff --git a/cmd/version.go b/cmd/version.go
deleted file mode 100644
index 9f848f1..0000000
--- a/cmd/version.go
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-macli - Unofficial CLI-Based MyAnimeList Client
-Copyright © 2022 Vidhu Kant Sharma <vidhukant@vidhukant.xyz>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package cmd
-
-import (
-	"fmt"
-	"github.com/spf13/cobra"
-	"runtime"
-)
-
-const version string = "v1.17.1"
-
-var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "Shows current version",
-	Long:  "Shows current version of macli",
-	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("macli version", version, runtime.GOOS+"/"+runtime.GOARCH)
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(versionCmd)
-}
-- 
cgit v1.2.3