Skip to content

Commit 410bffe

Browse files
moonD4rkmoonD4rk
authored
refactor: naming cleanup and crypto package improvements (#551)
* refactor: naming cleanup across all packages
1 parent 4af2ded commit 410bffe

49 files changed

Lines changed: 708 additions & 502 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.typos.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ Sie = "Sie"
55
OT = "OT"
66
Encrypter = "Encrypter"
77
Decrypter = "Decrypter"
8+
PASSWOR = "PASSWOR"
89
[files]
910
extend-exclude = ["go.mod", "go.sum"]

‎browser/browser.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func pickFromConfigs(configs []types.BrowserConfig, opts PickOptions) ([]Browser
4848
}
4949

5050
if opts.ProfilePath != "" && name != "all" {
51-
if cfg.Kind == types.KindFirefox {
51+
if cfg.Kind == types.Firefox {
5252
cfg.UserDataDir = filepath.Dir(filepath.Clean(opts.ProfilePath))
5353
} else {
5454
cfg.UserDataDir = opts.ProfilePath
@@ -76,7 +76,7 @@ func pickFromConfigs(configs []types.BrowserConfig, opts PickOptions) ([]Browser
7676
// newBrowsers dispatches to the correct engine based on BrowserKind.
7777
func newBrowsers(cfg types.BrowserConfig) ([]Browser, error) {
7878
switch cfg.Kind {
79-
case types.KindChromium, types.KindChromiumYandex, types.KindChromiumOpera:
79+
case types.Chromium, types.ChromiumYandex, types.ChromiumOpera:
8080
bs, err := chromium.NewBrowsers(cfg)
8181
if err != nil {
8282
return nil, err
@@ -87,7 +87,7 @@ func newBrowsers(cfg types.BrowserConfig) ([]Browser, error) {
8787
}
8888
return browsers, nil
8989

90-
case types.KindFirefox:
90+
case types.Firefox:
9191
bs, err := firefox.NewBrowsers(cfg)
9292
if err != nil {
9393
return nil, err

‎browser/browser_darwin.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,84 +11,84 @@ func platformBrowsers() []types.BrowserConfig {
1111
{
1212
Key: "chrome",
1313
Name: chromeName,
14-
Kind: types.KindChromium,
14+
Kind: types.Chromium,
1515
Storage: "Chrome",
1616
UserDataDir: homeDir + "/Library/Application Support/Google/Chrome",
1717
},
1818
{
1919
Key: "edge",
2020
Name: edgeName,
21-
Kind: types.KindChromium,
21+
Kind: types.Chromium,
2222
Storage: "Microsoft Edge",
2323
UserDataDir: homeDir + "/Library/Application Support/Microsoft Edge",
2424
},
2525
{
2626
Key: "chromium",
2727
Name: chromiumName,
28-
Kind: types.KindChromium,
28+
Kind: types.Chromium,
2929
Storage: "Chromium",
3030
UserDataDir: homeDir + "/Library/Application Support/Chromium",
3131
},
3232
{
3333
Key: "chrome-beta",
3434
Name: chromeBetaName,
35-
Kind: types.KindChromium,
35+
Kind: types.Chromium,
3636
Storage: "Chrome",
3737
UserDataDir: homeDir + "/Library/Application Support/Google/Chrome Beta",
3838
},
3939
{
4040
Key: "opera",
4141
Name: operaName,
42-
Kind: types.KindChromiumOpera,
42+
Kind: types.ChromiumOpera,
4343
Storage: "Opera",
4444
UserDataDir: homeDir + "/Library/Application Support/com.operasoftware.Opera",
4545
},
4646
{
4747
Key: "opera-gx",
4848
Name: operaGXName,
49-
Kind: types.KindChromiumOpera,
49+
Kind: types.ChromiumOpera,
5050
Storage: "Opera",
5151
UserDataDir: homeDir + "/Library/Application Support/com.operasoftware.OperaGX",
5252
},
5353
{
5454
Key: "vivaldi",
5555
Name: vivaldiName,
56-
Kind: types.KindChromium,
56+
Kind: types.Chromium,
5757
Storage: "Vivaldi",
5858
UserDataDir: homeDir + "/Library/Application Support/Vivaldi",
5959
},
6060
{
6161
Key: "coccoc",
6262
Name: coccocName,
63-
Kind: types.KindChromium,
63+
Kind: types.Chromium,
6464
Storage: "CocCoc",
6565
UserDataDir: homeDir + "/Library/Application Support/Coccoc",
6666
},
6767
{
6868
Key: "brave",
6969
Name: braveName,
70-
Kind: types.KindChromium,
70+
Kind: types.Chromium,
7171
Storage: "Brave",
7272
UserDataDir: homeDir + "/Library/Application Support/BraveSoftware/Brave-Browser",
7373
},
7474
{
7575
Key: "yandex",
7676
Name: yandexName,
77-
Kind: types.KindChromiumYandex,
77+
Kind: types.ChromiumYandex,
7878
Storage: "Yandex",
7979
UserDataDir: homeDir + "/Library/Application Support/Yandex/YandexBrowser",
8080
},
8181
{
8282
Key: "arc",
8383
Name: arcName,
84-
Kind: types.KindChromium,
84+
Kind: types.Chromium,
8585
Storage: "Arc",
8686
UserDataDir: homeDir + "/Library/Application Support/Arc/User Data",
8787
},
8888
{
8989
Key: "firefox",
9090
Name: firefoxName,
91-
Kind: types.KindFirefox,
91+
Kind: types.Firefox,
9292
UserDataDir: homeDir + "/Library/Application Support/Firefox/Profiles",
9393
},
9494
}

‎browser/browser_linux.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,56 +11,56 @@ func platformBrowsers() []types.BrowserConfig {
1111
{
1212
Key: "chrome",
1313
Name: chromeName,
14-
Kind: types.KindChromium,
14+
Kind: types.Chromium,
1515
Storage: "Chrome Safe Storage",
1616
UserDataDir: homeDir + "/.config/google-chrome",
1717
},
1818
{
1919
Key: "edge",
2020
Name: edgeName,
21-
Kind: types.KindChromium,
21+
Kind: types.Chromium,
2222
Storage: "Chromium Safe Storage",
2323
UserDataDir: homeDir + "/.config/microsoft-edge",
2424
},
2525
{
2626
Key: "chromium",
2727
Name: chromiumName,
28-
Kind: types.KindChromium,
28+
Kind: types.Chromium,
2929
Storage: "Chromium Safe Storage",
3030
UserDataDir: homeDir + "/.config/chromium",
3131
},
3232
{
3333
Key: "chrome-beta",
3434
Name: chromeBetaName,
35-
Kind: types.KindChromium,
35+
Kind: types.Chromium,
3636
Storage: "Chrome Safe Storage",
3737
UserDataDir: homeDir + "/.config/google-chrome-beta",
3838
},
3939
{
4040
Key: "opera",
4141
Name: operaName,
42-
Kind: types.KindChromiumOpera,
42+
Kind: types.ChromiumOpera,
4343
Storage: "Chromium Safe Storage",
4444
UserDataDir: homeDir + "/.config/opera",
4545
},
4646
{
4747
Key: "vivaldi",
4848
Name: vivaldiName,
49-
Kind: types.KindChromium,
49+
Kind: types.Chromium,
5050
Storage: "Chrome Safe Storage",
5151
UserDataDir: homeDir + "/.config/vivaldi",
5252
},
5353
{
5454
Key: "brave",
5555
Name: braveName,
56-
Kind: types.KindChromium,
56+
Kind: types.Chromium,
5757
Storage: "Brave Safe Storage",
5858
UserDataDir: homeDir + "/.config/BraveSoftware/Brave-Browser",
5959
},
6060
{
6161
Key: "firefox",
6262
Name: firefoxName,
63-
Kind: types.KindFirefox,
63+
Kind: types.Firefox,
6464
UserDataDir: homeDir + "/.mozilla/firefox",
6565
},
6666
}

‎browser/browser_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ func TestPickFromConfigs_NameFilter(t *testing.T) {
3232
mkFile(t, dir, "Default", "History")
3333

3434
configs := []types.BrowserConfig{
35-
{Key: "chrome", Name: "Chrome", Kind: types.KindChromium, UserDataDir: dir},
36-
{Key: "edge", Name: "Edge", Kind: types.KindChromium, UserDataDir: dir},
35+
{Key: "chrome", Name: "Chrome", Kind: types.Chromium, UserDataDir: dir},
36+
{Key: "edge", Name: "Edge", Kind: types.Chromium, UserDataDir: dir},
3737
}
3838

3939
tests := []struct {
@@ -102,31 +102,31 @@ func TestPickFromConfigs_BrowserKind(t *testing.T) {
102102
{
103103
name: "chromium multi-profile",
104104
configs: []types.BrowserConfig{
105-
{Key: "chrome", Name: "Chrome", Kind: types.KindChromium, UserDataDir: chromeDir},
105+
{Key: "chrome", Name: "Chrome", Kind: types.Chromium, UserDataDir: chromeDir},
106106
},
107107
wantNames: []string{"Chrome", "Chrome"},
108108
wantProfiles: []string{"Default", "Profile 1"},
109109
},
110110
{
111111
name: "firefox random dir",
112112
configs: []types.BrowserConfig{
113-
{Key: "firefox", Name: "Firefox", Kind: types.KindFirefox, UserDataDir: firefoxDir},
113+
{Key: "firefox", Name: "Firefox", Kind: types.Firefox, UserDataDir: firefoxDir},
114114
},
115115
wantNames: []string{"Firefox"},
116116
wantProfiles: []string{"abc123.default-release"},
117117
},
118118
{
119119
name: "yandex variant",
120120
configs: []types.BrowserConfig{
121-
{Key: "yandex", Name: "Yandex", Kind: types.KindChromiumYandex, UserDataDir: yandexDir},
121+
{Key: "yandex", Name: "Yandex", Kind: types.ChromiumYandex, UserDataDir: yandexDir},
122122
},
123123
wantNames: []string{"Yandex"},
124124
wantProfiles: []string{"Default"},
125125
},
126126
{
127127
name: "nonexistent dir",
128128
configs: []types.BrowserConfig{
129-
{Key: "chrome", Name: "Chrome", Kind: types.KindChromium, UserDataDir: "/nonexistent"},
129+
{Key: "chrome", Name: "Chrome", Kind: types.Chromium, UserDataDir: "/nonexistent"},
130130
},
131131
},
132132
}
@@ -164,7 +164,7 @@ func TestPickFromConfigs_ProfilePath(t *testing.T) {
164164
{
165165
name: "chromium uses path directly",
166166
configs: []types.BrowserConfig{
167-
{Key: "chrome", Name: "Chrome", Kind: types.KindChromium, UserDataDir: "/wrong"},
167+
{Key: "chrome", Name: "Chrome", Kind: types.Chromium, UserDataDir: "/wrong"},
168168
},
169169
pickName: "chrome",
170170
profilePath: filepath.Join(chromeDir, "Default"),
@@ -174,7 +174,7 @@ func TestPickFromConfigs_ProfilePath(t *testing.T) {
174174
{
175175
name: "firefox uses parent dir",
176176
configs: []types.BrowserConfig{
177-
{Key: "firefox", Name: "Firefox", Kind: types.KindFirefox, UserDataDir: "/wrong"},
177+
{Key: "firefox", Name: "Firefox", Kind: types.Firefox, UserDataDir: "/wrong"},
178178
},
179179
pickName: "firefox",
180180
profilePath: filepath.Join(firefoxDir, "abc123.default-release"),
@@ -184,7 +184,7 @@ func TestPickFromConfigs_ProfilePath(t *testing.T) {
184184
{
185185
name: "ignored when name is all",
186186
configs: []types.BrowserConfig{
187-
{Key: "chrome", Name: "Chrome", Kind: types.KindChromium, UserDataDir: chromeDir},
187+
{Key: "chrome", Name: "Chrome", Kind: types.Chromium, UserDataDir: chromeDir},
188188
},
189189
pickName: "all",
190190
profilePath: "/some/override",

‎browser/browser_windows.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,97 +11,97 @@ func platformBrowsers() []types.BrowserConfig {
1111
{
1212
Key: "chrome",
1313
Name: chromeName,
14-
Kind: types.KindChromium,
14+
Kind: types.Chromium,
1515
UserDataDir: homeDir + "/AppData/Local/Google/Chrome/User Data",
1616
},
1717
{
1818
Key: "edge",
1919
Name: edgeName,
20-
Kind: types.KindChromium,
20+
Kind: types.Chromium,
2121
UserDataDir: homeDir + "/AppData/Local/Microsoft/Edge/User Data",
2222
},
2323
{
2424
Key: "chromium",
2525
Name: chromiumName,
26-
Kind: types.KindChromium,
26+
Kind: types.Chromium,
2727
UserDataDir: homeDir + "/AppData/Local/Chromium/User Data",
2828
},
2929
{
3030
Key: "chrome-beta",
3131
Name: chromeBetaName,
32-
Kind: types.KindChromium,
32+
Kind: types.Chromium,
3333
UserDataDir: homeDir + "/AppData/Local/Google/Chrome Beta/User Data",
3434
},
3535
{
3636
Key: "opera",
3737
Name: operaName,
38-
Kind: types.KindChromiumOpera,
38+
Kind: types.ChromiumOpera,
3939
UserDataDir: homeDir + "/AppData/Roaming/Opera Software/Opera Stable",
4040
},
4141
{
4242
Key: "opera-gx",
4343
Name: operaGXName,
44-
Kind: types.KindChromiumOpera,
44+
Kind: types.ChromiumOpera,
4545
UserDataDir: homeDir + "/AppData/Roaming/Opera Software/Opera GX Stable",
4646
},
4747
{
4848
Key: "vivaldi",
4949
Name: vivaldiName,
50-
Kind: types.KindChromium,
50+
Kind: types.Chromium,
5151
UserDataDir: homeDir + "/AppData/Local/Vivaldi/User Data",
5252
},
5353
{
5454
Key: "coccoc",
5555
Name: coccocName,
56-
Kind: types.KindChromium,
56+
Kind: types.Chromium,
5757
UserDataDir: homeDir + "/AppData/Local/CocCoc/Browser/User Data",
5858
},
5959
{
6060
Key: "brave",
6161
Name: braveName,
62-
Kind: types.KindChromium,
62+
Kind: types.Chromium,
6363
UserDataDir: homeDir + "/AppData/Local/BraveSoftware/Brave-Browser/User Data",
6464
},
6565
{
6666
Key: "yandex",
6767
Name: yandexName,
68-
Kind: types.KindChromiumYandex,
68+
Kind: types.ChromiumYandex,
6969
UserDataDir: homeDir + "/AppData/Local/Yandex/YandexBrowser/User Data",
7070
},
7171
{
7272
Key: "360x",
7373
Name: speed360XName,
74-
Kind: types.KindChromium,
74+
Kind: types.Chromium,
7575
UserDataDir: homeDir + "/AppData/Local/360ChromeX/Chrome/User Data",
7676
},
7777
{
7878
Key: "360",
7979
Name: speed360Name,
80-
Kind: types.KindChromium,
80+
Kind: types.Chromium,
8181
UserDataDir: homeDir + "/AppData/Local/360chrome/Chrome/User Data",
8282
},
8383
{
8484
Key: "qq",
85-
Name: qqBrowserName,
86-
Kind: types.KindChromium,
85+
Name: qqName,
86+
Kind: types.Chromium,
8787
UserDataDir: homeDir + "/AppData/Local/Tencent/QQBrowser/User Data",
8888
},
8989
{
9090
Key: "dc",
91-
Name: dcBrowserName,
92-
Kind: types.KindChromium,
91+
Name: dcName,
92+
Kind: types.Chromium,
9393
UserDataDir: homeDir + "/AppData/Local/DCBrowser/User Data",
9494
},
9595
{
9696
Key: "sogou",
9797
Name: sogouName,
98-
Kind: types.KindChromium,
98+
Kind: types.Chromium,
9999
UserDataDir: homeDir + "/AppData/Local/Sogou/SogouExplorer/User Data",
100100
},
101101
{
102102
Key: "firefox",
103103
Name: firefoxName,
104-
Kind: types.KindFirefox,
104+
Kind: types.Firefox,
105105
UserDataDir: homeDir + "/AppData/Roaming/Mozilla/Firefox/Profiles",
106106
},
107107
}

0 commit comments

Comments
 (0)