mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-24 21:42:51 -05:00
core: fix golang-ci lints and add a config
This commit is contained in:
@@ -98,7 +98,7 @@ func (b *DDCBackend) probeDDCDevice(bus int) (*ddcDevice, error) {
|
||||
}
|
||||
|
||||
dummy := make([]byte, 32)
|
||||
syscall.Read(fd, dummy)
|
||||
syscall.Read(fd, dummy) //nolint:errcheck
|
||||
|
||||
writebuf := []byte{0x00}
|
||||
n, err := syscall.Write(fd, writebuf)
|
||||
|
||||
@@ -13,8 +13,7 @@ type DBusConn interface {
|
||||
}
|
||||
|
||||
type LogindBackend struct {
|
||||
conn DBusConn
|
||||
connOnce bool
|
||||
conn DBusConn
|
||||
}
|
||||
|
||||
func NewLogindBackend() (*LogindBackend, error) {
|
||||
|
||||
@@ -251,14 +251,14 @@ func (m *Manager) CreatePrinter(name, deviceURI, ppd string, shared bool, errorP
|
||||
}
|
||||
|
||||
if usedPkHelper {
|
||||
m.pkHelper.PrinterSetEnabled(name, true)
|
||||
m.pkHelper.PrinterSetAcceptJobs(name, true, "")
|
||||
m.pkHelper.PrinterSetEnabled(name, true) //nolint:errcheck
|
||||
m.pkHelper.PrinterSetAcceptJobs(name, true, "") //nolint:errcheck
|
||||
} else {
|
||||
if err := m.client.ResumePrinter(name); isAuthError(err) && m.pkHelper != nil {
|
||||
m.pkHelper.PrinterSetEnabled(name, true)
|
||||
m.pkHelper.PrinterSetEnabled(name, true) //nolint:errcheck
|
||||
}
|
||||
if err := m.client.AcceptJobs(name); isAuthError(err) && m.pkHelper != nil {
|
||||
m.pkHelper.PrinterSetAcceptJobs(name, true, "")
|
||||
m.pkHelper.PrinterSetAcceptJobs(name, true, "") //nolint:errcheck
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,8 @@ import (
|
||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs"
|
||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
|
||||
"github.com/godbus/dbus/v5"
|
||||
"golang.org/x/text/cases"
|
||||
"golang.org/x/text/language"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -118,12 +120,6 @@ func (a *SecretAgent) GetSecrets(
|
||||
log.Infof("[SecretAgent] GetSecrets called: path=%s, setting=%s, hints=%v, flags=%d",
|
||||
path, settingName, hints, flags)
|
||||
|
||||
const (
|
||||
NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION = 0x1
|
||||
NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW = 0x2
|
||||
NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED = 0x4
|
||||
)
|
||||
|
||||
connType, displayName, vpnSvc := readConnTypeAndName(conn)
|
||||
ssid := readSSID(conn)
|
||||
fields := fieldsNeeded(settingName, hints)
|
||||
@@ -378,7 +374,7 @@ func (a *SecretAgent) GetSecrets(
|
||||
}
|
||||
|
||||
if settingName == "vpn" && a.backend != nil && (vpnUsername != "" || reply.Save) {
|
||||
pw, _ := reply.Secrets["password"]
|
||||
pw := reply.Secrets["password"]
|
||||
a.backend.pendingVPNSaveMu.Lock()
|
||||
a.backend.pendingVPNSave = &pendingVPNCredentials{
|
||||
ConnectionPath: string(path),
|
||||
@@ -620,11 +616,12 @@ func vpnFieldMeta(field, vpnService string) (label string, isSecret bool) {
|
||||
case "private-key-password":
|
||||
return "Private Key Password", true
|
||||
}
|
||||
titleCaser := cases.Title(language.English)
|
||||
if strings.HasSuffix(field, "password") || strings.HasSuffix(field, "secret") ||
|
||||
strings.HasSuffix(field, "pass") || strings.HasSuffix(field, "psk") {
|
||||
return strings.Title(strings.ReplaceAll(field, "-", " ")), true
|
||||
return titleCaser.String(strings.ReplaceAll(field, "-", " ")), true
|
||||
}
|
||||
return strings.Title(strings.ReplaceAll(field, "-", " ")), false
|
||||
return titleCaser.String(strings.ReplaceAll(field, "-", " ")), false
|
||||
}
|
||||
|
||||
func readVPNPasswordFlags(conn map[string]nmVariantMap, settingName string) uint32 {
|
||||
|
||||
@@ -2,14 +2,12 @@ package network
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"sync"
|
||||
)
|
||||
|
||||
type HybridIwdNetworkdBackend struct {
|
||||
wifi *IWDBackend
|
||||
l3 *SystemdNetworkdBackend
|
||||
onStateChange func()
|
||||
stateMutex sync.RWMutex
|
||||
}
|
||||
|
||||
func NewHybridIwdNetworkdBackend(w *IWDBackend, n *SystemdNetworkdBackend) (*HybridIwdNetworkdBackend, error) {
|
||||
@@ -120,7 +118,7 @@ func (b *HybridIwdNetworkdBackend) ConnectWiFi(req ConnectionRequest) error {
|
||||
|
||||
ws, err := b.wifi.GetCurrentState()
|
||||
if err == nil && ws.WiFiDevice != "" {
|
||||
b.l3.EnsureDhcpUp(ws.WiFiDevice)
|
||||
b.l3.EnsureDhcpUp(ws.WiFiDevice) //nolint:errcheck
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
|
||||
"github.com/godbus/dbus/v5"
|
||||
)
|
||||
|
||||
@@ -159,6 +160,7 @@ func (b *IWDBackend) OnUserCanceledPrompt() {
|
||||
|
||||
if cancelledSSID != "" {
|
||||
if err := b.ForgetWiFiNetwork(cancelledSSID); err != nil {
|
||||
log.Warnf("failed to forget cancelled WiFi network %s: %v", cancelledSSID, err)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -319,7 +319,6 @@ func handleConnection(conn net.Conn) {
|
||||
capsData, _ := json.Marshal(caps)
|
||||
conn.Write(capsData)
|
||||
conn.Write([]byte("\n"))
|
||||
|
||||
scanner := bufio.NewScanner(conn)
|
||||
for scanner.Scan() {
|
||||
line := scanner.Bytes()
|
||||
|
||||
Reference in New Issue
Block a user