From 82ab7144a985e29a8e7e393de3cdd8c284646951 Mon Sep 17 00:00:00 2001 From: YouROK <8yourok8@mail.ru> Date: Mon, 17 Aug 2020 20:45:33 +0300 Subject: [PATCH] fix info --- src/server/utils/TorrentInfo.go | 33 --------------------------------- src/server/web/Torrent.go | 2 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 src/server/utils/TorrentInfo.go diff --git a/src/server/utils/TorrentInfo.go b/src/server/utils/TorrentInfo.go deleted file mode 100644 index 957c463..0000000 --- a/src/server/utils/TorrentInfo.go +++ /dev/null @@ -1,33 +0,0 @@ -package utils - -import ( - "encoding/json" - "fmt" - - "server/settings" -) - -func AddInfo(hash, js string) { - info := settings.GetInfo(hash) - if info != "{}" { - var jsset map[string]interface{} - var err error - if err = json.Unmarshal([]byte(js), &jsset); err == nil { - var jsdb map[string]interface{} - if err = json.Unmarshal([]byte(info), &jsdb); err == nil { - for k, v := range jsset { - jsdb[k] = v - } - jsstr, err := json.Marshal(jsdb) - if err == nil { - settings.AddInfo(hash, string(jsstr)) - return - } - } - } - if err != nil { - fmt.Println(err) - } - } - settings.AddInfo(hash, js) -} diff --git a/src/server/web/Torrent.go b/src/server/web/Torrent.go index c47c33a..3d7b6be 100644 --- a/src/server/web/Torrent.go +++ b/src/server/web/Torrent.go @@ -114,7 +114,7 @@ func torrentAdd(c echo.Context) error { if jreq.Info != "" { go func() { - utils.AddInfo(magnet.InfoHash.HexString(), jreq.Info) + settings.AddInfo(magnet.InfoHash.HexString(), jreq.Info) }() }