Merge pull request #8 from HyDE-Project/aur/ready

Author: prime-run

.github/.goreleaser.yaml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/dependabot.yml

@@ -1,54 +1,34 @@
 name: Go Release
 
 on:
-  push:
-    tags:
-      - "v*"
-    branches:
-      - master
+    push:
+        tags:
+            - "v*"
 
 permissions:
-  contents: write
-  packages: write
-  issues: write
+    contents: write
+    packages: write
+    issues: write
 
 jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+    goreleaser:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+              with:
+                fetch-depth: 0
 
-      - name: Set up Go
-        uses: useblacksmith/setup-go@v6
-        with:
-          go-version: "1.24.1"
+            - name: Set up Go
+              uses: actions/setup-go@v4
+              with:
+                go-version: "1.24.1"
 
-      - name: Run GoReleaser (tag)
-        if: startsWith(github.ref, 'refs/tags/v')
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          distribution: goreleaser
-          version: v2.11.0
-          args: release --clean --config .github/.goreleaser.yaml
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Upload hydectl binary artifact
-        if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')
-        uses: actions/upload-artifact@v4
-        with:
-          name: hydectl-binaries
-          path: dist/hydectl*
-
-      - name: Run GoReleaser (master)
-        if: github.ref == 'refs/heads/master'
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          distribution: goreleaser
-          version: v2.11.0
-          args: release --clean --config .github/.goreleaser.yaml
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            - name: Run GoReleaser
+              uses: goreleaser/goreleaser-action@v5
+              with:
+                distribution: goreleaser
+                version: latest
+                args: release --clean
+              env:
+                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,2 @@
+bin
+hydectl

.gitignore

@@ -0,0 +1,48 @@
+project_name: hydectl
+
+before:
+    hooks:
+        - go mod tidy
+
+builds:
+    - env:
+        - CGO_ENABLED=0
+      goos:
+        - linux
+      goarch:
+        - amd64
+        - arm64
+        - "386"
+      main: ./main.go
+      binary: "hydectl-{{ .Version }}-{{ .Os }}-{{ .Arch }}"
+      ldflags:
+        - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}
+
+archives:
+    - format: tar.gz
+      name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}"
+      files:
+        - LICENSE
+        - README.md
+
+checksum:
+    name_template: "checksums.txt"
+
+snapshot:
+    name_template: "{{ incpatch .Version }}-next"
+
+changelog:
+    sort: asc
+    filters:
+        exclude:
+            - "^docs:"
+            - "^test:"
+            - "^ci:"
+            - "^chore:"
+
+release:
+    github:
+        owner: HyDE-Project
+        name: hydectl
+    prerelease: auto
+    draft: false

.goreleaser.yaml

@@ -5,9 +5,7 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
-	"os"
 	"os/exec"
-	"path/filepath"
 
 	"hydectl/internal/logger"
 	"hydectl/internal/plugin"
@@ -26,16 +24,16 @@ var dispatchCmd = &cobra.Command{
 	Short: "Dispatch a plugin command",
 	Long:  `Dispatch a plugin command by specifying the plugin name and arguments.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		if listPlugins {
-			scripts, err := plugin.LoadScripts(ScriptPaths)
-			if err != nil {
-				logger.Errorf("Error loading scripts: %v", err)
-				fmt.Printf("Error loading scripts: %v\n", err)
-				return
-			}
+		scripts, err := plugin.FindAllScripts(ScriptPaths)
+		if err != nil {
+			logger.Errorf("Error loading scripts: %v", err)
+			fmt.Printf("Error loading scripts: %v\n", err)
+			return
+		}
 
+		if listPlugins {
 			fmt.Println("Available Plugins:")
-			for _, script := range scripts {
+			for script := range scripts {
 				fmt.Println(script)
 			}
 			return
@@ -49,35 +47,8 @@ var dispatchCmd = &cobra.Command{
 		pluginName := args[0]
 		pluginArgs := args[1:]
 
-		// Filter out non-existent directories
-		existingScriptPaths := filterExistingPaths(ScriptPaths)
-
-		var scriptPath string
-		for _, dir := range existingScriptPaths {
-			path := filepath.Join(dir, pluginName)
-			if _, err := os.Stat(path); err == nil {
-				scriptPath = path
-				break
-			}
-		}
-
-		if scriptPath == "" {
-			// Try to find the script with a known extension
-			for _, dir := range existingScriptPaths {
-				for _, ext := range []string{".sh", ".py"} {
-					path := filepath.Join(dir, pluginName+ext)
-					if _, err := os.Stat(path); err == nil {
-						scriptPath = path
-						break
-					}
-				}
-				if scriptPath != "" {
-					break
-				}
-			}
-		}
-
-		if scriptPath == "" {
+		scriptPath, ok := scripts[pluginName]
+		if !ok {
 			logger.Infof("Plugin %s does not exist.", pluginName)
 			fmt.Printf("Plugin %s does not exist.\n", pluginName)
 			return
@@ -90,18 +61,6 @@ var dispatchCmd = &cobra.Command{
 	},
 }
 
-func filterExistingPaths(paths []string) []string {
-	var existingPaths []string
-	for _, path := range paths {
-		if _, err := os.Stat(path); err == nil {
-			existingPaths = append(existingPaths, path)
-		} else {
-			logger.Debugf("Directory does not exist: %s", path)
-		}
-	}
-	return existingPaths
-}
-
 var dynamicCommands []*cobra.Command
 
 func init() {
@@ -161,20 +120,14 @@ type ScriptUsage struct {
 // Example function to dynamically add plugin commands
 func AddPluginCommands() {
 	logger.Debug("Loading scripts for dynamic commands")
-	scripts, err := plugin.LoadScripts(ScriptPaths)
+	scripts, err := plugin.FindAllScripts(ScriptPaths)
 	if err != nil {
 		logger.Errorf("Error loading scripts: %v", err)
 		return
 	}
 
-	for _, script := range scripts {
+	for script, scriptPath := range scripts {
 		logger.Debugf("Processing script: %s", script)
-		scriptPath := findScriptPath(script)
-		if scriptPath == "" {
-			logger.Infof("Plugin %s does not exist.", script)
-			continue
-		}
-
 		usage, err := getScriptUsage(scriptPath)
 		if err != nil {
 			logger.Errorf("Error getting usage for script %s: %v", script, err)
@@ -228,20 +181,3 @@ func getScriptUsage(scriptPath string) (*ScriptUsage, error) {
 
 	return &usage, nil
 }
-
-func findScriptPath(pluginName string) string {
-	existingScriptPaths := filterExistingPaths(ScriptPaths)
-	for _, dir := range existingScriptPaths {
-		path := filepath.Join(dir, pluginName)
-		if _, err := os.Stat(path); err == nil {
-			return path
-		}
-		for _, ext := range []string{".sh", ".py"} {
-			path := filepath.Join(dir, pluginName+ext)
-			if _, err := os.Stat(path); err == nil {
-				return path
-			}
-		}
-	}
-	return ""
-}

cmd/dispatch.go

@@ -12,7 +12,6 @@ require (
 	github.com/charmbracelet/bubbletea v1.3.5
 	github.com/charmbracelet/lipgloss v1.1.0
 	github.com/charmbracelet/log v0.4.1
-	github.com/muesli/reflow v0.3.0
 	github.com/spf13/cobra v1.5.0
 	github.com/spf13/pflag v1.0.5
 	github.com/thiagokokada/hyprland-go v0.4.0

go.mod

@@ -45,20 +45,16 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
 github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
-github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
 github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
-github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
-github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
 github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=