Refactor player-protocol module and update player path handling

tgdrive · Sep 18, 2024 · a8aa8c5 · a8aa8c5
1 parent 11a51da
commit a8aa8c5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module player-protocol
+module github.com/tgdrive/player-protocol
 
 go 1.22.0
 

diff --git a/main.go b/main.go
@@ -1,4 +1,3 @@
-// main.go
 package main
 
 import (
@@ -7,6 +6,8 @@ import (
 	"os"
 	"os/exec"
 	"strings"
+
+	player_path "github.com/tgdrive/player-protocol/pkg/path"
 )
 
 func main() {
@@ -46,7 +47,7 @@ func main() {
 		link, _ = url.QueryUnescape(link)
 	}
 
-	playerPath, err := findPlayerPath(player)
+	playerPath, err := player_path.FindPlayerPath(player)
 	if err != nil {
 		fmt.Printf("Error finding %s path: %v\n", player, err)
 		os.Exit(1)

diff --git a/linux.go → pkg/path/path_unix.go b/linux.go → pkg/path/path_unix.go
@@ -1,15 +1,14 @@
 //go:build linux
-// +build linux
 
-package main
+package path
 
 import (
 	"fmt"
 	"os"
 	"path/filepath"
 )
 
-func findPlayerPath(player string) (string, error) {
+func FindPlayerPath(player string) (string, error) {
 	if player == "potplayer" {
 		return "", fmt.Errorf("PotPlayer is not supported on Linux")
 	}

diff --git a/windows.go → pkg/path/path_windows.go b/windows.go → pkg/path/path_windows.go
@@ -1,7 +1,6 @@
 //go:build windows
-// +build windows
 
-package main
+package path
 
 import (
 	"fmt"
@@ -11,7 +10,7 @@ import (
 	"golang.org/x/sys/windows/registry"
 )
 
-func findPlayerPath(player string) (string, error) {
+func FindPlayerPath(player string) (string, error) {
 	path, err := findPathInRegistry(player)
 	if err == nil {
 		return path, nil