fix(remoteocd): windows compatibility (#438)

Author: lucarin91

cmd/remoteocd/adb.go

@@ -1,12 +1,9 @@
 package main
 
 import (
-	"bufio"
-	"bytes"
 	"context"
 	"fmt"
 	"io"
-	"io/fs"
 	"os"
 	"os/exec"
 	"strings"
@@ -18,137 +15,43 @@ import (
 type ADBConnection struct {
 	host    string
 	adbPath string
+	conn    remote.RemoteFs
 }
 
 func FromSerial(serial string, adbPath string) *ADBConnection {
-	if adbPath == "" {
-		adbPath = adb.FindAdbPath()
-	}
+	serial = strings.ToLower(serial) // ensure serial is always lowecase (especially on windows)
+
+	conn, _ := adb.FromSerial(serial, adbPath)
+
 	return &ADBConnection{
 		host:    serial,
 		adbPath: adbPath,
+		conn:    conn,
 	}
 }
 
 func (a *ADBConnection) List(path string) ([]remote.FileInfo, error) {
-	cmd := exec.Command(a.adbPath, "-s", a.host, "shell", "ls", "-la", path) // nolint:gosec
-	cmd.Stderr = os.Stdout
-	output, err := cmd.StdoutPipe()
-	if err != nil {
-		return nil, err
-	}
-	defer output.Close()
-	if err := cmd.Start(); err != nil {
-		return nil, err
-	}
-
-	r := bufio.NewReader(output)
-	_, err = r.ReadBytes('\n') // Skip the first line
-	if err != nil {
-		return nil, err
-	}
-
-	var files []remote.FileInfo
-	for {
-		line, err := r.ReadBytes('\n')
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			return nil, err
-		}
-		line = bytes.TrimSpace(line)
-		if len(line) == 0 {
-			continue
-		}
-		parts := bytes.Split(line, []byte(" "))
-		name := string(parts[len(parts)-1])
-		if name == "." || name == ".." {
-			continue
-		}
-		files = append(files, remote.FileInfo{
-			Name:  name,
-			IsDir: line[0] == 'd',
-		})
-	}
-
-	return files, nil
+	return a.conn.List(path)
 }
 
 func (a *ADBConnection) Stats(path string) (remote.FileInfo, error) {
-	cmd := exec.Command(a.adbPath, "-s", a.host, "shell", "file", path) // nolint:gosec
-	output, err := cmd.StdoutPipe()
-	if err != nil {
-		return remote.FileInfo{}, err
-	}
-	defer output.Close()
-	if err := cmd.Start(); err != nil {
-		return remote.FileInfo{}, err
-	}
-
-	r := bufio.NewReader(output)
-	line, err := r.ReadBytes('\n')
-	if err != nil {
-		return remote.FileInfo{}, err
-	}
-
-	line = bytes.TrimSpace(line)
-	parts := bytes.Split(line, []byte(":"))
-	if len(parts) < 2 {
-		return remote.FileInfo{}, fmt.Errorf("unexpected file command output: %s", line)
-	}
-
-	name := string(bytes.TrimSpace(parts[0]))
-	other := string(bytes.TrimSpace(parts[1]))
-
-	if strings.Contains(other, "cannot open") {
-		return remote.FileInfo{}, fs.ErrNotExist
-	}
-
-	return remote.FileInfo{
-		Name:  name,
-		IsDir: other == "directory",
-	}, nil
+	return a.conn.Stats(path)
 }
 
 func (a *ADBConnection) ReadFile(path string) (io.ReadCloser, error) {
-	cmd := exec.Command(a.adbPath, "-s", a.host, "shell", "cat", path) // nolint:gosec
-	output, err := cmd.StdoutPipe()
-	if err != nil {
-		return nil, err
-	}
-	if err := cmd.Start(); err != nil {
-		return nil, err
-	}
-	return output, nil
+	return a.conn.ReadFile(path)
 }
 
 func (a *ADBConnection) WriteFile(r io.Reader, path string) error {
-	cmd := exec.Command(a.adbPath, "-s", a.host, "shell", "cat", ">", path) // nolint:gosec
-	cmd.Stdin = r
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		return fmt.Errorf("failed to write file %q: %w: %s", path, err, out)
-	}
-	return nil
+	return a.conn.WriteFile(r, path)
 }
 
 func (a *ADBConnection) MkDirAll(path string) error {
-	cmd := exec.Command(a.adbPath, "-s", a.host, "shell", "mkdir", "-p", path) // nolint:gosec
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		return fmt.Errorf("failed to create directory %q: %w: %s", path, err, out)
-	}
-	return nil
+	return a.conn.MkDirAll(path)
 }
 
 func (a *ADBConnection) Remove(path string) error {
-	cmd := exec.Command(a.adbPath, "-s", a.host, "shell", "rm", "-r", path) // nolint:gosec
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		return fmt.Errorf("failed to remove path %q: %w: %s", path, err, out)
-	}
-	return nil
+	return a.conn.Remove(path)
 }
 
 func (a *ADBConnection) RunOpenOcd(ctx context.Context, path, address string) (string, error) {