Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: trzsz/trzsz-go
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.1.2
Choose a base ref
...
head repository: trzsz/trzsz-go
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
4 contributors

Commits on Jun 4, 2023

  1. copyright add email

    @lonnywong
    lonnywong committed Jun 4, 2023
    Copy the full SHA
    bcb9178 View commit details

  2. override triggers on relay

    @lonnywong
    lonnywong committed Jun 4, 2023
    Copy the full SHA
    1e59524 View commit details

Commits on Jun 7, 2023

  1. feat: format files output message

    @amo996 @lonnywong
    amo996 authored and lonnywong committed Jun 7, 2023
    Copy the full SHA
    27aeeeb View commit details

  2. feat: modification after review

    @amo996 @lonnywong
    amo996 authored and lonnywong committed Jun 7, 2023
    Copy the full SHA
    5415a96 View commit details

  3. remove empty line

    @lonnywong
    lonnywong committed Jun 7, 2023
    Copy the full SHA
    5627712 View commit details

Commits on Jun 9, 2023

  1. update readme 

    Thanks pmzgit <pmz010@126.com>
    @lonnywong
    lonnywong committed Jun 9, 2023
    Copy the full SHA
    21d484f View commit details

  2. support growing files #34

    @lonnywong
    lonnywong committed Jun 9, 2023
    Copy the full SHA
    5d7e0fc View commit details

  3. update test case

    @lonnywong
    lonnywong committed Jun 9, 2023
    Copy the full SHA
    54f125b View commit details

Commits on Jun 10, 2023

  1. refactor relay as a go package

    @lonnywong
    lonnywong committed Jun 10, 2023
    Copy the full SHA
    66fe0bd View commit details

Commits on Jun 11, 2023

  1. optimize transfer speed

    @lonnywong
    lonnywong committed Jun 11, 2023
    Copy the full SHA
    ced9d2e View commit details

  2. not affected by windows

    @lonnywong
    lonnywong committed Jun 11, 2023
    Copy the full SHA
    72ab0a6 View commit details

  3. strip tmux status line

    @lonnywong
    lonnywong committed Jun 11, 2023
    Copy the full SHA
    813f88e View commit details

  4. release v1.1.3

    @lonnywong
    lonnywong committed Jun 11, 2023
    Copy the full SHA
    0116345 View commit details

Commits on Jun 16, 2023

  1. support non-terminal

    @lonnywong
    lonnywong committed Jun 16, 2023
    Copy the full SHA
    3bdd159 View commit details

Commits on Jun 17, 2023

  1. optimize transfer speed

    @lonnywong
    lonnywong committed Jun 17, 2023
    Copy the full SHA
    3e24dd2 View commit details

Commits on Jul 1, 2023

  1. add -r option same as -d

    @lonnywong
    lonnywong committed Jul 1, 2023
    Copy the full SHA
    00b116a View commit details

Commits on Jul 2, 2023

  1. update readme

    @lonnywong
    lonnywong committed Jul 2, 2023
    Copy the full SHA
    5787f52 View commit details

  2. update example

    @lonnywong
    lonnywong committed Jul 2, 2023
    Copy the full SHA
    5286599 View commit details

Commits on Jul 8, 2023

  1. add pause function, and optimize the waiting time of stop

    @lonnywong
    lonnywong committed Jul 8, 2023
    Copy the full SHA
    252e2e5 View commit details

  2. support non terminal

    @lonnywong
    lonnywong committed Jul 8, 2023
    Copy the full SHA
    f2c6a11 View commit details

Commits on Jul 9, 2023

  1. support breakpoint resume

    @lonnywong
    lonnywong committed Jul 9, 2023
    Copy the full SHA
    306b1d1 View commit details

Commits on Jul 15, 2023

  1. auto compression

    @lonnywong
    lonnywong committed Jul 15, 2023
    Copy the full SHA
    763e7c9 View commit details

Commits on Jul 16, 2023

  1. confirm stop and delete

    @lonnywong
    lonnywong committed Jul 16, 2023
    Copy the full SHA
    02fc0cc View commit details

Commits on Jul 29, 2023

  1. improve error message

    @lonnywong
    lonnywong committed Jul 29, 2023
    Copy the full SHA
    291458c View commit details

  2. improve progress bar

    @lonnywong
    lonnywong committed Jul 29, 2023
    Copy the full SHA
    2721080 View commit details

  3. disable tmux status redrawing

    @lonnywong
    lonnywong committed Jul 29, 2023
    Copy the full SHA
    14e3640 View commit details

Commits on Jul 30, 2023

  1. optimize directory transfers

    @lonnywong
    lonnywong committed Jul 30, 2023
    Copy the full SHA
    da253c3 View commit details

  2. scoop moved to main bucket

    @lonnywong
    lonnywong committed Jul 30, 2023
    Copy the full SHA
    188675b View commit details

Commits on Aug 12, 2023

  1. add zenity tips

    @lonnywong
    lonnywong committed Aug 12, 2023
    Copy the full SHA
    d788d06 View commit details

Commits on Aug 19, 2023

  1. expose trzsz config

    @lonnywong
    lonnywong committed Aug 19, 2023
    Copy the full SHA
    6c37e8d View commit details

Commits on Sep 2, 2023

  1. improve binary escaping

    @lonnywong
    lonnywong committed Sep 2, 2023
    Copy the full SHA
    2d4299a View commit details

Commits on Sep 3, 2023

  1. support tunnel transferring

    @lonnywong
    lonnywong committed Sep 3, 2023
    Copy the full SHA
    767c161 View commit details

Commits on Sep 17, 2023

  1. support tunnel relay

    @lonnywong
    lonnywong committed Sep 17, 2023
    Copy the full SHA
    3c175df View commit details

Commits on Sep 25, 2023

  1. Build arm v6 and v7 for linux (#41)

    @ragazenta
    ragazenta authored Sep 25, 2023
    Copy the full SHA
    362d0c5 View commit details

Commits on Oct 14, 2023

  1. using trzsz/promptui

    @lonnywong
    lonnywong committed Oct 14, 2023
    Copy the full SHA
    bc6a0d4 View commit details

Commits on Oct 20, 2023

  1. improve drag file to upload

    @lonnywong
    lonnywong committed Oct 20, 2023
    Copy the full SHA
    e686488 View commit details

Commits on Oct 21, 2023

  1. fix tmux cc progress bar

    @lonnywong
    lonnywong committed Oct 21, 2023
    Copy the full SHA
    dd517df View commit details

  2. update readme

    @lonnywong
    lonnywong committed Oct 21, 2023
    Copy the full SHA
    c884f23 View commit details

Commits on Oct 22, 2023

  1. bump version to v1.1.6

    @lonnywong
    lonnywong committed Oct 22, 2023
    Copy the full SHA
    7218836 View commit details

Commits on Oct 28, 2023

  1. improve drag files to upload

    @lonnywong
    lonnywong committed Oct 28, 2023
    Copy the full SHA
    ab9d3ad View commit details

Commits on Nov 11, 2023

  1. improve drag files in warp terminal

    @lonnywong
    lonnywong committed Nov 11, 2023
    Copy the full SHA
    b45bed0 View commit details

Commits on Dec 3, 2023

  1. support zmodem lrzsz ( rz / sz )

    @lonnywong
    lonnywong committed Dec 3, 2023
    Copy the full SHA
    fc290aa View commit details

Commits on Dec 9, 2023

  1. improve progress bar

    @lonnywong
    lonnywong committed Dec 9, 2023
    Copy the full SHA
    53ae906 View commit details

  2. fix progress test

    @lonnywong
    lonnywong committed Dec 9, 2023
    Copy the full SHA
    4537ecb View commit details

  3. fix progress bar on tmux control mode

    @lonnywong
    lonnywong committed Dec 9, 2023
    Copy the full SHA
    a64ab46 View commit details

Commits on Dec 10, 2023

  1. improve zmodem progress

    @lonnywong
    lonnywong committed Dec 10, 2023
    Copy the full SHA
    9713637 View commit details

Commits on Dec 23, 2023

  1. support file permissions

    @lonnywong
    lonnywong committed Dec 23, 2023
    Copy the full SHA
    5259702 View commit details

  2. use go1.20 for win7

    @lonnywong
    lonnywong committed Dec 23, 2023
    Copy the full SHA
    e19df7b View commit details

  3. bump version to v1.1.7

    @lonnywong
    lonnywong committed Dec 23, 2023
    Copy the full SHA
    7fb6299 View commit details

Commits on Jan 13, 2024

  1. get parent pid from tmux client

    @lonnywong
    lonnywong committed Jan 13, 2024
    Copy the full SHA
    ca0b2b3 View commit details
Showing with 6,584 additions and 1,763 deletions.
  1. +24 −9 .github/workflows/gotest.yml
  2. +14 −18 .github/workflows/publish.yml
  3. +4 −0 .gitignore
  4. +98 −14 .goreleaser.yaml
  5. +1 −1 LICENSE
  6. +4 −4 Makefile
  7. +264 −0 README.cn.md
  8. +175 −116 README.md
  9. +2 −1 cmd/trz/main.go
  10. +2 −1 cmd/trzsz/main.go
  11. +2 −1 cmd/tsz/main.go
  12. +36 −0 debian/changelog
  13. +1 −1 debian/copyright
  14. +15 −11 examples/go.mod
  15. +38 −55 examples/go.sum
  16. +28 −30 examples/ssh_client.go
  17. +23 −11 go.mod
  18. +57 −53 go.sum
  19. +377 −0 trzsz/append.go
  20. +249 −0 trzsz/archive.go
  21. +198 −0 trzsz/archive_test.go
  22. +40 −21 trzsz/buffer.go
  23. +16 −1 trzsz/buffer_test.go
  24. +610 −103 trzsz/comm.go
  25. +338 −42 trzsz/comm_test.go
  26. +38 −28 trzsz/drag.go
  27. +69 −60 trzsz/escape.go
  28. +593 −110 trzsz/filter.go
  29. +111 −0 trzsz/filter_test.go
  30. +602 −288 trzsz/pipeline.go
  31. +404 −122 trzsz/pipeline_test.go
  32. +152 −79 trzsz/progress.go
  33. +91 −90 trzsz/progress_test.go
  34. +15 −13 trzsz/pty_unix.go
  35. +38 −64 trzsz/pty_windows.go
  36. +382 −102 trzsz/relay.go
  37. +555 −164 trzsz/transfer.go
  38. +60 −41 trzsz/transfer_test.go
  39. +75 −19 trzsz/trz.go
  40. +27 −12 trzsz/trz_test.go
  41. +49 −21 trzsz/trzsz.go
  42. +74 −17 trzsz/tsz.go
  43. +26 −12 trzsz/tsz_test.go
  44. +113 −0 trzsz/utils_darwin.go
  45. +5 −1 trzsz/{zenity_unix.go → utils_other.go}
  46. +7 −24 trzsz/{zenity_darwin.go → utils_unix.go}
  47. +11 −1 trzsz/{zenity_windows.go → utils_windows.go}
  48. +2 −2 trzsz/version.go
  49. +399 −0 trzsz/zmodem.go
  50. +70 −0 trzsz/zmodem_test.go
33 changes: 24 additions & 9 deletions .github/workflows/gotest.yml
View file
Original file line number Diff line number Diff line change
@@ -5,32 +5,47 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout trzsz-go
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ">=1.20.3"
go-version: "1.20"
- name: go test
run: go test -v -count=1 ./trzsz
go-test-on-macos:
runs-on: macos-latest
steps:
- name: Checkout trzsz-go
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ">=1.20.3"
go-version: "1.20"
- name: go test
run: go test -v -count=1 ./trzsz
go-test-on-windows:
runs-on: windows-latest
steps:
- name: Checkout trzsz-go
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ">=1.20.3"
go-version: "1.20"
- name: go test
run: go test -v -count=1 ./trzsz
go-release-snapshot:
runs-on: ubuntu-latest
steps:
- name: Checkout trzsz-go
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: "1.20"
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v6
with:
distribution: goreleaser
version: "~> v1"
args: release --clean --snapshot --skip=publish
32 changes: 14 additions & 18 deletions .github/workflows/publish.yml
View file
Original file line number Diff line number Diff line change
@@ -8,26 +8,24 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout trzsz-go
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: '>=1.20.3'
go-version: "1.20"
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v3
uses: goreleaser/goreleaser-action@v6
with:
distribution: goreleaser
version: latest
args: release --rm-dist --skip-publish
version: "~> v1"
args: release --clean --skip=publish
- name: Upload Release Assets
uses: trzsz/upload-release-assets@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: softprops/action-gh-release@v2
with:
release_id: ${{ github.event.release.id }}
assets_path: |
files: |
dist/*.tar.gz
dist/*.zip
dist/*.rpm
dist/*_checksums.txt
- name: Publish rpm to Gemfury
env:
@@ -45,10 +43,10 @@ jobs:
working-directory: inno_setup
steps:
- name: Checkout trzsz-go
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Get trzsz-go version
id: trzsz-go-version
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
github-token: NO_NEED
result-encoding: string
@@ -57,6 +55,7 @@ jobs:
run: |
curl --retry 10 --retry-all-errors -L -o installer.exe https://jrsoftware.org/download.php/is.exe
./installer.exe /verysilent /allusers /dir=inst
sleep 60
- name: Download trzsz-go packages
env:
TRZSZ_VERSION: ${{ steps.trzsz-go-version.outputs.result }}
@@ -73,9 +72,6 @@ jobs:
./inst/iscc trzsz_windows_x86_64.iss
./inst/iscc trzsz_windows_aarch64.iss
- name: Upload Inno Setup Assets
uses: trzsz/upload-release-assets@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: softprops/action-gh-release@v2
with:
release_id: ${{ github.event.release.id }}
assets_path: inno_setup/Output/*.exe
files: inno_setup/Output/*.exe
4 changes: 4 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -14,10 +14,14 @@
# Dependency directories (remove the comment below to include it)
# vendor/

# Go workspace file
go.work

bin/
debian/files

*.swp
*.swo

dist/
vendor/
112 changes: 98 additions & 14 deletions .goreleaser.yaml
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,32 @@ builds:
- linux
- windows
- darwin
- android
- freebsd
goarch:
- "386"
- amd64
- arm
- arm64
- loong64
goarm:
- "6"
- "7"
ignore:
- goos: windows
goarch: arm
- goos: darwin
goarch: arm
- goos: android
goarch: arm
- goos: android
goarch: "386"
- goos: android
goarch: amd64
- goos: freebsd
goarch: arm
- goos: freebsd
goarch: "386"
- id: tsz
main: ./cmd/tsz
binary: tsz
@@ -21,6 +47,32 @@ builds:
- linux
- windows
- darwin
- android
- freebsd
goarch:
- "386"
- amd64
- arm
- arm64
- loong64
goarm:
- "6"
- "7"
ignore:
- goos: windows
goarch: arm
- goos: darwin
goarch: arm
- goos: android
goarch: arm
- goos: android
goarch: "386"
- goos: android
goarch: amd64
- goos: freebsd
goarch: arm
- goos: freebsd
goarch: "386"
- id: trzsz
main: ./cmd/trzsz
binary: trzsz
@@ -30,13 +82,44 @@ builds:
- linux
- windows
- darwin
- android
- freebsd
goarch:
- "386"
- amd64
- arm
- arm64
- loong64
goarm:
- "6"
- "7"
ignore:
- goos: windows
goarch: arm
- goos: darwin
goarch: arm
- goos: android
goarch: arm
- goos: android
goarch: "386"
- goos: android
goarch: amd64
- goos: freebsd
goarch: arm
- goos: freebsd
goarch: "386"
archives:
- id: trzsz
replacements:
darwin: macos
386: i386
amd64: x86_64
arm64: aarch64
name_template: >-
{{ .ProjectName }}_
{{- .Version }}_
{{- if eq .Os "darwin" }}macos_
{{- else }}{{ .Os }}_{{ end }}
{{- if eq .Arch "amd64" }}x86_64
{{- else if eq .Arch "386" }}i386
{{- else if eq .Arch "arm64" }}aarch64
{{- else if eq .Arch "arm" }}armv{{ .Arm }}
{{- else }}{{ .Arch }}{{ end }}
wrap_in_directory: true
format_overrides:
- goos: windows
@@ -49,11 +132,16 @@ nfpms:
- trz
- tsz
- trzsz
replacements:
amd64: 64-bit
386: 32-bit
darwin: macOS
linux: Tux
file_name_template: >-
{{ .ProjectName }}_
{{- .Version }}_
{{- if eq .Os "darwin" }}macos_
{{- else }}{{ .Os }}_{{ end }}
{{- if eq .Arch "amd64" }}x86_64
{{- else if eq .Arch "386" }}i386
{{- else if eq .Arch "arm64" }}aarch64
{{- else if eq .Arch "arm" }}armv{{ .Arm }}
{{- else }}{{ .Arch }}{{ end }}
homepage: https://trzsz.github.io/
maintainer: Lonny Wong <lonnywong@qq.com>
description: |-
@@ -63,10 +151,6 @@ nfpms:
formats:
- rpm
bindir: /usr/bin
overrides:
rpm:
replacements:
amd64: x86_64
rpm:
group: Unspecified
snapshot:
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Lonny Wong
Copyright (c) 2022-2024 The Trzsz Authors.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
8 changes: 4 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -27,17 +27,17 @@ GO_TEST := ${shell basename `which gotest 2>/dev/null` 2>/dev/null || echo go te

all: ${BIN_DIR}/${TRZ} ${BIN_DIR}/${TSZ} ${BIN_DIR}/${TRZSZ}

${BIN_DIR}/${TRZ}: $(wildcard ./cmd/trz/*.go ./trzsz/*.go)
${BIN_DIR}/${TRZ}: $(wildcard ./cmd/trz/*.go ./trzsz/*.go) go.mod go.sum
go build -o ${BIN_DIR}/ ./cmd/trz

${BIN_DIR}/${TSZ}: $(wildcard ./cmd/tsz/*.go ./trzsz/*.go)
${BIN_DIR}/${TSZ}: $(wildcard ./cmd/tsz/*.go ./trzsz/*.go) go.mod go.sum
go build -o ${BIN_DIR}/ ./cmd/tsz

${BIN_DIR}/${TRZSZ}: $(wildcard ./cmd/trzsz/*.go ./trzsz/*.go)
${BIN_DIR}/${TRZSZ}: $(wildcard ./cmd/trzsz/*.go ./trzsz/*.go) go.mod go.sum
go build -o ${BIN_DIR}/ ./cmd/trzsz

clean:
-rm -f ${BIN_DIR}/trz{,.exe} ${BIN_DIR}/tsz{,.exe} ${BIN_DIR}/trzsz{,.exe}
-rm -f ${BIN_DIR}/trz ${BIN_DIR}/tsz ${BIN_DIR}/trzsz ${BIN_DIR}/trz.exe ${BIN_DIR}/tsz.exe ${BIN_DIR}/trzsz.exe

test:
${GO_TEST} -v -count=1 ./trzsz
Loading