From d3ebf5b33fcd9aa4922c6ec1b2af3b65cd657ef4 Mon Sep 17 00:00:00 2001 From: Jonathan Hope Date: Tue, 5 Dec 2023 17:36:37 -0800 Subject: [PATCH 1/2] feat: art (#9) --- art/cabinet-dark-128-transparent.svg | 16 ++++++++++++++++ art/cabinet-dark-128.svg | 17 +++++++++++++++++ art/cabinet-dark-512-transparent.svg | 16 ++++++++++++++++ art/cabinet-dark-512.svg | 17 +++++++++++++++++ art/cabinet-light-128-transparent.svg | 16 ++++++++++++++++ art/cabinet-light-128.svg | 17 +++++++++++++++++ art/cabinet-light-512-transparent.svg | 16 ++++++++++++++++ art/cabinet-light-512.svg | 17 +++++++++++++++++ art/icon-dark.svg | 16 ---------------- art/icon-light.svg | 16 ---------------- art/scroll-dark-128-transparent.svg | 7 +++++++ art/scroll-dark-128.svg | 8 ++++++++ art/scroll-dark-512-transparent.svg | 7 +++++++ art/scroll-dark-512.svg | 8 ++++++++ art/scroll-light-128-transparent.svg | 7 +++++++ art/scroll-light-128.svg | 8 ++++++++ art/scroll-light-512-transparent.svg | 7 +++++++ art/scroll-light-512.svg | 8 ++++++++ 18 files changed, 192 insertions(+), 32 deletions(-) create mode 100644 art/cabinet-dark-128-transparent.svg create mode 100644 art/cabinet-dark-128.svg create mode 100644 art/cabinet-dark-512-transparent.svg create mode 100644 art/cabinet-dark-512.svg create mode 100644 art/cabinet-light-128-transparent.svg create mode 100644 art/cabinet-light-128.svg create mode 100644 art/cabinet-light-512-transparent.svg create mode 100644 art/cabinet-light-512.svg delete mode 100644 art/icon-dark.svg delete mode 100644 art/icon-light.svg create mode 100644 art/scroll-dark-128-transparent.svg create mode 100644 art/scroll-dark-128.svg create mode 100644 art/scroll-dark-512-transparent.svg create mode 100644 art/scroll-dark-512.svg create mode 100644 art/scroll-light-128-transparent.svg create mode 100644 art/scroll-light-128.svg create mode 100644 art/scroll-light-512-transparent.svg create mode 100644 art/scroll-light-512.svg diff --git a/art/cabinet-dark-128-transparent.svg b/art/cabinet-dark-128-transparent.svg new file mode 100644 index 0000000..a1fedef --- /dev/null +++ b/art/cabinet-dark-128-transparent.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/art/cabinet-dark-128.svg b/art/cabinet-dark-128.svg new file mode 100644 index 0000000..6a99246 --- /dev/null +++ b/art/cabinet-dark-128.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/art/cabinet-dark-512-transparent.svg b/art/cabinet-dark-512-transparent.svg new file mode 100644 index 0000000..adb3571 --- /dev/null +++ b/art/cabinet-dark-512-transparent.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/art/cabinet-dark-512.svg b/art/cabinet-dark-512.svg new file mode 100644 index 0000000..65856a0 --- /dev/null +++ b/art/cabinet-dark-512.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/art/cabinet-light-128-transparent.svg b/art/cabinet-light-128-transparent.svg new file mode 100644 index 0000000..f9df5e5 --- /dev/null +++ b/art/cabinet-light-128-transparent.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/art/cabinet-light-128.svg b/art/cabinet-light-128.svg new file mode 100644 index 0000000..e444b19 --- /dev/null +++ b/art/cabinet-light-128.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/art/cabinet-light-512-transparent.svg b/art/cabinet-light-512-transparent.svg new file mode 100644 index 0000000..4b327c2 --- /dev/null +++ b/art/cabinet-light-512-transparent.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/art/cabinet-light-512.svg b/art/cabinet-light-512.svg new file mode 100644 index 0000000..60ea626 --- /dev/null +++ b/art/cabinet-light-512.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/art/icon-dark.svg b/art/icon-dark.svg deleted file mode 100644 index 8eba626..0000000 --- a/art/icon-dark.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/art/icon-light.svg b/art/icon-light.svg deleted file mode 100644 index fd7a4d6..0000000 --- a/art/icon-light.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/art/scroll-dark-128-transparent.svg b/art/scroll-dark-128-transparent.svg new file mode 100644 index 0000000..dafa7d3 --- /dev/null +++ b/art/scroll-dark-128-transparent.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/art/scroll-dark-128.svg b/art/scroll-dark-128.svg new file mode 100644 index 0000000..43128a5 --- /dev/null +++ b/art/scroll-dark-128.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/art/scroll-dark-512-transparent.svg b/art/scroll-dark-512-transparent.svg new file mode 100644 index 0000000..8817886 --- /dev/null +++ b/art/scroll-dark-512-transparent.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/art/scroll-dark-512.svg b/art/scroll-dark-512.svg new file mode 100644 index 0000000..e8946df --- /dev/null +++ b/art/scroll-dark-512.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/art/scroll-light-128-transparent.svg b/art/scroll-light-128-transparent.svg new file mode 100644 index 0000000..9c4a873 --- /dev/null +++ b/art/scroll-light-128-transparent.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/art/scroll-light-128.svg b/art/scroll-light-128.svg new file mode 100644 index 0000000..18f78b3 --- /dev/null +++ b/art/scroll-light-128.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/art/scroll-light-512-transparent.svg b/art/scroll-light-512-transparent.svg new file mode 100644 index 0000000..50ba81d --- /dev/null +++ b/art/scroll-light-512-transparent.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/art/scroll-light-512.svg b/art/scroll-light-512.svg new file mode 100644 index 0000000..b7c4bb0 --- /dev/null +++ b/art/scroll-light-512.svg @@ -0,0 +1,8 @@ + + + + + + + + From df94027eed56ea3e49f8639c9c864cde33693e5b Mon Sep 17 00:00:00 2001 From: Jonathan Hope Date: Tue, 5 Dec 2023 17:40:04 -0800 Subject: [PATCH 2/2] feat: chromium manifest (#8) --- .goreleaser.yaml | 6 ++- cmd/cli/cmd/cmd.go | 28 +++++++++++++- internal/paths/paths.go | 35 +++++++++++++++++ internal/paths/paths_test.go | 74 ++++++++++++++++++++++++++++++++++++ pkg/api/install_manfiest.go | 12 +++++- 5 files changed, 151 insertions(+), 4 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 35b714e..6138f51 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -166,7 +166,7 @@ snapcrafts: apps: armaria: command: armaria - plugs: ["dot-mozilla", "dot-chrome"] + plugs: ["dot-mozilla", "dot-chrome", "dot-chromium"] armaria-host: command: armaria-host plugs: @@ -178,3 +178,7 @@ snapcrafts: interface: personal-files write: - $HOME/.config/google-chrome/NativeMessagingHosts + dot-chromium: + interface: personal-files + write: + - $HOME/.config/chromium/NativeMessagingHosts diff --git a/cmd/cli/cmd/cmd.go b/cmd/cli/cmd/cmd.go index a966220..d76ee6c 100644 --- a/cmd/cli/cmd/cmd.go +++ b/cmd/cli/cmd/cmd.go @@ -75,8 +75,9 @@ type ManifestCmd struct { // InstallManifestCmd is a CLI command to the app manifest. type InstallManifestCmd struct { - Firefox InstallFirefoxManifestCmd `cmd:"" help:"Install the app manifest for Firefox."` - Chrome InstallChromeManifestCmd `cmd:"" help:"Install the app manifest for Chrome."` + Firefox InstallFirefoxManifestCmd `cmd:"" help:"Install the app manifest for Firefox."` + Chrome InstallChromeManifestCmd `cmd:"" help:"Install the app manifest for Chrome."` + Chromium InstallChromiumManifestCmd `cmd:"" help:"Install the app manifest for Chromium."` } // AddBookCmd is a CLI command to add a bookmark. @@ -735,3 +736,26 @@ func (r *InstallChromeManifestCmd) Run(ctx *Context) error { return nil } + +// InstallChromiumManifestCmd is a CLI command to install the app manifest for Chromium. +type InstallChromiumManifestCmd struct { +} + +// Run install app manifest for Chromium. +func (r *InstallChromiumManifestCmd) Run(ctx *Context) error { + start := time.Now() + + err := armariaapi.InstallManifestChromium() + + if err != nil { + formatError(ctx.Writer, ctx.Formatter, err) + ctx.ReturnCode(1) + return nil + } + + elapsed := time.Since(start) + + formatSuccess(ctx.Writer, ctx.Formatter, fmt.Sprintf("Installed in %s", elapsed)) + + return nil +} diff --git a/internal/paths/paths.go b/internal/paths/paths.go index 824a1b8..1735be3 100644 --- a/internal/paths/paths.go +++ b/internal/paths/paths.go @@ -222,6 +222,41 @@ func chromeManifestInternal(goos string, getenv getenvFn, userHome userHomeFn, j return join(folder, manifestFilename), nil } +// Chromium Manifest gets the path to the Chromium app manifest. +// The path is different per platform and maps to the following: +// - Linux: ~/.config/chromium/NativeMessagingHosts +// - Windows: ~/AppData/Local/Armaria +// - Mac: ~/Library/Application Support/Chromium +func ChromiumManifest() (string, error) { + return chromiumManifestInternal(runtime.GOOS, os.Getenv, os.UserHomeDir, filepath.Join, os.MkdirAll) +} + +// chromiumManifestInternal allows DI for ChromiumManifest. +func chromiumManifestInternal(goos string, getenv getenvFn, userHome userHomeFn, join joinFn, mkDirAll mkDirAllFn) (string, error) { + home, err := realHome(getenv, userHome) + if err != nil { + return "", fmt.Errorf("error getting real home dir while getting chromium manifest path: %w", err) + } + + var folder string + if goos == "linux" { + folder = join(home, ".config", "chromium", "NativeMessagingHosts") + } else if goos == "windows" { + // The manifest can be anywhere in Windows, but it needs a supporting registry entry. + folder = join(home, "AppData", "Local", "Armaria") + } else if goos == "darwin" { + folder = join(home, "Library", "Application Support", "Chromium", "NativeMessagingHosts") + } else { + panic("Unsupported operating system") + } + + if err = mkDirAll(folder, os.ModePerm); err != nil { + return "", fmt.Errorf("error creating folder while getting chromium manifest path: %w", err) + } + + return join(folder, manifestFilename), nil +} + // realHome returns the true home directory of the current user. // Snap will replace the $HOME env var with a sandboxed directory. func realHome(getenv getenvFn, userHome userHomeFn) (string, error) { diff --git a/internal/paths/paths_test.go b/internal/paths/paths_test.go index b29cbeb..79145cb 100644 --- a/internal/paths/paths_test.go +++ b/internal/paths/paths_test.go @@ -391,3 +391,77 @@ func TestChromeManifestPath(t *testing.T) { }) } } + +func TestChromiumManifestPath(t *testing.T) { + type test struct { + goos string + folderPath string + folderCreated bool + snapRealHome string + manifestPath string + } + + tests := []test{ + { + goos: "windows", + folderPath: "~/AppData/Local/Armaria", + folderCreated: true, + manifestPath: "~/AppData/Local/Armaria/armaria.json", + }, + { + goos: "linux", + folderPath: "~/.config/chromium/NativeMessagingHosts", + folderCreated: true, + manifestPath: "~/.config/chromium/NativeMessagingHosts/armaria.json", + }, + { + goos: "linux", + folderPath: "~/snap/.config/chromium/NativeMessagingHosts", + folderCreated: true, + snapRealHome: "~/snap", + manifestPath: "~/snap/.config/chromium/NativeMessagingHosts/armaria.json", + }, + { + goos: "darwin", + folderPath: "~/Library/Application Support/Chromium/NativeMessagingHosts", + folderCreated: true, + manifestPath: "~/Library/Application Support/Chromium/NativeMessagingHosts/armaria.json", + }, + } + + userHome := func() (string, error) { + return "~", nil + } + + for _, tc := range tests { + t.Run(fmt.Sprintf("GOOS: %s, SNAP_REAL_HOME: %s", tc.goos, tc.snapRealHome), func(t *testing.T) { + folderCreated := false + + mkDirAll := func(path string, perm os.FileMode) error { + folderCreated = true + if path != tc.folderPath { + t.Errorf("folder: got %+v; want %+v", path, tc.folderPath) + } + + return nil + } + + getenv := func(key string) string { + return tc.snapRealHome + } + + got, err := chromiumManifestInternal(tc.goos, getenv, userHome, path.Join, mkDirAll) + if err != nil { + t.Fatalf("unexpected error: %+v", err) + } + + if folderCreated != tc.folderCreated { + t.Fatalf("folder created: got %+v; want %+v", folderCreated, tc.folderCreated) + } + + if got != tc.manifestPath { + t.Errorf("manfiestPath: got %+v; want %+v", got, tc.manifestPath) + } + }) + } +} diff --git a/pkg/api/install_manfiest.go b/pkg/api/install_manfiest.go index 1742739..02368e6 100644 --- a/pkg/api/install_manfiest.go +++ b/pkg/api/install_manfiest.go @@ -31,6 +31,16 @@ func InstallManifestChrome() error { return installManifest(path) } +// InstallManifestChromium installs the app manifest for Firefox. +func InstallManifestChromium() error { + path, err := paths.ChromiumManifest() + if err != nil { + return fmt.Errorf("error getting chromium manfiest path while installing manifest: %w", err) + } + + return installManifest(path) +} + // installManifest installs the app manifest. func installManifest(path string) error { hostPath, err := paths.Host() @@ -45,7 +55,7 @@ func installManifest(path string) error { Path: hostPath, HostType: "stdio", AllowedExtensions: []string{"armaria@armaria.net"}, - AllowedOrigins: []string{"chrome-extension://armaria/"}, + AllowedOrigins: []string{"chrome-extension://cahkgigfdplmhgjbioakkgennhncioli/"}, } buffer, err := json.Marshal(manifest)