Reorganize itctl structure

2021-10-23 15:11:04 -07:00
parent 8cf2b47733
commit ef4bad94b5
15 changed files with 40 additions and 50 deletions
--- a/cmd/itctl/firmware/firmware.go
+++ b/cmd/itctl/firmware/firmware.go
@@ -0,0 +1,35 @@
+/*
+ *	itd uses bluetooth low energy to communicate with InfiniTime devices
+ *	Copyright (C) 2021 Arsen Musayelyan
+ *
+ *	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 firmware
+
+import (
+	"github.com/spf13/cobra"
+	"go.arsenm.dev/itd/cmd/itctl/root"
+)
+
+// firmwareCmd represents the firmware command
+var firmwareCmd = &cobra.Command{
+	Use:     "firmware",
+	Short:   "Manage InfiniTime firmware",
+	Aliases: []string{"fw"},
+}
+
+func init() {
+	root.RootCmd.AddCommand(firmwareCmd)
+}
--- a/cmd/itctl/firmware/upgrade.go
+++ b/cmd/itctl/firmware/upgrade.go
@@ -0,0 +1,133 @@
+/*
+ *	itd uses bluetooth low energy to communicate with InfiniTime devices
+ *	Copyright (C) 2021 Arsen Musayelyan
+ *
+ *	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 firmware
+
+import (
+	"bufio"
+	"encoding/json"
+	"net"
+
+	"github.com/cheggaaa/pb/v3"
+	"github.com/mitchellh/mapstructure"
+	"github.com/rs/zerolog/log"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"go.arsenm.dev/itd/internal/types"
+)
+
+type DFUProgress struct {
+	Received int64 `mapstructure:"recvd"`
+	Total    int64 `mapstructure:"total"`
+}
+
+
+// upgradeCmd represents the upgrade command
+var upgradeCmd = &cobra.Command{
+	Use:     "upgrade",
+	Short:   "Upgrade InfiniTime firmware using files or archive",
+	Aliases: []string{"upg"},
+	Run: func(cmd *cobra.Command, args []string) {
+		// Connect to itd UNIX socket
+		conn, err := net.Dial("unix", viper.GetString("sockPath"))
+		if err != nil {
+			log.Fatal().Err(err).Msg("Error dialing socket. Is itd running?")
+		}
+		defer conn.Close()
+
+		var data types.ReqDataFwUpgrade
+		// Get relevant data struct
+		if viper.GetString("archive") != "" {
+			// Get archive data struct
+			data = types.ReqDataFwUpgrade{
+				Type:  types.UpgradeTypeArchive,
+				Files: []string{viper.GetString("archive")},
+			}
+		} else if viper.GetString("initPkt") != "" && viper.GetString("firmware") != "" {
+			// Get files data struct
+			data = types.ReqDataFwUpgrade{
+				Type:  types.UpgradeTypeFiles,
+				Files: []string{viper.GetString("initPkt"), viper.GetString("firmware")},
+			}
+		} else {
+			cmd.Usage()
+			log.Warn().Msg("Upgrade command requires either archive or init packet and firmware.")
+			return
+		}
+
+		// Encode response into connection
+		err = json.NewEncoder(conn).Encode(types.Request{
+			Type: types.ReqTypeFwUpgrade,
+			Data: data,
+		})
+		if err != nil {
+			log.Fatal().Err(err).Msg("Error making request")
+		}
+
+		// Create progress bar template
+		barTmpl := `{{counters . }} B {{bar . "|" "-" (cycle .) " " "|"}} {{percent . }} {{rtime . "%s"}}`
+		// Start full bar at 0 total
+		bar := pb.ProgressBarTemplate(barTmpl).Start(0)
+		// Create new scanner of connection
+		scanner := bufio.NewScanner(conn)
+		for scanner.Scan() {
+			var res types.Response
+			// Decode scanned line into response struct
+			err = json.Unmarshal(scanner.Bytes(), &res)
+			if err != nil {
+				log.Fatal().Err(err).Msg("Error decoding JSON response")
+			}
+			if res.Error {
+				log.Fatal().Msg(res.Message)
+			}
+			var event DFUProgress
+			// Decode response data into progress struct
+			err = mapstructure.Decode(res.Value, &event)
+			if err != nil {
+				log.Fatal().Err(err).Msg("Error decoding response data")
+			}
+			// Set total bytes in progress bar
+			bar.SetTotal(event.Total)
+			// Set amount of bytes received in progress bar
+			bar.SetCurrent(event.Received)
+			// If transfer finished, break
+			if event.Received == event.Total {
+				break
+			}
+		}
+		// Finish progress bar
+		bar.Finish()
+		if scanner.Err() != nil {
+			log.Fatal().Err(scanner.Err()).Msg("Error while scanning output")
+		}
+	},
+}
+
+func init() {
+	firmwareCmd.AddCommand(upgradeCmd)
+
+	// Register flags
+	upgradeCmd.Flags().StringP("archive", "a", "", "Path to firmware archive")
+	upgradeCmd.Flags().StringP("init-pkt", "i", "", "Path to init packet (.dat file)")
+	upgradeCmd.Flags().StringP("firmware", "f", "", "Path to firmware image (.bin file)")
+
+	// Bind flags to viper keys
+	viper.BindPFlag("archive", upgradeCmd.Flags().Lookup("archive"))
+	viper.BindPFlag("initPkt", upgradeCmd.Flags().Lookup("init-pkt"))
+	viper.BindPFlag("firmware", upgradeCmd.Flags().Lookup("firmware"))
+}
--- a/cmd/itctl/firmware/version.go
+++ b/cmd/itctl/firmware/version.go
@@ -0,0 +1,78 @@
+/*
+ *	itd uses bluetooth low energy to communicate with InfiniTime devices
+ *	Copyright (C) 2021 Arsen Musayelyan
+ *
+ *	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 firmware
+
+import (
+	"bufio"
+	"encoding/json"
+	"fmt"
+	"net"
+
+	"github.com/rs/zerolog/log"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"go.arsenm.dev/itd/internal/types"
+)
+
+// versionCmd represents the version command
+var versionCmd = &cobra.Command{
+	Use:     "version",
+	Aliases: []string{"ver"},
+	Short:   "Get firmware version of InfiniTime",
+	Run: func(cmd *cobra.Command, args []string) {
+		// Connect to itd UNIX socket
+		conn, err := net.Dial("unix", viper.GetString("sockPath"))
+		if err != nil {
+			log.Fatal().Err(err).Msg("Error dialing socket. Is itd running?")
+		}
+		defer conn.Close()
+
+		// Encode request into connection
+		err = json.NewEncoder(conn).Encode(types.Request{
+			Type: types.ReqTypeFwVersion,
+		})
+		if err != nil {
+			log.Fatal().Err(err).Msg("Error making request")
+		}
+
+		// Read one line from connection
+		line, _, err := bufio.NewReader(conn).ReadLine()
+		if err != nil {
+			log.Fatal().Err(err).Msg("Error reading line from connection")
+		}
+
+		var res types.Response
+		// Decode line into response
+		err = json.Unmarshal(line, &res)
+		if err != nil {
+			log.Fatal().Err(err).Msg("Error decoding JSON data")
+		}
+
+		if res.Error {
+			log.Fatal().Msg(res.Message)
+		}
+
+		// Print returned value
+		fmt.Println(res.Value)
+	},
+}
+
+func init() {
+	firmwareCmd.AddCommand(versionCmd)
+}