Add support for flatpak versions of MPV and VLC (#188)

SoMuchForSubtlety · Oct 13, 2021 · afb883f · afb883f
1 parent 09b0db7
commit afb883f
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 12 deletions.
diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go
@@ -31,11 +31,12 @@ type Store struct {
 type commandAndArgs []string
 
 type Command struct {
-	Title      string         `json:"title"`
-	Command    commandAndArgs `json:"command"`
-	Proxy      bool           `json:"proxy"`
-	registry   string
-	registry32 string
+	Title        string         `json:"title"`
+	Command      commandAndArgs `json:"command"`
+	Proxy        bool           `json:"proxy"`
+	registry     string
+	registry32   string
+	flatpakAppID string
 }
 
 type MultiCommand struct {
@@ -83,15 +84,17 @@ func NewStore(customCommands []Command, multiCommands []MultiCommand, lang strin
 
 	commands := []Command{
 		{
-			Title:   "Play with MPV",
-			Command: []string{"mpv", "$url", "--alang=" + lang, "--quiet", "--title=$title"},
-			Proxy:   true,
+			Title:        "Play with MPV",
+			Command:      []string{"mpv", "$url", "--alang=" + lang, "--quiet", "--title=$title"},
+			Proxy:        true,
+			flatpakAppID: "io.mpv.Mpv",
 		},
 		{
-			Title:      "Play with VLC",
-			registry:   "SOFTWARE\\WOW6432Node\\VideoLAN\\VLC",
-			registry32: "SOFTWARE\\VideoLAN\\VLC",
-			Command:    []string{"vlc", "$url", "--meta-title=$title", "--audio-language=" + lang},
+			Title:        "Play with VLC",
+			registry:     "SOFTWARE\\WOW6432Node\\VideoLAN\\VLC",
+			registry32:   "SOFTWARE\\VideoLAN\\VLC",
+			Command:      []string{"vlc", "$url", "--meta-title=$title", "--audio-language=" + lang},
+			flatpakAppID: "org.videolan.VLC",
 		},
 		{
 			Title:   "Play with IINA",
@@ -106,6 +109,8 @@ func NewStore(customCommands []Command, multiCommands []MultiCommand, lang strin
 			store.Commands = append(store.Commands, c)
 		} else if c, found := checkRegistry(c); found {
 			store.Commands = append(store.Commands, c)
+		} else if c, found := checkFlatpak(c); found {
+			store.Commands = append(store.Commands, c)
 		}
 	}
 
@@ -198,6 +203,7 @@ func (s *Store) RunCommand(cc CommandContext) error {
 		tmpCommand[i] = strings.ReplaceAll(tmpCommand[i], "$hour", cc.MetaData.Date.Format("15"))
 		tmpCommand[i] = strings.ReplaceAll(tmpCommand[i], "$minute", cc.MetaData.Date.Format("04"))
 	}
+
 	return s.runCmd(exec.Command(tmpCommand[0], tmpCommand[1:]...), proxyEnabled, cancel)
 }
 

diff --git a/internal/cmd/registry.go b/internal/cmd/registry.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package cmd
@@ -31,3 +32,7 @@ func checkRegistry(c Command) (Command, bool) {
 
 	return c, true
 }
+
+func checkFlatpak(c Command) (Command, bool) {
+	return c, false
+}
diff --git a/internal/cmd/registry_unix.go b/internal/cmd/registry_unix.go
@@ -1,9 +1,36 @@
+//go:build !windows
 // +build !windows
 
 package cmd
 
+import "os/exec"
+
 func checkRegistry(c Command) (Command, bool) {
 	_ = c.registry
 	_ = c.registry32
 	return c, false
 }
+
+func checkFlatpak(c Command) (Command, bool) {
+	if c.flatpakAppID == "" {
+		// command is not flatpak
+		return c, false
+	}
+
+	_, err := exec.LookPath("flatpak")
+	if err != nil {
+		// flatpak not installed
+		return c, false
+	}
+
+	err = exec.Command("flatpak", "info", c.flatpakAppID).Run()
+	if err != nil {
+		// package not installed
+		return c, false
+	}
+
+	c.Command[0] = c.flatpakAppID
+	c.Command = append([]string{"flatpak", "run"}, c.Command...)
+
+	return c, true
+}