Merge pull request #8 from Jacalz/develop

Changes for release version 2.1.0

Author: Jacalz

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Report a bug or odd behaviour
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+<!-- Please search for open issues that relate to the same problem before opening a new one. -->
+
+### Description:
+<!-- Provide a clear and concise description of the bug. -->
+
+
+### Steps to Reproduce:
+<!-- Please provide a set of steps to reproduce the bug. -->
+1. 
+2. 
+3. 
+
+### Screenshots:
+<!-- If applicable, add screenshots or gifs to help showcase the bug. -->
+
+### Device (please complete the following information):
+ - **OS:** <!-- [e.g. Linux, MacOS or Windows] -->
+ - **Version:** <!-- [e.g. 5.10.3, 10.13.2 High Sierra or 10] -->
+ - **Go version:** <!-- [e.g. 1.15.6] -->
+ - **Wormhole-gui version:** <!-- [e.g. 2.1.0 or git SHA] -->

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea or improvement
+title: ''
+labels: 'enhancement'
+assignees: ''
+
+---
+
+### Is your feature request related to a problem? Please describe:
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+### Describe the solution you'd like to see:
+<!-- A clear and concise description of what you want to happen. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,10 @@
+### Description:
+<!-- A description of the included change. Please include any relevant motivation and background.
+If it fixes an issue, please add a line with: Fixes #issue-number -->
+
+### Checklist:
+<!-- Please tick these as appropriate using [x] -->
+
+- [ ] Tests included.
+- [ ] Lint and formatter run with no errors.
+- [ ] Tests all pass.

.github/workflows/static_analysis.yml

@@ -4,29 +4,25 @@ on: [push, pull_request]
 jobs:
   checks:
     runs-on: ubuntu-latest
-    env:
-      GO111MODULE: on
-      CGO_ENABLED: on
-
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-go@v2
+    - uses: WillAbides/setup-go[email protected]
       with:
-        go-version: '1.15.x'     
+        go-version: '1.16.x'     
 
     - name: Install build dependencies
-      run: sudo apt-get update && sudo apt-get install golang gcc libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libx11-dev xorg-dev
+      run: sudo apt-get update && sudo apt-get install gcc libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libx11-dev xorg-dev
 
     - name: Get static analysis tools
       run: |
-        go get golang.org/x/tools/cmd/goimports                               
-        go get github.com/fzipp/gocyclo/cmd/gocyclo
-        go get golang.org/x/lint/golint
-        go get honnef.co/go/tools/cmd/staticcheck
-        go get github.com/securego/gosec/v2/cmd/gosec
+        go install golang.org/x/tools/cmd/goimports@latest
+        go install github.com/fzipp/gocyclo/cmd/gocyclo@latest
+        go install golang.org/x/lint/golint@latest
+        go install honnef.co/go/tools/cmd/staticcheck@v0.1.2
+        go install github.com/securego/gosec/v2/cmd/gosec@v2.6.1
 
     - name: Vet
-      run: go vet -tags ci ./...
+      run: go vet ./...
 
     - name: Goimports
       run: test -z $(goimports -e -d . | tee /dev/stderr)
@@ -35,10 +31,10 @@ jobs:
       run: gocyclo -over 20 .
 
     - name: Golint
-      run: golint -set_exit_status $(go list -tags ci ./...)
+      run: golint -set_exit_status $(go list ./...)
 
     - name: Staticcheck
-      run: staticcheck -f stylish ./...
+      run: staticcheck -go 1.14 -f stylish ./...
 
     - name: Gosec
       run: gosec ./...

.gitignore

@@ -4,6 +4,9 @@
 *.dll
 *.so
 *.dylib
+*.tar.gz
+*.tar.xz
+*.zip
 wormhole-gui
 
 # Output from fyne-cross when running cross-compilation.

CHANGELOG.MD

@@ -1,5 +1,37 @@
 # Changelog
 
+## 2.1.0 - Major ui changes and a lot of improvements
+- Major rework of the receive tab to use progress bars.
+  - Dialogs are no longer used to indicate finished receives.
+- Redesigned settings tab to use a more modern layout.
+  - The component slider setting now displays the currently selected number.
+  - Fixed a bug where the component length slider did not have distinct steps.
+  - Added a setting to allow existing files to overwritten (disabled by default).
+- Multiple improvements to the text send and receive windows.
+  - Opens faster by only being created once instead of on each send/receive.
+  - Clicking `CTRL + SHIFT` in the send window now starts the send.
+  - Tab characters are now displayed correctly (bug fix in fyne).
+  - Buttons now use better wording and better icons.
+- Some small performance improvements for send and receive of files and directories.
+- Receives are now properly rejected instead of just not being downloaded.
+- Better notification handling by indicating success and fail for both sends and receives.
+- Copying the code of a sent item is now slightly faster.
+- Fixed an issue where existing files could be overwritten.
+- Fixed a couple possible race conditions on sending data.
+- Fixed an issue that prevented enter on the numpad from starting the receive.
+- Fixed an issue where file extensions would be displayed as `.` when waiting for data.
+- Fixed a bug that caused the window to not be able to shrink to the correct smallest size.
+- Multiple other code cleanups, restructurings and minor fixes.
+- Added an [appstream metadata](https://www.freedesktop.org/software/appstream/docs/) file for Linux and BSD systems (installed via `make install`).
+- Updated `fyne` to [v2.0.0](https://github.com/fyne-io/fyne/releases/tag/v2.0.0).
+  - The tabs are now animated to be more responsible on change.
+  - Buttons now show an animation on tapped.
+  - Theme changes and other improvements to styling.
+  - Multiple smaller performance optimizations for widgets.
+  - Improved scaling on HIDPI displays.
+- Release binaries are now built with `Go 1.14.15`.
+  - A security fix for `crypto/elliptic` and a few smaller bug fixes.
+
 ## 2.0.2 - A few fixes while waiting for 2.1.0
 - Fix a bug that prevented folder send to work on Windows.
 - Fix an issue where the ui would become unresponsive on dismissing text send.

Makefile

@@ -3,8 +3,9 @@ APPID = com.github.jacalz.wormhole-gui
 ICON = internal/assets/icon/icon-512.png
 NAME = wormhole-gui
 
-# Default path to the go binary directory.
+# Variables for development.
 GOBIN ?= ~/go/bin/
+VERSION ?= dev
 
 # If PREFIX isn't provided, we check for $(DESTDIR)/usr/local and use that if it exists.
 # Otherwice we fall back to using /usr.
@@ -18,12 +19,14 @@ build:
 install:
 	install -Dm00755 $(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME)
 	install -Dm00644 $(ICON) $(DESTDIR)$(PREFIX)/share/pixmaps/$(NAME).png
-	install -Dm00644 internal/assets/$(NAME).desktop $(DESTDIR)$(PREFIX)/share/applications/$(NAME).desktop
+	install -Dm00644 internal/assets/unix/$(NAME).desktop $(DESTDIR)$(PREFIX)/share/applications/$(NAME).desktop
+	install -Dm00644 internal/assets/unix/com.github.jacalz.$(NAME).metainfo.xml $(DESTDIR)$(PREFIX)/share/metainfo/com.github.jacalz.$(NAME).metainfo.xml
 
 uninstall:
 	-rm $(DESTDIR)$(PREFIX)/share/applications/$(NAME).desktop
 	-rm $(DESTDIR)$(PREFIX)/bin/$(NAME)
 	-rm $(DESTDIR)$(PREFIX)/share/pixmaps/$(NAME).png
+	-rm $(DESTDIR)$(PREFIX)/share/metainfo/com.github.jacalz.$(NAME).metainfo.xml
 
 check:
 	# Check the whole codebase for misspellings.
@@ -50,4 +53,23 @@ linux:
 windows:
 	$(GOBIN)fyne-cross windows -arch amd64 -app-id $(APPID) -icon $(ICON)
 
-cross-compile: darwin freebsd linux windows
+windows-debug:
+	$(GOBIN)fyne-cross windows -console -arch amd64 -app-id $(APPID) -icon $(ICON)
+
+release: darwin freebsd linux windows
+	# Usage: make release VERSION=v2.x.x
+	# If no version is specified, it will default to "dev" instead.
+
+	# Move Linux package bundles to the root with correct naming.
+	mv fyne-cross/dist/linux-amd64/wormhole-gui.tar.gz $(NAME)-$(VERSION)-linux-amd64.tar.gz
+	mv fyne-cross/dist/linux-arm64/wormhole-gui.tar.gz $(NAME)-$(VERSION)-linux-arm64.tar.gz
+
+	# Move FreeBSD package bundles to the root with correct naming.
+	mv fyne-cross/dist/freebsd-amd64/wormhole-gui.tar.gz $(NAME)-$(VERSION)-freebsd-amd64.tar.gz
+
+	# Zip up the darwin package with correct name and move to the root.
+	(cd fyne-cross/dist/darwin-amd64/ && zip -r wormhole-gui-darwin-amd64.zip wormhole-gui.app/)
+	mv fyne-cross/dist/darwin-amd64/wormhole-gui-darwin-amd64.zip $(NAME)-$(VERSION)-darwin-amd64.zip
+
+	# Move Windows package to the root with correct naming.
+	mv fyne-cross/dist/windows-amd64/wormhole-gui.exe.zip $(NAME)-$(VERSION)-windows-amd64.zip

README.md

@@ -8,7 +8,7 @@ It uses the Go implementation of magic-wormhole, called [wormhole-william](https
 </p>
 
 Built using the following Go modules:
-- [fyne](https://github.com/fyne-io/fyne) (version 1.4.3)
+- [fyne](https://github.com/fyne-io/fyne) (version 2.0.0)
 - [wormhole-william](https://github.com/psanford/wormhole-william) (version 1.0.4 + [f69f6e8](https://github.com/psanford/wormhole-william/commit/f69f6e823d8cec6b3756b8ce63024c8cd3c3ebf2))
 - [archiver](https://github.com/mholt/archiver) (version 3.5.0)
 

go.mod

@@ -3,7 +3,7 @@ module github.com/Jacalz/wormhole-gui
 go 1.14
 
 require (
-	fyne.io/fyne v1.4.3
+	fyne.io/fyne/v2 v2.0.0
 	github.com/mholt/archiver/v3 v3.5.0
 	github.com/psanford/wormhole-william v1.0.5-0.20200920232445-f69f6e823d8c
 )

go.sum

@@ -1,5 +1,5 @@
-fyne.io/fyne v1.4.3 h1:356CnXCiYrrfaLGsB7qLK3c6ktzyh8WR05v/2RBu51I=
-fyne.io/fyne v1.4.3/go.mod h1:8kiPBNSDmuplxs9WnKCkaWYqbcXFy0DeAzwa6PBO9Z8=
+fyne.io/fyne/v2 v2.0.0 h1:TfsS3bNq5663BpXsoz1OfzyjcaMqqOf9usI8ZKkw4IE=
+fyne.io/fyne/v2 v2.0.0/go.mod h1:FmobqvPpBW+nG1nDyxZWf1SQLED9g/vXIxiIIVjHazY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I=
 github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM=
@@ -22,6 +22,8 @@ github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5Jflh
 github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fredbi/uri v0.0.0-20181227131451-3dcfdacbaaf3 h1:FDqhDm7pcsLhhWl1QtD8vlzI4mm59llRvNzrFg6/LAA=
+github.com/fredbi/uri v0.0.0-20181227131451-3dcfdacbaaf3/go.mod h1:CzM2G82Q9BDUvMTGHnXf/6OExw/Dz2ivDj48nVg7Lg8=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=