Skip to content

Commit 6edf0dd

Browse files
committed
Removed dead code experiment for event handler
1 parent 97bb391 commit 6edf0dd

File tree

2 files changed

+0
-41
lines changed

2 files changed

+0
-41
lines changed

arduino/cores/packagemanager/package_manager.go

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,6 @@ type PackageManager struct {
5757
PackagesDir *paths.Path
5858
DownloadDir *paths.Path
5959
TempDir *paths.Path
60-
61-
// TODO: This might be a list in the future, but would it be of any help?
62-
eventHandler EventHandler
63-
}
64-
65-
// EventHandler defines the events that are generated by the PackageManager
66-
// Subscribing to such events allows, for instance, to print out logs of what is happening
67-
// (say you use them for a CLI...)
68-
type EventHandler interface {
69-
// FIXME: This is temporary, for prototyping (an handler should not return an handler; besides, this leakes
70-
// the usage of releases...)
7160
}
7261

7362
// NewPackageManager returns a new instance of the PackageManager
@@ -219,21 +208,6 @@ func (pm *PackageManager) ResolveFQBN(fqbn *cores.FQBN) (
219208
return targetPackage, platformRelease, board, buildProperties, buildPlatformRelease, nil
220209
}
221210

222-
// FIXME add an handler to be invoked on each verbose operation, in order to let commands display results through the formatter
223-
// as for the progress bars during download
224-
func (pm *PackageManager) RegisterEventHandler(eventHandler EventHandler) {
225-
if pm.eventHandler != nil {
226-
panic("Don't try to register another event handler to the PackageManager yet!")
227-
}
228-
229-
pm.eventHandler = eventHandler
230-
}
231-
232-
// GetEventHandlers returns a slice of the registered EventHandlers
233-
func (pm *PackageManager) GetEventHandlers() []*EventHandler {
234-
return append([]*EventHandler{}, &pm.eventHandler)
235-
}
236-
237211
// LoadPackageIndex loads a package index by looking up the local cached file from the specified URL
238212
func (pm *PackageManager) LoadPackageIndex(URL *url.URL) error {
239213
indexPath := pm.IndexDir.Join(path.Base(URL.Path))

commands/commands.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,6 @@ func InitPackageManager() *packagemanager.PackageManager {
9494
}
9595
}
9696

97-
// TODO: were should we register the event handler? Multiple places?
98-
if len(pm.GetEventHandlers()) == 0 {
99-
// During tests this could get registered multiple times,
100-
// since there is an underlying singleton
101-
pm.RegisterEventHandler(&CLIPackageManagerEventHandler{})
102-
}
103-
10497
if err := pm.LoadHardware(Config); err != nil {
10598
formatter.PrintError(err, "Error loading hardware packages.")
10699
os.Exit(ErrCoreConfig)
@@ -183,11 +176,3 @@ func InitSketch(sketchPath *paths.Path) (*sk.Sketch, error) {
183176
logrus.Infof("Reading sketch from dir: %s", wd)
184177
return sketches.NewSketchFromPath(wd)
185178
}
186-
187-
// CLIPackageManagerEventHandler defines an event handler which outputs the PackageManager events
188-
// in the CLI format
189-
type CLIPackageManagerEventHandler struct{}
190-
191-
// Implement packagemanager.EventHandler interface
192-
193-
// END -- Implement packagemanager.EventHandler interface

0 commit comments

Comments
 (0)