deblan-mirror/bold-brew
1
0
Fork 0
mirror of https://github.com/Valkyrie00/bold-brew.git synced 2026-03-14 22:35:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(services): remove dead code and unify helpers

Browse source 
Remove unused methods and fields:
- GetFormulae(), IsPackageInstalled() from DataProvider
- InstallAllPackages(), RemoveAllPackages() from BrewService
- allFormulae, allCasks fields from DataProvider

Unify GetInstalledCaskNames and GetInstalledFormulaNames with
a common getInstalledNames helper to reduce code duplication.
This commit is contained in:
Vito Castellano 2025-12-29 11:39:46 +01:00
commit 3f9eee03cd
No known key found for this signature in database
GPG key ID: E13085DB38BC5819
3 changed files with 10 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/services/brew.go
View file

@ -21,8 +21,6 @@ type BrewServiceInterface interface {
UpdatePackage(info models.Package, app *tview.Application, outputView *tview.TextView) error
RemovePackage(info models.Package, app *tview.Application, outputView *tview.TextView) error
InstallPackage(info models.Package, app *tview.Application, outputView *tview.TextView) error
InstallAllPackages(packages []models.Package, app *tview.Application, outputView *tview.TextView) error
RemoveAllPackages(packages []models.Package, app *tview.Application, outputView *tview.TextView) error
// Tap support
InstallTap(tapName string, app *tview.Application, outputView *tview.TextView) error

87
internal/services/dataprovider.go
View file

@ -36,10 +36,8 @@ type DataProviderInterface interface {
// Setup and retrieval
SetupData(forceDownload bool) error
GetPackages() *[]models.Package
GetFormulae() *[]models.Formula
// Installation status checks
IsPackageInstalled(name string, isCask bool) bool
GetInstalledCaskNames() map[string]bool
GetInstalledFormulaNames() map[string]bool
@ -51,13 +49,11 @@ type DataProviderInterface interface {
// It is the central repository for all Homebrew package data.
type DataProvider struct {
// Formula lists
allFormulae *[]models.Formula
installedFormulae *[]models.Formula
remoteFormulae *[]models.Formula
formulaeAnalytics map[string]models.AnalyticsItem
// Cask lists
allCasks *[]models.Cask
installedCasks *[]models.Cask
remoteCasks *[]models.Cask
caskAnalytics map[string]models.AnalyticsItem
@ -71,10 +67,8 @@ type DataProvider struct {
// NewDataProvider creates a new DataProvider instance with initialized data structures.
func NewDataProvider() *DataProvider {
return &DataProvider{
allFormulae: new([]models.Formula),
installedFormulae: new([]models.Formula),
remoteFormulae: new([]models.Formula),
allCasks: new([]models.Cask),
installedCasks: new([]models.Cask),
remoteCasks: new([]models.Cask),
allPackages: new([]models.Package),
@ -570,37 +564,6 @@ func (d *DataProvider) SetupData(forceDownload bool) error {
return nil
}
// GetFormulae retrieves all formulae, merging remote and installed packages.
func (d *DataProvider) GetFormulae() *[]models.Formula {
packageMap := make(map[string]models.Formula)
for _, formula := range *d.remoteFormulae {
if _, exists := packageMap[formula.Name]; !exists {
packageMap[formula.Name] = formula
}
}
for _, formula := range *d.installedFormulae {
packageMap[formula.Name] = formula
}
*d.allFormulae = make([]models.Formula, 0, len(packageMap))
for _, formula := range packageMap {
if a, exists := d.formulaeAnalytics[formula.Name]; exists && a.Number > 0 {
downloads, _ := strconv.Atoi(strings.ReplaceAll(a.Count, ",", ""))
formula.Analytics90dRank = a.Number
formula.Analytics90dDownloads = downloads
}
*d.allFormulae = append(*d.allFormulae, formula)
}
sort.Slice(*d.allFormulae, func(i, j int) bool {
return (*d.allFormulae)[i].Name < (*d.allFormulae)[j].Name
})
return d.allFormulae
}
// GetPackages retrieves all packages (formulae + casks), merging remote and installed.
func (d *DataProvider) GetPackages() *[]models.Package {
packageMap := make(map[string]models.Package)
@ -665,48 +628,28 @@ func (d *DataProvider) GetPackages() *[]models.Package {
return d.allPackages
}
// IsPackageInstalled checks if a package (formula or cask) is installed by name.
func (d *DataProvider) IsPackageInstalled(name string, isCask bool) bool {
var cmd *exec.Cmd
if isCask {
cmd = exec.Command("brew", "list", "--cask", name)
} else {
cmd = exec.Command("brew", "list", "--formula", name)
// getInstalledNames returns a map of installed package names for the given type.
func (d *DataProvider) getInstalledNames(packageType string) map[string]bool {
result := make(map[string]bool)
cmd := exec.Command("brew", "list", packageType)
output, err := cmd.Output()
if err != nil {
return result
}
err := cmd.Run()
return err == nil
for _, name := range strings.Split(strings.TrimSpace(string(output)), "\n") {
if name != "" {
result[name] = true
}
}
return result
}
// GetInstalledCaskNames returns a map of installed cask names for quick lookup.
func (d *DataProvider) GetInstalledCaskNames() map[string]bool {
result := make(map[string]bool)
cmd := exec.Command("brew", "list", "--cask")
output, err := cmd.Output()
if err != nil {
return result
}
names := strings.Split(strings.TrimSpace(string(output)), "\n")
for _, name := range names {
if name != "" {
result[name] = true
}
}
return result
return d.getInstalledNames("--cask")
}
// GetInstalledFormulaNames returns a map of installed formula names for quick lookup.
func (d *DataProvider) GetInstalledFormulaNames() map[string]bool {
result := make(map[string]bool)
cmd := exec.Command("brew", "list", "--formula")
output, err := cmd.Output()
if err != nil {
return result
}
names := strings.Split(strings.TrimSpace(string(output)), "\n")
for _, name := range names {
if name != "" {
result[name] = true
}
}
return result
return d.getInstalledNames("--formula")
}

59
internal/services/operations.go
View file

@ -73,64 +73,6 @@ func (s *BrewService) IsTapInstalled(tapName string) bool {
return false
}
// InstallAllPackages installs a list of packages sequentially.
func (s *BrewService) InstallAllPackages(packages []models.Package, app *tview.Application, outputView *tview.TextView) error {
for _, pkg := range packages {
if pkg.LocallyInstalled {
app.QueueUpdateDraw(func() {
fmt.Fprintf(outputView, "[SKIP] %s (already installed)\n", pkg.Name)
})
continue
}
app.QueueUpdateDraw(func() {
fmt.Fprintf(outputView, "\n[INSTALL] Installing %s...\n", pkg.Name)
})
if err := s.InstallPackage(pkg, app, outputView); err != nil {
app.QueueUpdateDraw(func() {
fmt.Fprintf(outputView, "[ERROR] Failed to install %s: %v\n", pkg.Name, err)
})
continue
}
app.QueueUpdateDraw(func() {
fmt.Fprintf(outputView, "[SUCCESS] %s installed successfully\n", pkg.Name)
})
}
return nil
}
// RemoveAllPackages removes a list of packages sequentially.
func (s *BrewService) RemoveAllPackages(packages []models.Package, app *tview.Application, outputView *tview.TextView) error {
for _, pkg := range packages {
if !pkg.LocallyInstalled {
app.QueueUpdateDraw(func() {
fmt.Fprintf(outputView, "[SKIP] %s (not installed)\n", pkg.Name)
})
continue
}
app.QueueUpdateDraw(func() {
fmt.Fprintf(outputView, "\n[REMOVE] Removing %s...\n", pkg.Name)
})
if err := s.RemovePackage(pkg, app, outputView); err != nil {
app.QueueUpdateDraw(func() {
fmt.Fprintf(outputView, "[ERROR] Failed to remove %s: %v\n", pkg.Name, err)
})
continue
}
app.QueueUpdateDraw(func() {
fmt.Fprintf(outputView, "[SUCCESS] %s removed successfully\n", pkg.Name)
})
}
return nil
}
// executeCommand runs a command and captures its output, updating the provided TextView.
func (s *BrewService) executeCommand(
app *tview.Application,
@ -212,4 +154,3 @@ func (s *BrewService) executeCommand(
return <-cmdErrCh
}