Skip to content

Commit f74d3ff

Browse files
authored
chore: internalize libraries not used externally
1 parent d7e0ee8 commit f74d3ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+117
-925
lines changed

cmd/arduino-app-cli/app/list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/arduino/arduino-app-cli/cmd/feedback"
1313
"github.com/arduino/arduino-app-cli/internal/orchestrator"
1414
"github.com/arduino/arduino-app-cli/internal/orchestrator/config"
15-
"github.com/arduino/arduino-app-cli/pkg/tablestyle"
15+
"github.com/arduino/arduino-app-cli/internal/tablestyle"
1616
)
1717

1818
func newListCmd(cfg config.Configuration) *cobra.Command {

cmd/arduino-app-cli/board/board.go

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,17 @@ import (
44
"context"
55
"fmt"
66
"os"
7-
"path"
87
"strconv"
98

109
"github.com/spf13/cobra"
1110
"golang.org/x/term"
1211

1312
"github.com/arduino/arduino-app-cli/cmd/feedback"
14-
"github.com/arduino/arduino-app-cli/pkg/appsync"
1513
"github.com/arduino/arduino-app-cli/pkg/board"
1614
"github.com/arduino/arduino-app-cli/pkg/board/remote"
1715
"github.com/arduino/arduino-app-cli/pkg/board/remote/adb"
1816
)
1917

20-
const boardHomePath = "/home/arduino"
21-
2218
type contextKey string
2319

2420
const remoteConnKey contextKey = "remoteConn"
@@ -61,9 +57,6 @@ func NewBoardCmd() *cobra.Command {
6157
fsCmd.PersistentFlags().StringVarP(&fqbn, "fqbn", "b", "arduino:zephyr:unoq", "fqbn of the board")
6258
fsCmd.PersistentFlags().StringVar(&host, "host", "", "ADB host address")
6359

64-
fsCmd.AddCommand(newPushCmd())
65-
fsCmd.AddCommand(newPullCmd())
66-
fsCmd.AddCommand(newSyncAppCmd())
6760
fsCmd.AddCommand(newBoardListCmd())
6861
fsCmd.AddCommand(newBoardSetName())
6962
fsCmd.AddCommand(newSetPasswordCmd())
@@ -78,44 +71,6 @@ func NewBoardCmd() *cobra.Command {
7871
return fsCmd
7972
}
8073

81-
func newSyncAppCmd() *cobra.Command {
82-
syncAppCmd := &cobra.Command{
83-
Use: "enable-sync <path>",
84-
Short: "Enable sync of an path from the board",
85-
Args: cobra.ExactArgs(1),
86-
RunE: func(cmd *cobra.Command, args []string) error {
87-
conn := cmd.Context().Value(remoteConnKey).(remote.RemoteConn)
88-
89-
remote := path.Join(boardHomePath, args[0])
90-
91-
s, err := appsync.New(conn)
92-
if err != nil {
93-
return fmt.Errorf("failed to create apps sync: %w", err)
94-
}
95-
defer s.Close()
96-
s.OnPull = func(name, path string) {
97-
feedback.Printf(" ⬆️ Pulled app %q to folder %q", name, path)
98-
}
99-
s.OnPush = func(name string) {
100-
feedback.Printf(" ⬇️ Pushed app %q to the board", name)
101-
}
102-
103-
tmp, err := s.EnableSyncApp(remote)
104-
if err != nil {
105-
return fmt.Errorf("failed to enable sync for app %q: %w", remote, err)
106-
}
107-
108-
feedback.Printf("Enable sync of %q at %q", remote, tmp)
109-
110-
<-cmd.Context().Done()
111-
_ = s.DisableSyncApp(remote)
112-
return nil
113-
},
114-
}
115-
116-
return syncAppCmd
117-
}
118-
11974
func newBoardListCmd() *cobra.Command {
12075
listCmd := &cobra.Command{
12176
Use: "list",

cmd/arduino-app-cli/board/pull.go

Lines changed: 0 additions & 36 deletions
This file was deleted.

cmd/arduino-app-cli/board/push.go

Lines changed: 0 additions & 38 deletions
This file was deleted.

cmd/arduino-app-cli/brick/list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/internal/servicelocator"
88
"github.com/arduino/arduino-app-cli/cmd/feedback"
99
"github.com/arduino/arduino-app-cli/internal/orchestrator/bricks"
10-
"github.com/arduino/arduino-app-cli/pkg/tablestyle"
10+
"github.com/arduino/arduino-app-cli/internal/tablestyle"
1111
)
1212

1313
func newBricksListCmd() *cobra.Command {

cmd/arduino-app-cli/daemon/daemon.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ import (
77
"net/http"
88
"time"
99

10+
"github.com/jub0bs/cors"
11+
"github.com/spf13/cobra"
12+
1013
"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/internal/servicelocator"
1114
"github.com/arduino/arduino-app-cli/internal/api"
15+
"github.com/arduino/arduino-app-cli/internal/httprecover"
1216
"github.com/arduino/arduino-app-cli/internal/orchestrator"
1317
"github.com/arduino/arduino-app-cli/internal/orchestrator/config"
1418
"github.com/arduino/arduino-app-cli/internal/update"
1519
"github.com/arduino/arduino-app-cli/internal/update/apt"
1620
"github.com/arduino/arduino-app-cli/internal/update/arduino"
17-
"github.com/arduino/arduino-app-cli/pkg/httprecover"
18-
19-
"github.com/jub0bs/cors"
20-
"github.com/spf13/cobra"
2121
)
2222

2323
func NewDaemonCmd(cfg config.Configuration, version string) *cobra.Command {

cmd/arduino-app-cli/system/system.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import (
1010

1111
"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/internal/servicelocator"
1212
"github.com/arduino/arduino-app-cli/cmd/feedback"
13+
"github.com/arduino/arduino-app-cli/internal/helpers"
1314
"github.com/arduino/arduino-app-cli/internal/orchestrator"
1415
"github.com/arduino/arduino-app-cli/internal/orchestrator/config"
1516
"github.com/arduino/arduino-app-cli/internal/update"
1617
"github.com/arduino/arduino-app-cli/internal/update/apt"
1718
"github.com/arduino/arduino-app-cli/internal/update/arduino"
1819
"github.com/arduino/arduino-app-cli/pkg/board"
1920
"github.com/arduino/arduino-app-cli/pkg/board/remote/local"
20-
"github.com/arduino/arduino-app-cli/pkg/x"
2121
)
2222

2323
func NewSystemCmd(cfg config.Configuration) *cobra.Command {
@@ -151,7 +151,7 @@ func newCleanUpCmd(cfg config.Configuration, docker command.Cli) *cobra.Command
151151
feedback.Print(" - 1 running app")
152152
}
153153
feedback.Printf(" - %d containers", result.ContainersRemoved)
154-
feedback.Printf(" - %d images (%v)", result.ImagesRemoved, x.ToHumanMiB(result.SpaceFreed))
154+
feedback.Printf(" - %d images (%v)", result.ImagesRemoved, helpers.ToHumanMiB(result.SpaceFreed))
155155
return nil
156156
},
157157
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ require (
2828
github.com/docker/compose/v2 v2.38.3-0.20250716153459-17ba6c7188fe
2929
github.com/docker/docker v28.3.2+incompatible
3030
github.com/fatih/color v1.18.0
31-
github.com/fsnotify/fsnotify v1.9.0
3231
github.com/goccy/go-yaml v1.18.0
3332
github.com/gofrs/flock v0.12.1
3433
github.com/google/go-cmp v0.7.0
@@ -120,6 +119,7 @@ require (
120119
github.com/emirpasic/gods v1.18.1 // indirect
121120
github.com/felixge/httpsnoop v1.0.4 // indirect
122121
github.com/fsnotify/fsevents v0.2.0 // indirect
122+
github.com/fsnotify/fsnotify v1.9.0 // indirect
123123
github.com/fvbommel/sortorder v1.1.0 // indirect
124124
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
125125
github.com/getkin/kin-openapi v0.132.0 // indirect

internal/api/handlers/ai_models.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/arduino/arduino-app-cli/internal/api/models"
99
"github.com/arduino/arduino-app-cli/internal/orchestrator"
1010
"github.com/arduino/arduino-app-cli/internal/orchestrator/modelsindex"
11-
"github.com/arduino/arduino-app-cli/pkg/render"
11+
"github.com/arduino/arduino-app-cli/internal/render"
1212
)
1313

1414
func HandleModelsList(modelsIndex *modelsindex.ModelsIndex) http.HandlerFunc {

internal/api/handlers/app_clone.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/arduino/arduino-app-cli/internal/orchestrator"
1212
"github.com/arduino/arduino-app-cli/internal/orchestrator/app"
1313
"github.com/arduino/arduino-app-cli/internal/orchestrator/config"
14-
"github.com/arduino/arduino-app-cli/pkg/render"
14+
"github.com/arduino/arduino-app-cli/internal/render"
1515

1616
"github.com/docker/cli/cli/command"
1717
)

0 commit comments

Comments
 (0)