From 97ce7850565935a21daa4528c8fadb9e9880aea1 Mon Sep 17 00:00:00 2001
From: SuperQ <superq@gmail.com>
Date: Tue, 11 Mar 2025 18:28:32 +0100
Subject: [PATCH] Fix more linter issues.

Signed-off-by: SuperQ <superq@gmail.com>
---
 config.go           |  3 ++-
 jiggler.go          |  4 ----
 jsonrpc.go          |  3 ++-
 log.go              |  1 -
 native.go           |  1 -
 usb.go              |  6 +-----
 usb_mass_storage.go | 11 ++++-------
 7 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/config.go b/config.go
index cfd7f5f..642f113 100644
--- a/config.go
+++ b/config.go
@@ -3,9 +3,10 @@ package kvm
 import (
 	"encoding/json"
 	"fmt"
-	"kvm/internal/usbgadget"
 	"os"
 	"sync"
+
+	"github.com/jetkvm/kvm/internal/usbgadget"
 )
 
 type WakeOnLanDevice struct {
diff --git a/jiggler.go b/jiggler.go
index 11ce313..daec192 100644
--- a/jiggler.go
+++ b/jiggler.go
@@ -6,10 +6,6 @@ import (
 
 var lastUserInput = time.Now()
 
-func resetUserInputTime() {
-	lastUserInput = time.Now()
-}
-
 var jigglerEnabled = false
 
 func rpcSetJigglerState(enabled bool) {
diff --git a/jsonrpc.go b/jsonrpc.go
index 48ea0d4..298a810 100644
--- a/jsonrpc.go
+++ b/jsonrpc.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"kvm/internal/usbgadget"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -15,6 +14,8 @@ import (
 
 	"github.com/pion/webrtc/v4"
 	"go.bug.st/serial"
+
+	"github.com/jetkvm/kvm/internal/usbgadget"
 )
 
 type JSONRPCRequest struct {
diff --git a/log.go b/log.go
index dbc5f03..7718a28 100644
--- a/log.go
+++ b/log.go
@@ -5,5 +5,4 @@ import "github.com/pion/logging"
 // we use logging framework from pion
 // ref: https://github.com/pion/webrtc/wiki/Debugging-WebRTC
 var logger = logging.NewDefaultLoggerFactory().NewLogger("jetkvm")
-var usbLogger = logging.NewDefaultLoggerFactory().NewLogger("usb")
 var cloudLogger = logging.NewDefaultLoggerFactory().NewLogger("cloud")
diff --git a/native.go b/native.go
index 5ad4b77..8960304 100644
--- a/native.go
+++ b/native.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"kvm/resource"
 	"net"
 	"os"
 	"os/exec"
diff --git a/usb.go b/usb.go
index 6a3c2c3..8da6737 100644
--- a/usb.go
+++ b/usb.go
@@ -1,7 +1,7 @@
 package kvm
 
 import (
-	"kvm/internal/usbgadget"
+	"github.com/jetkvm/kvm/internal/usbgadget"
 	"time"
 )
 
@@ -37,10 +37,6 @@ func rpcWheelReport(wheelY int8) error {
 	return gadget.AbsMouseWheelReport(wheelY)
 }
 
-func rpcRelMouseReport(mx, my int8, buttons uint8) error {
-	return gadget.RelMouseReport(mx, my, buttons)
-}
-
 var usbState = "unknown"
 
 func rpcGetUSBState() (state string) {
diff --git a/usb_mass_storage.go b/usb_mass_storage.go
index 39e6dd9..a09a670 100644
--- a/usb_mass_storage.go
+++ b/usb_mass_storage.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"kvm/resource"
 	"net/http"
 	"os"
 	"path"
@@ -16,14 +15,12 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-
 	"github.com/psanford/httpreadat"
-
 	"github.com/google/uuid"
 	"github.com/pion/webrtc/v4"
-)
 
-const massStorageName = "mass_storage.usb0"
+	"github.com/jetkvm/kvm/resource"
+)
 
 func writeFile(path string, data string) error {
 	return os.WriteFile(path, []byte(data), 0644)
@@ -65,11 +62,11 @@ func onDiskMessage(msg webrtc.DataChannelMessage) {
 func mountImage(imagePath string) error {
 	err := setMassStorageImage("")
 	if err != nil {
-		return fmt.Errorf("Remove Mass Storage Image Error", err)
+		return fmt.Errorf("Remove Mass Storage Image Error: %w", err)
 	}
 	err = setMassStorageImage(imagePath)
 	if err != nil {
-		return fmt.Errorf("Set Mass Storage Image Error", err)
+		return fmt.Errorf("Set Mass Storage Image Error: %w", err)
 	}
 	return nil
 }