Skip to content

Commit 9eb2ffd

Browse files
cage1016cage1016
committed
update icons
1 parent 627db33 commit 9eb2ffd

23 files changed

+825
-272
lines changed

‎.workflow/hash-gray.pdf

2.28 KB
Binary file not shown.

‎.workflow/jwt-gray.pdf

995 Bytes
Binary file not shown.

‎.workflow/lorem-ipsum-gray.pdf

900 Bytes
Binary file not shown.

‎.workflow/uuid-gray.pdf

1.08 KB
Binary file not shown.

‎cmd/case.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,6 @@ var caseCmd = &cobra.Command{
5757
query = string(clipboard.Read(clipboard.FmtText))
5858
}
5959

60-
if m, ok := M[t]; ok {
61-
str := m.Fn(query)
62-
wf.NewItem(str).Subtitle(fmt.Sprintf("%s → %s", t, m.Subtitle)).Valid(true).Arg(str).Icon(TextChangeCaseIcon)
63-
}
64-
6560
if t == "command" {
6661
keys := make([]string, 0, len(M))
6762
for k := range M {
@@ -71,7 +66,12 @@ var caseCmd = &cobra.Command{
7166
for _, k := range keys {
7267
m := M[k]
7368
str := m.Fn(query)
74-
wf.NewItem(str).Subtitle(fmt.Sprintf("%s → %s", k, m.Subtitle)).Valid(true).Arg(str).Icon(TextChangeCaseIcon)
69+
wf.NewItem(str).Subtitle(fmt.Sprintf("%s ➜ %s", k, m.Subtitle)).Valid(true).Arg(str).Icon(TextChangeCaseIcon)
70+
}
71+
} else {
72+
if m, ok := M[t]; ok {
73+
str := m.Fn(query)
74+
wf.NewItem(str).Subtitle(fmt.Sprintf("%s ➜ %s", t, m.Subtitle)).Valid(true).Arg(str).Icon(TextChangeCaseIcon)
7575
}
7676
}
7777

‎cmd/checksum.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
55
package cmd
66

77
import (
8+
"fmt"
9+
"log"
810
"strings"
911

10-
aw "github.com/deanishe/awgo"
1112
"github.com/spf13/cobra"
1213
"golang.design/x/clipboard"
1314

@@ -22,14 +23,15 @@ var checksumCmd = &cobra.Command{
2223
}
2324

2425
func runChecksum(cmd *cobra.Command, args []string) {
25-
str := strings.Join(args, " ")
26-
if strings.TrimSpace(str) == "" {
27-
str = string(clipboard.Read(clipboard.FmtText))
26+
query := strings.Join(args, " ")
27+
if strings.TrimSpace(query) == "" {
28+
query = string(clipboard.Read(clipboard.FmtText))
2829
}
30+
log.Println(query)
2931

30-
s, err := lib.NewCheckSum(str)
32+
s, err := lib.NewCheckSum(query)
3133
if err != nil {
32-
wf.NewItem(err.Error()).Subtitle("File CheckSum Fail").Valid(false).Icon(aw.IconError)
34+
wf.NewItem(fmt.Sprintf("`%s` is invalid file", query)).Subtitle("Try a different query?").Icon(HashGrayIcon)
3335
} else {
3436
wf.NewItem(s.MD5()).Subtitle("MD5 CheckSum").Valid(true).Icon(HashIcon).Arg(s.MD5()).Var("action", "copy")
3537
wf.NewItem(s.SHA1()).Subtitle("SHA1 CheckSum").Valid(true).Icon(HashIcon).Arg(s.SHA1()).Var("action", "copy")

‎cmd/decode.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
55
package cmd
66

77
import (
8+
"log"
89
"strings"
910

1011
"github.com/spf13/cobra"
@@ -22,18 +23,19 @@ var decodeCmd = &cobra.Command{
2223

2324
func decodeRun(cmd *cobra.Command, args []string) {
2425
coder := lib.NewDecoder()
25-
str := strings.Join(args, " ")
26-
if strings.TrimSpace(str) == "" {
27-
str = string(clipboard.Read(clipboard.FmtText))
26+
query := strings.Join(args, " ")
27+
if strings.TrimSpace(query) == "" {
28+
query = string(clipboard.Read(clipboard.FmtText))
2829
}
30+
log.Println(query)
2931

30-
b64DecodeStr := coder.Base64(str)
32+
b64DecodeStr := coder.Base64(query)
3133
wf.NewItem(b64DecodeStr).Subtitle("Base64 Decode").Valid(true).Arg(b64DecodeStr).Icon(Base64Icon).Var("action", "copy")
3234

33-
urlDecodeStr := coder.URL(str)
35+
urlDecodeStr := coder.URL(query)
3436
wf.NewItem(urlDecodeStr).Subtitle("URL Decode").Valid(true).Arg(urlDecodeStr).Icon(UrlIcon).Var("action", "copy")
3537

36-
htmlDecodeStr := coder.HTML(str)
38+
htmlDecodeStr := coder.HTML(query)
3739
wf.NewItem(htmlDecodeStr).Subtitle("HTML Decode").Valid(true).Arg(htmlDecodeStr).Icon(HtmlIcon).Var("action", "copy")
3840

3941
wf.SendFeedback()

‎cmd/encode.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
55
package cmd
66

77
import (
8+
"log"
89
"strings"
910

1011
"github.com/spf13/cobra"
@@ -22,18 +23,19 @@ var encodeCmd = &cobra.Command{
2223

2324
func encodeRun(cmd *cobra.Command, args []string) {
2425
coder := lib.NewEncoder()
25-
str := strings.Join(args, " ")
26-
if strings.TrimSpace(str) == "" {
27-
str = string(clipboard.Read(clipboard.FmtText))
26+
query := strings.Join(args, " ")
27+
if strings.TrimSpace(query) == "" {
28+
query = string(clipboard.Read(clipboard.FmtText))
2829
}
30+
log.Println(query)
2931

30-
b64EncodeStr := coder.Base64(str)
32+
b64EncodeStr := coder.Base64(query)
3133
wf.NewItem(b64EncodeStr).Subtitle("Base64 Encode").Valid(true).Icon(Base64Icon).Arg(b64EncodeStr).Var("action", "copy")
3234

33-
urlEncodeStr := coder.URL(str)
35+
urlEncodeStr := coder.URL(query)
3436
wf.NewItem(urlEncodeStr).Subtitle("URL Encode").Valid(true).Icon(UrlIcon).Arg(urlEncodeStr).Var("action", "copy")
3537

36-
htmlEncodeStr := coder.HTML(str)
38+
htmlEncodeStr := coder.HTML(query)
3739
wf.NewItem(htmlEncodeStr).Subtitle("HTML Encode").Valid(true).Arg(htmlEncodeStr).Icon(HtmlIcon).Var("action", "copy")
3840

3941
wf.SendFeedback()

‎cmd/hash.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
55
package cmd
66

77
import (
8+
"log"
89
"strings"
910

1011
"github.com/spf13/cobra"
@@ -22,21 +23,22 @@ var hashCmd = &cobra.Command{
2223

2324
func runHash(cmd *cobra.Command, args []string) {
2425
coder := lib.NewHasher()
25-
str := strings.Join(args, " ")
26-
if strings.TrimSpace(str) == "" {
27-
str = string(clipboard.Read(clipboard.FmtText))
26+
query := strings.Join(args, " ")
27+
if strings.TrimSpace(query) == "" {
28+
query = string(clipboard.Read(clipboard.FmtText))
2829
}
30+
log.Println(query)
2931

30-
md5Str := coder.MD5(str)
32+
md5Str := coder.MD5(query)
3133
wf.NewItem(md5Str).Subtitle("MD5").Valid(true).Arg(md5Str).Icon(HashIcon).Var("action", "copy")
3234

33-
sha1Str := coder.SHA1(str)
35+
sha1Str := coder.SHA1(query)
3436
wf.NewItem(sha1Str).Subtitle("SHA1").Valid(true).Arg(sha1Str).Icon(HashIcon).Var("action", "copy")
3537

36-
sha256Str := coder.SHA256(str)
38+
sha256Str := coder.SHA256(query)
3739
wf.NewItem(sha256Str).Subtitle("SHA256").Valid(true).Arg(sha256Str).Icon(HashIcon).Var("action", "copy")
3840

39-
sha512Str := coder.SHA512(str)
41+
sha512Str := coder.SHA512(query)
4042
wf.NewItem(sha512Str).Subtitle("SHA512").Valid(true).Arg(sha512Str).Icon(HashIcon).Var("action", "copy")
4143

4244
wf.SendFeedback()

‎cmd/icons.go

+4
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,20 @@ import aw "github.com/deanishe/awgo"
44

55
var (
66
LoremIpsumIcon = &aw.Icon{Value: "lorem-ipsum.pdf"}
7+
LoremIpsumGrayIcon = &aw.Icon{Value: "lorem-ipsum-gray.pdf"}
78
Base64Icon = &aw.Icon{Value: "base64.pdf"}
89
DevToysIcon = &aw.Icon{Value: "devtoys.pdf"}
910
DownloadIcon = &aw.Icon{Value: "download.pdf"}
1011
EncodeDecodeIcon = &aw.Icon{Value: "encode-decode.pdf"}
1112
HashIcon = &aw.Icon{Value: "hash.pdf"}
13+
HashGrayIcon = &aw.Icon{Value: "hash-gray.pdf"}
1214
HtmlIcon = &aw.Icon{Value: "html.pdf"}
1315
JsonIcon = &aw.Icon{Value: "json.pdf"}
1416
JwtIcon = &aw.Icon{Value: "jwt.pdf"}
17+
JwtGrayIcon = &aw.Icon{Value: "jwt-gray.pdf"}
1518
QRcodeIcon = &aw.Icon{Value: "qrcode.pdf"}
1619
TextChangeCaseIcon = &aw.Icon{Value: "text-change-case.pdf"}
1720
UrlIcon = &aw.Icon{Value: "url.pdf"}
1821
UuidIcon = &aw.Icon{Value: "uuid.pdf"}
22+
UuidGrayIcon = &aw.Icon{Value: "uuid-gray.pdf"}
1923
)

‎cmd/jwt.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ package cmd
66

77
import (
88
"encoding/json"
9+
"fmt"
10+
"log"
911
"strings"
1012

11-
aw "github.com/deanishe/awgo"
1213
"github.com/spf13/cobra"
1314
"golang.design/x/clipboard"
1415

@@ -23,20 +24,21 @@ var jwtCmd = &cobra.Command{
2324
}
2425

2526
func runJwt(c *cobra.Command, args []string) {
26-
str := strings.Join(args, " ")
27-
if strings.TrimSpace(str) == "" {
28-
str = string(clipboard.Read(clipboard.FmtText))
27+
query := strings.Join(args, " ")
28+
if strings.TrimSpace(query) == "" {
29+
query = string(clipboard.Read(clipboard.FmtText))
2930
}
31+
log.Println(query)
3032

31-
token, err := lib.JWTdecode(str)
33+
token, err := lib.JWTdecode(query)
3234
if err == nil {
3335
a, _ := json.Marshal(token.Header)
3436
b, _ := json.Marshal(token.Claims)
3537

3638
wf.NewItem(string(a)).Subtitle("Header").Valid(true).Arg(string(a)).Icon(JwtIcon).Var("action", "copy")
3739
wf.NewItem(string(b)).Subtitle("Payload").Valid(true).Arg(string(b)).Icon(JwtIcon).Var("action", "copy")
3840
} else {
39-
wf.NewItem(err.Error()).Subtitle("JSON").Valid(false).Icon(aw.IconError)
41+
wf.NewItem(fmt.Sprintf("`%s` is invalid jwt", query)).Subtitle("Try a different query?").Icon(JwtGrayIcon)
4042
}
4143

4244
wf.SendFeedback()

‎cmd/lorem.go renamed to ‎cmd/loremipsum.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ package cmd
66

77
import (
88
"fmt"
9+
"log"
910
"strconv"
1011
"strings"
1112

12-
aw "github.com/deanishe/awgo"
1313
"github.com/spf13/cobra"
14+
"golang.design/x/clipboard"
1415
"gopkg.in/loremipsum.v1"
1516
)
1617

@@ -23,9 +24,14 @@ var loremCmd = &cobra.Command{
2324

2425
func runLorem(cmd *cobra.Command, args []string) {
2526
query := strings.Join(args, " ")
27+
if strings.TrimSpace(query) == "" {
28+
query = string(clipboard.Read(clipboard.FmtText))
29+
}
30+
log.Println(query)
31+
2632
c, err := strconv.ParseInt(query, 10, 64)
2733
if err != nil {
28-
wf.NewItem(err.Error()).Subtitle("Invalid integer").Valid(false).Icon(aw.IconError)
34+
wf.NewItem(fmt.Sprintf("`%s` is invalid integer", query)).Subtitle("Try a different query?").Icon(LoremIpsumGrayIcon)
2935
} else {
3036
loremIpsumGeneratoe := loremipsum.New()
3137
words := loremIpsumGeneratoe.Words(int(c))

‎cmd/qrcode.go

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package cmd
77
import (
88
"fmt"
99
"image/png"
10+
"log"
1011
"os"
1112
"strconv"
1213
"strings"
@@ -57,6 +58,7 @@ func runQrcode(cmd *cobra.Command, args []string) {
5758
if strings.TrimSpace(query) == "" {
5859
query = string(clipboard.Read(clipboard.FmtText))
5960
}
61+
log.Println(query)
6062

6163
path := fmt.Sprintf("%s/qr.png", wf.DataDir())
6264
s, err := strconv.Atoi(alfred.GetQrcodeSize(wf))

‎cmd/uuid.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ package cmd
66

77
import (
88
"fmt"
9+
"log"
910
"strconv"
1011
"strings"
1112

12-
aw "github.com/deanishe/awgo"
1313
"github.com/google/uuid"
1414
"github.com/spf13/cobra"
15+
"golang.design/x/clipboard"
1516
)
1617

1718
// uuidCmd represents the uuid command
@@ -23,9 +24,14 @@ var uuidCmd = &cobra.Command{
2324

2425
func runUuid(cmd *cobra.Command, args []string) {
2526
query := strings.Join(args, " ")
27+
if strings.TrimSpace(query) == "" {
28+
query = string(clipboard.Read(clipboard.FmtText))
29+
}
30+
log.Println(query)
31+
2632
c, err := strconv.ParseInt(query, 10, 64)
2733
if err != nil {
28-
wf.NewItem(err.Error()).Subtitle("Invalid integer").Valid(false).Icon(aw.IconError)
34+
wf.NewItem(fmt.Sprintf("`%s` is invalid integer", query)).Subtitle("Try a different query?").Icon(UuidGrayIcon)
2935
} else {
3036
buf := make([]string, c)
3137
for i := int64(0); i < c; i++ {

‎icons/hash-gray.pdf

2.28 KB
Binary file not shown.

‎icons/hash-gray.svg

+10
Loading

‎icons/jwt-gray.pdf

995 Bytes
Binary file not shown.

‎icons/jwt-gray.svg

+9
Loading

‎icons/lorem-ipsum-gary.svg

+11
Loading

‎icons/lorem-ipsum-gray.pdf

900 Bytes
Binary file not shown.

‎icons/uuid-gray.pdf

1.08 KB
Binary file not shown.

‎icons/uuid-gray.svg

+14
Loading

0 commit comments

Comments
 (0)