diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 7ec9229..4a9d102 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -26,12 +26,12 @@ jobs: - name: Install Go uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: - go-version: 1.23.x + go-version: 1.24.x - name: Create empty resource directory run: | mkdir -p static && touch static/.gitkeep - name: Lint - uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1 + uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0 with: args: --verbose - version: v1.62.0 + version: v2.0.2 diff --git a/fuse.go b/fuse.go index ea50bfd..19f144f 100644 --- a/fuse.go +++ b/fuse.go @@ -37,7 +37,7 @@ func (f *WebRTCStreamFile) Getattr(ctx context.Context, fh fs.FileHandle, out *f f.mu.Lock() defer f.mu.Unlock() out.Attr = f.Attr - out.Attr.Size = f.size + out.Size = f.size return fs.OK } diff --git a/jsonrpc.go b/jsonrpc.go index f6fad45..d35f635 100644 --- a/jsonrpc.go +++ b/jsonrpc.go @@ -659,7 +659,7 @@ func rpcSetActiveExtension(extensionId string) error { if config.ActiveExtension == extensionId { return nil } - switch extensionId { + switch config.ActiveExtension { case "atx-power": _ = unmountATXControl() case "dc-power": diff --git a/usb_mass_storage.go b/usb_mass_storage.go index f868769..79a05d1 100644 --- a/usb_mass_storage.go +++ b/usb_mass_storage.go @@ -68,6 +68,10 @@ func mountImage(imagePath string) error { if err != nil { return fmt.Errorf("set mass storage image error: %w", err) } + err = setMassStorageImage(imagePath) + if err != nil { + return fmt.Errorf("set Mass Storage Image Error: %w", err) + } return nil } @@ -476,10 +480,7 @@ func handleUploadChannel(d *webrtc.DataChannel) { } totalBytesWritten += int64(bytesWritten) - sendProgress := false //nolint:staticcheck - if time.Since(lastProgressTime) >= 200*time.Millisecond { - sendProgress = true - } + sendProgress := time.Since(lastProgressTime) >= 200*time.Millisecond if totalBytesWritten >= pendingUpload.Size { sendProgress = true close(uploadComplete) diff --git a/web_tls.go b/web_tls.go index 2514702..564f150 100644 --- a/web_tls.go +++ b/web_tls.go @@ -171,7 +171,7 @@ func runWebSecureServer() { go func() { for range stopTLS { - websecureLogger.Info().Msg("shutting down websecure server") + websecureLogger.Info().Msg("Shutting down websecure server") err := server.Shutdown(context.Background()) if err != nil { websecureLogger.Error().Err(err).Msg("failed to shutdown websecure server") @@ -203,7 +203,7 @@ func startWebSecureServer() { func RunWebSecureServer() { for range startTLS { - websecureLogger.Info().Msg("starting websecure server, as we have received a start signal") + websecureLogger.Info().Msg("Starting websecure server, as we have received a start signal") if certStore == nil { initCertStore() }