🐛 Fix Minor bugs

Author: dev-drprasad

.gitignore

@@ -6,7 +6,7 @@ sample
 *.bin
 .DS_Store
 bin/*
-pkged.go
+**/pkged.go
 vendor/
 qtbox
 gui/deploy

.goreleaser.yml

@@ -5,7 +5,8 @@ before:
     - go mod download
     - go get github.com/markbates/pkger/cmd/pkger
 builds:
-  - env:
+  - id: cli
+    env:
       - CGO_ENABLED=0
     goos:
       - darwin
@@ -14,13 +15,30 @@ builds:
     goarch:
       - amd64
     hooks:
-      pre: pkger -include /assets
+      pre: pkger -include /assets -o ./cmd/
     dir: cmd
     main: .
+  - id : gui
+    goos:
+      - darwin
+      - windows
+      - linux
+    goarch:
+      - amd64
+    hooks:
+      pre: pkger -include /assets -o ./gui/
+    dir: gui
+    main: .
 
 archives:
   - format: binary
-    name_template: "hsk00-{{ .Os }}-{{ .Arch }}"
+    name_template: "hsk00-{{ .Os }}-{{ .Arch }}-cli"
+    builds:
+      - cli
+  - format: binary
+    name_template: "hsk00-{{ .Os }}-{{ .Arch }}-gui"
+    builds:
+      - gui
 
 release:
   extra_files:

Makefile

@@ -1,7 +1,8 @@
 .PHONY: generate
 
 generate:
-	pkger -include /assets
+	pkger -include /assets -o cmd/
+	pkger -include /assets -o gui/
 
 
 build: generate

cmd/main.go

@@ -26,7 +26,7 @@ func init() {
 
 	scrambleCommand.Flags().String("out", "", "output asd file name")
 	scrambleCommand.MarkFlagRequired("out")
-	rootCmd.AddCommand(descrambleCommand)
+	rootCmd.AddCommand(scrambleCommand)
 
 	addCommand.Flags().Int("category", 0, "number of category starting from 0, left -> right")
 	addCommand.MarkFlagRequired("category")

go.mod

@@ -3,18 +3,11 @@ module github.com/dev-drprasad/hsk00
 go 1.15
 
 require (
-	github.com/dev-drprasad/qt v1.0.2
+	github.com/dev-drprasad/qt v1.0.3
 	github.com/fogleman/gg v1.3.0
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/markbates/pkger v0.17.1
 	github.com/spf13/cobra v1.1.1
-	github.com/therecipe/env_darwin_amd64_513 v0.0.0-20190626001412-d8e92e8db4d0 // indirect
-	github.com/therecipe/env_linux_amd64_513 v0.0.0-20190626000307-e137a3934da6 // indirect
-	github.com/therecipe/env_windows_amd64_513 v0.0.0-20190626000028-79ec8bd06fb2 // indirect
-	github.com/therecipe/env_windows_amd64_513/Tools v0.0.0-20190626000028-79ec8bd06fb2 // indirect
-	github.com/therecipe/qt v0.0.0-20200904063919-c0c124a5770d // indirect
-	github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d // indirect
-	github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d // indirect
 )
 
-replace github.com/therecipe/qt v0.0.0 => github.com/dev-drprasad/qt v1.0.1
+replace github.com/therecipe/qt v0.0.0 => github.com/dev-drprasad/qt v1.0.3

go.sum

@@ -34,10 +34,10 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dev-drprasad/qt v1.0.1 h1:sBeTf8s08CTZIDcCdAEmOhVXjz7KHH2Zj0nltOEKM6s=
-github.com/dev-drprasad/qt v1.0.1/go.mod h1:o6ee1Je9pCg7y3XBbbcSIFxFlo3bW/zT6qd+8Q3pHMQ=
 github.com/dev-drprasad/qt v1.0.2 h1:J1aNrIkafTX3HgOmVOXPCl2i6NEQzGVL33v++BFQmGk=
 github.com/dev-drprasad/qt v1.0.2/go.mod h1:o6ee1Je9pCg7y3XBbbcSIFxFlo3bW/zT6qd+8Q3pHMQ=
+github.com/dev-drprasad/qt v1.0.3 h1:sFjumecuFBqapUR/tSrtPLkNUPC/a15YehrMUCn2VYk=
+github.com/dev-drprasad/qt v1.0.3/go.mod h1:o6ee1Je9pCg7y3XBbbcSIFxFlo3bW/zT6qd+8Q3pHMQ=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -184,21 +184,6 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/therecipe/env_darwin_amd64_513 v0.0.0-20190626001412-d8e92e8db4d0 h1:Txh3Vvzx49BQg6OwSuYqOGNndpCWPYScIpEgK5BcGpc=
-github.com/therecipe/env_darwin_amd64_513 v0.0.0-20190626001412-d8e92e8db4d0/go.mod h1:mdZdqBBs62KM68t1wD7rjG2NumvwuSNLqmMetEAqI14=
-github.com/therecipe/env_linux_amd64_513 v0.0.0-20190626000307-e137a3934da6 h1:i0/LROzMqqMuHJ9gPeH2+So1Icle7zSVRqzXR4Z75hw=
-github.com/therecipe/env_linux_amd64_513 v0.0.0-20190626000307-e137a3934da6/go.mod h1:Cq/lZrZTuGhRckzJgZFONK4WCE67AssWhHYj82U5FFI=
-github.com/therecipe/env_windows_amd64_513 v0.0.0-20190626000028-79ec8bd06fb2 h1:dpqvgFCZRuxwiJhWVwQZSJ8zDaORf+GiUGxxOGzlQtc=
-github.com/therecipe/env_windows_amd64_513 v0.0.0-20190626000028-79ec8bd06fb2/go.mod h1:evzb6PHK/MrRdJyhL1kbQXTfbMu4t4JOLl6iz55ywvk=
-github.com/therecipe/env_windows_amd64_513/Tools v0.0.0-20190626000028-79ec8bd06fb2 h1:hM5KSUn4YbSvPuXAWJyywohkDocI+hSEsL+Msc9/FDA=
-github.com/therecipe/env_windows_amd64_513/Tools v0.0.0-20190626000028-79ec8bd06fb2/go.mod h1:75GdIZ2clS7WUwhRklktkP02ffFz7+tBx8/Ue8eFexU=
-github.com/therecipe/qt v0.0.0-20200904063919-c0c124a5770d h1:T+d8FnaLSvM/1BdlDXhW4d5dr2F07bAbB+LpgzMxx+o=
-github.com/therecipe/qt v0.0.0-20200904063919-c0c124a5770d/go.mod h1:SUUR2j3aE1z6/g76SdD6NwACEpvCxb3fvG82eKbD6us=
-github.com/therecipe/qt/internal/binding/files/docs v0.0.0-20191019224306-1097424d656c h1:/VhcwU7WuFEVgDHZ9V8PIYAyYqQ6KNxFUjBMOf2aFZM=
-github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d h1:hAZyEG2swPRWjF0kqqdGERXUazYnRJdAk4a58f14z7Y=
-github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d/go.mod h1:7m8PDYDEtEVqfjoUQc2UrFqhG0CDmoVJjRlQxexndFc=
-github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d h1:AJRoBel/g9cDS+yE8BcN3E+TDD/xNAguG21aoR8DAIE=
-github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d/go.mod h1:mH55Ek7AZcdns5KPp99O0bg+78el64YCYWHiQKrOdt4=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=

gui/main.go

@@ -82,10 +82,15 @@ func main() {
 		fileDialog := widgets.NewQFileDialog(nil, 0)
 		fileDialog.SetFileMode(widgets.QFileDialog__DirectoryOnly)
 		if fileDialog.Exec() == int(widgets.QDialog__Accepted) {
-			rootPathInput.SetText(fileDialog.Directory().Path())
-			rootDir = fileDialog.Directory().Path()
+			if len(fileDialog.SelectedFiles()) == 0 {
+				return
+			}
+			selectedDir := fileDialog.SelectedFiles()[0]
+			rootPathInput.SetText(selectedDir)
+			rootDir = selectedDir
 		}
 	})
+
 	selectRootButton.SizePolicy().SetVerticalPolicy(widgets.QSizePolicy__Preferred)
 	container.SizePolicy().SetVerticalPolicy(widgets.QSizePolicy__Preferred)