From c9829910f2ccaf6d1eda23dabd4eb89898c73987 Mon Sep 17 00:00:00 2001 From: DeepSource Bot Date: Sat, 1 May 2021 19:27:35 +0000 Subject: [PATCH 1/5] Add .deepsource.toml --- .deepsource.toml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .deepsource.toml diff --git a/.deepsource.toml b/.deepsource.toml new file mode 100644 index 0000000..40e1814 --- /dev/null +++ b/.deepsource.toml @@ -0,0 +1,15 @@ +version = 1 + +[[analyzers]] +name = "go" +enabled = true + + [analyzers.meta] + import_root = "github.com/Charroja/TorrServer" + +[[analyzers]] +name = "javascript" +enabled = true + + [analyzers.meta] + plugins = ["react"] From fd0223f2eadcbd2bee7c4e8df85b4cbcb5b63b7e Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Sat, 1 May 2021 19:31:32 +0000 Subject: [PATCH 2/5] Omit redundant control flow --- server/settings/db.go | 5 ++--- server/web/api/stream.go | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server/settings/db.go b/server/settings/db.go index 137bbc5..d914ef8 100644 --- a/server/settings/db.go +++ b/server/settings/db.go @@ -4,8 +4,9 @@ import ( "path/filepath" "strings" - bolt "go.etcd.io/bbolt" "server/log" + + bolt "go.etcd.io/bbolt" ) type TDB struct { @@ -99,7 +100,6 @@ func (v *TDB) Set(xpath, name string, value []byte) { log.TLogln("value:", value) } - return } func (v *TDB) List(xpath string) []string { @@ -173,5 +173,4 @@ func (v *TDB) Rem(xpath, name string) { log.TLogln("Error rem sets", xpath+"/"+name, ", error:", err) } - return } diff --git a/server/web/api/stream.go b/server/web/api/stream.go index ff3226c..9c5f39e 100644 --- a/server/web/api/stream.go +++ b/server/web/api/stream.go @@ -211,5 +211,5 @@ func streamNoAuth(c *gin.Context) { } c.Header("WWW-Authenticate", "Basic realm=Authorization Required") c.AbortWithStatus(http.StatusUnauthorized) - return + } From 99fa7301cb35762d157e4b5c64668c3f7b8efcf6 Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 19:40:36 +0000 Subject: [PATCH 3/5] Remove unnecessary guard around `delete` --- server/torr/storage/torrstor/cache.go | 4 +--- server/torr/torrent.go | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/server/torr/storage/torrstor/cache.go b/server/torr/storage/torrstor/cache.go index 07a8418..4d929ec 100644 --- a/server/torr/storage/torrstor/cache.go +++ b/server/torr/storage/torrstor/cache.go @@ -80,9 +80,7 @@ func (c *Cache) Piece(m metainfo.Piece) storage.PieceImpl { func (c *Cache) Close() error { log.TLogln("Close cache for:", c.hash) - if _, ok := c.storage.caches[c.hash]; ok { - delete(c.storage.caches, c.hash) - } + delete(c.storage.caches, c.hash) c.pieces = nil c.muReaders.Lock() diff --git a/server/torr/torrent.go b/server/torr/torrent.go index 11ac52a..27f8eeb 100644 --- a/server/torr/torrent.go +++ b/server/torr/torrent.go @@ -359,9 +359,7 @@ func (t *Torrent) Close() { t.Stat = state.TorrentClosed t.bt.mu.Lock() - if _, ok := t.bt.torrents[t.Hash()]; ok { - delete(t.bt.torrents, t.Hash()) - } + delete(t.bt.torrents, t.Hash()) t.bt.mu.Unlock() t.drop() From 2d1e6936239cfff920ae39033013a2a3aba4ca08 Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 19:42:35 +0000 Subject: [PATCH 4/5] Fix useless trapping of signal --- server/cmd/preconfig_pos.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/cmd/preconfig_pos.go b/server/cmd/preconfig_pos.go index aea3c80..a0be9fc 100644 --- a/server/cmd/preconfig_pos.go +++ b/server/cmd/preconfig_pos.go @@ -15,7 +15,7 @@ func Preconfig(dkill bool) { signal.Notify(sigc, syscall.SIGHUP, syscall.SIGINT, - syscall.SIGSTOP, + syscall.SIGPIPE, syscall.SIGTERM, syscall.SIGQUIT) From 74bd3627b4f1f8e97865b72705a758a5938b7edb Mon Sep 17 00:00:00 2001 From: Charroja <83505626+Charroja@users.noreply.github.com> Date: Mon, 3 May 2021 22:44:59 +0300 Subject: [PATCH 5/5] Delete .deepsource.toml --- .deepsource.toml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .deepsource.toml diff --git a/.deepsource.toml b/.deepsource.toml deleted file mode 100644 index 40e1814..0000000 --- a/.deepsource.toml +++ /dev/null @@ -1,15 +0,0 @@ -version = 1 - -[[analyzers]] -name = "go" -enabled = true - - [analyzers.meta] - import_root = "github.com/Charroja/TorrServer" - -[[analyzers]] -name = "javascript" -enabled = true - - [analyzers.meta] - plugins = ["react"]