Merge branch 'main' into unstable

Notifiarr · Jul 19, 2024 · fdf7d0f · fdf7d0f
2 parents 3831858 + 36bd026
commit fdf7d0f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -29,7 +29,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mrobinsn/go-rtorrent v1.8.0
 	github.com/nxadm/tail v1.4.11
-	github.com/shirou/gopsutil/v4 v4.24.6
+	github.com/shirou/gopsutil/v4 v4.24.7-0.20240719055159-262afcf2e6b1
 	github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
 	github.com/stretchr/testify v1.9.0
 	github.com/swaggo/swag v1.16.3

diff --git a/go.sum b/go.sum
@@ -228,8 +228,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
-github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64=
-github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA=
+github.com/shirou/gopsutil/v4 v4.24.7-0.20240719055159-262afcf2e6b1 h1:33UxpaYMcNRVbqDrS2M5GXN6Qw+LLGnoLsHiHN0EPnY=
+github.com/shirou/gopsutil/v4 v4.24.7-0.20240719055159-262afcf2e6b1/go.mod h1:0uW/073rP7FYLOkvxolUQM5rMOLTNmRXnFKafpb71rw=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=

diff --git a/init/systemd/notifiarr.service b/init/systemd/notifiarr.service
@@ -8,7 +8,6 @@ Requires=network.target
 [Service]
 Environment=DN_LOG_FILE=/var/log/notifiarr/app.log
 Environment=DN_HTTP_LOG=/var/log/notifiarr/http.log
-Environment=DN_DEBUG_LOG=/var/log/notifiarr/debug.log
 Environment=DN_SERVICES_LOG_FILE=/var/log/notifiarr/services.log
 Environment=DN_QUIET=true
 ExecStart=/usr/bin/notifiarr $DAEMON_OPTS

diff --git a/pkg/apps/apppkg/sabnzbd/sabnzbd.go b/pkg/apps/apppkg/sabnzbd/sabnzbd.go
@@ -1,6 +1,7 @@
 package sabnzbd
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -115,12 +116,12 @@ type HistorySlots struct {
 	Retry        Bool        `json:"retry"`
 }
 
-// Bool exists because once upon a time sab changed the retry value from bool to int.
+// Bool exists because once upon a time sab changed the retry value from int to bool.
 // https://github.com/sabnzbd/sabnzbd/issues/2911
 type Bool bool
 
 func (f *Bool) UnmarshalJSON(b []byte) error {
-	txt := strings.Trim(string(b), `"`)
+	txt := string(bytes.Trim(b, `"`))
 	*f = Bool(txt == "true" || (txt != "0" && txt != "false"))
 
 	return nil