timoxa0/lon-tool
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 4 Wiki Activity

Fix nil pointer panic

Browse source
This commit is contained in:
timoxa0 2024-06-21 17:30:46 +05:00
parent d3e41c0ce1
commit 3d7b885994
2 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
cmd/deploy.go
View file

@ -3,8 +3,8 @@ package cmd
import ( import (
"io" "io"
"io/fs" "io/fs"
"lon-tool/utils"
"lon-tool/image" "lon-tool/image"
"lon-tool/utils"
"net" "net"
"os" "os"
"regexp" "regexp"
@ -30,6 +30,7 @@ var deployCmd = &cobra.Command{
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
var msg string var msg string
req_repartition := partsize != "" req_repartition := partsize != ""
image, close, err := image.ReadImage(args[0]) image, close, err := image.ReadImage(args[0])
@ -44,6 +45,7 @@ var deployCmd = &cobra.Command{
logger.Fatal("Failed to get adb client", logger.Args(err)) logger.Fatal("Failed to get adb client", logger.Args(err))
} }
fb_devs, err := fastboot.FindDevices() fb_devs, err := fastboot.FindDevices()
logger.Debug("Devices", logger.Args("Devices", fb_devs, "err", err))
if err != nil { if err != nil {
logger.Fatal("Failed to get fastboot device", logger.Args(err)) logger.Fatal("Failed to get fastboot device", logger.Args(err))
} }
@ -56,14 +58,16 @@ var deployCmd = &cobra.Command{
if serail == "autodetect" { if serail == "autodetect" {
for _, dev := range fb_devs { for _, dev := range fb_devs {
product, err := dev.GetVar("product") product, err := dev.GetVar("product")
devSerial, _ := dev.Device.SerialNumber()
if err != nil { if err != nil {
logger.Warn("Unable to communicate with device", logger.Args("Serial", dev.Serial)) logger.Warn("Unable to communicate with device", logger.Args("Serial", devSerial))
logger.Debug("Unable to communicate with device", logger.Args("err", err))
continue continue
} }
logger.Debug("Found device", logger.Args("Product", product, "Sraial", dev.Serial)) logger.Debug("Found device", logger.Args("Product", product, "Sraial", devSerial, "object", dev))
if product == "nabu" { if product == "nabu" {
logger.Debug("Nabu found", logger.Args("Serial", dev.Serial)) logger.Debug("Nabu found", logger.Args("Serial", devSerial))
serail = dev.Serial serail = devSerial
if !req_repartition { if !req_repartition {
_, err1 := dev.GetVar("partition-type:linux") _, err1 := dev.GetVar("partition-type:linux")
_, err2 := dev.GetVar("partition-type:esp") _, err2 := dev.GetVar("partition-type:esp")
@ -72,6 +76,9 @@ var deployCmd = &cobra.Command{
break break
} }
} }
for _, dev := range fb_devs {
dev.Close()
}
if serail == "autodetect" { if serail == "autodetect" {
logger.Fatal("Nabu in fastboot mode not found") logger.Fatal("Nabu in fastboot mode not found")
os.Exit(170) os.Exit(170)
@ -106,6 +113,10 @@ var deployCmd = &cobra.Command{
} else { } else {
run_repartition, _ = pterm.DefaultInteractiveConfirm.Show("Found compatible partition table. Do you want to change it?") run_repartition, _ = pterm.DefaultInteractiveConfirm.Show("Found compatible partition table. Do you want to change it?")
} }
if req_repartition && !run_repartition {
pterm.Println("Bye")
os.Exit(0)
}
for { for {
if partsize != "" || !run_repartition { if partsize != "" || !run_repartition {
@ -155,7 +166,14 @@ var deployCmd = &cobra.Command{
pterm.Println("Bye") pterm.Println("Bye")
os.Exit(253) os.Exit(253)
} }
fb_dev, _ := fastboot.FindDevice(serail) fb_dev, err := fastboot.FindDevice(serail)
if err != nil {
logger.Error("Unable to find device", logger.Args("object", fb_dev, "err", err))
fb_devs, err := fastboot.FindDevices()
logger.Debug("Devices", logger.Args("Devices", fb_devs, "err", err))
os.Exit(255)
}
adbd := adbc.Device(adb.DeviceWithSerial(serail)) adbd := adbc.Device(adb.DeviceWithSerial(serail))
bootdata, err := utils.Files.OrangeFox.Get(*pbar.WithTitle("Downloading orangefox")) bootdata, err := utils.Files.OrangeFox.Get(*pbar.WithTitle("Downloading orangefox"))
if err != nil { if err != nil {
@ -166,7 +184,6 @@ var deployCmd = &cobra.Command{
os.Exit(179) os.Exit(179)
} }
} }
logger.Debug("Bootdata")
if run_repartition { if run_repartition {
gpt, err := utils.Files.GPT.Get(*pbar.WithTitle("Downloading default partition table")) gpt, err := utils.Files.GPT.Get(*pbar.WithTitle("Downloading default partition table"))

12
cmd/uninstall.go
View file

@ -28,17 +28,21 @@ var uninstallCmd = &cobra.Command{
if serail == "autodetect" { if serail == "autodetect" {
for _, dev := range fb_devs { for _, dev := range fb_devs {
product, err := dev.GetVar("product") product, err := dev.GetVar("product")
devSerial, _ := dev.Device.SerialNumber()
if err != nil { if err != nil {
logger.Warn("Unable to communicate with device", logger.Args("Serial", dev.Serial)) logger.Warn("Unable to communicate with device", logger.Args("Serial", devSerial))
continue continue
} }
logger.Debug("Found device", logger.Args("Product", product, "Sraial", dev.Serial)) logger.Debug("Found device", logger.Args("Product", product, "Sraial", devSerial))
if product == "nabu" { if product == "nabu" {
logger.Debug("Nabu found", logger.Args("Serial", dev.Serial)) logger.Debug("Nabu found", logger.Args("Serial", devSerial))
serail = dev.Serial serail = devSerial
break break
} }
} }
for _, dev := range fb_devs {
dev.Close()
}
if serail == "autodetect" { if serail == "autodetect" {
logger.Fatal("Nabu in fastboot mode not found") logger.Fatal("Nabu in fastboot mode not found")
os.Exit(170) os.Exit(170)