Merge branch 'old-engine'

server/web/api/utils/link.go

@@ -24,8 +24,8 @@ func ParseFile(file multipart.File) (*torrent.TorrentSpec, error) {
 		return nil, err
 	}
 
-	//	mag := minfo.Magnet(info.Name, minfo.HashInfoBytes())
-	mag := minfo.Magnet(nil, &info)
+	mag := minfo.Magnet(info.Name, minfo.HashInfoBytes())
+	//	mag := minfo.Magnet(nil, &info)
 	return &torrent.TorrentSpec{
 		InfoBytes:   minfo.InfoBytes,
 		Trackers:    [][]string{mag.Trackers},
@@ -106,8 +106,8 @@ func fromHttp(link string) (*torrent.TorrentSpec, error) {
 	if err != nil {
 		return nil, err
 	}
-	//	mag := minfo.Magnet(info.Name, minfo.HashInfoBytes())
-	mag := minfo.Magnet(nil, &info)
+	mag := minfo.Magnet(info.Name, minfo.HashInfoBytes())
+	//	mag := minfo.Magnet(nil, &info)
 
 	return &torrent.TorrentSpec{
 		InfoBytes:   minfo.InfoBytes,
@@ -130,8 +130,8 @@ func fromFile(path string) (*torrent.TorrentSpec, error) {
 		return nil, err
 	}
 
-	//	mag := minfo.Magnet(info.Name, minfo.HashInfoBytes())
-	mag := minfo.Magnet(nil, &info)
+	mag := minfo.Magnet(info.Name, minfo.HashInfoBytes())
+	//	mag := minfo.Magnet(nil, &info)
 	return &torrent.TorrentSpec{
 		InfoBytes:   minfo.InfoBytes,
 		Trackers:    [][]string{mag.Trackers},

server/web/pages/route.go

@@ -28,7 +28,8 @@ func getTorrents(c *gin.Context) {
 		mi := metainfo.MetaInfo{
 			AnnounceList: ts.Trackers,
 		}
-		mag := mi.Magnet(&ts.InfoHash, &metainfo.Info{Name: ts.DisplayName})
+		mag := mi.Magnet(ts.DisplayName, ts.InfoHash)
+		// mag := mi.Magnet(&ts.InfoHash, &metainfo.Info{Name: ts.DisplayName})
 		http += "<p><a href='" + mag.String() + "'>magnet:?xt=urn:btih:" + mag.InfoHash.HexString() + "</a></p>"
 	}
 	http += "</div>"

server/web/pages/template/html.go

@@ -118,20 +118,20 @@ var Mstile150x150png []byte
 //go:embed pages/site.webmanifest
 var Sitewebmanifest []byte
 
-//go:embed pages/static/js/2.84d4a004.chunk.js
-var Staticjs284d4a004chunkjs []byte
+//go:embed pages/static/js/2.2cf6164d.chunk.js
+var Staticjs22cf6164dchunkjs []byte
 
-//go:embed pages/static/js/2.84d4a004.chunk.js.LICENSE.txt
-var Staticjs284d4a004chunkjsLICENSEtxt []byte
+//go:embed pages/static/js/2.2cf6164d.chunk.js.LICENSE.txt
+var Staticjs22cf6164dchunkjsLICENSEtxt []byte
 
-//go:embed pages/static/js/2.84d4a004.chunk.js.map
-var Staticjs284d4a004chunkjsmap []byte
+//go:embed pages/static/js/2.2cf6164d.chunk.js.map
+var Staticjs22cf6164dchunkjsmap []byte
 
-//go:embed pages/static/js/main.cc15501f.chunk.js
-var Staticjsmaincc15501fchunkjs []byte
+//go:embed pages/static/js/main.b78fe386.chunk.js
+var Staticjsmainb78fe386chunkjs []byte
 
-//go:embed pages/static/js/main.cc15501f.chunk.js.map
-var Staticjsmaincc15501fchunkjsmap []byte
+//go:embed pages/static/js/main.b78fe386.chunk.js.map
+var Staticjsmainb78fe386chunkjsmap []byte
 
 //go:embed pages/static/js/runtime-main.64d07802.js
 var Staticjsruntimemain64d07802js []byte

server/web/pages/template/pages/asset-manifest.json

@@ -1,17 +1,17 @@
 {
   "files": {
-    "main.js": "/static/js/main.cc15501f.chunk.js",
-    "main.js.map": "/static/js/main.cc15501f.chunk.js.map",
+    "main.js": "/static/js/main.b78fe386.chunk.js",
+    "main.js.map": "/static/js/main.b78fe386.chunk.js.map",
     "runtime-main.js": "/static/js/runtime-main.64d07802.js",
     "runtime-main.js.map": "/static/js/runtime-main.64d07802.js.map",
-    "static/js/2.84d4a004.chunk.js": "/static/js/2.84d4a004.chunk.js",
-    "static/js/2.84d4a004.chunk.js.map": "/static/js/2.84d4a004.chunk.js.map",
+    "static/js/2.2cf6164d.chunk.js": "/static/js/2.2cf6164d.chunk.js",
+    "static/js/2.2cf6164d.chunk.js.map": "/static/js/2.2cf6164d.chunk.js.map",
     "index.html": "/index.html",
-    "static/js/2.84d4a004.chunk.js.LICENSE.txt": "/static/js/2.84d4a004.chunk.js.LICENSE.txt"
+    "static/js/2.2cf6164d.chunk.js.LICENSE.txt": "/static/js/2.2cf6164d.chunk.js.LICENSE.txt"
   },
   "entrypoints": [
     "static/js/runtime-main.64d07802.js",
-    "static/js/2.84d4a004.chunk.js",
-    "static/js/main.cc15501f.chunk.js"
+    "static/js/2.2cf6164d.chunk.js",
+    "static/js/main.b78fe386.chunk.js"
   ]
 }

server/web/pages/template/route.go

@@ -161,24 +161,24 @@ func RouteWebPages(route *gin.RouterGroup) {
 		c.Data(200, "application/manifest+json", Sitewebmanifest)
 	})
 
-	route.GET("/static/js/2.84d4a004.chunk.js", func(c *gin.Context) {
-		c.Data(200, "application/javascript; charset=utf-8", Staticjs284d4a004chunkjs)
+	route.GET("/static/js/2.2cf6164d.chunk.js", func(c *gin.Context) {
+		c.Data(200, "application/javascript; charset=utf-8", Staticjs22cf6164dchunkjs)
 	})
 
-	route.GET("/static/js/2.84d4a004.chunk.js.LICENSE.txt", func(c *gin.Context) {
-		c.Data(200, "text/plain; charset=utf-8", Staticjs284d4a004chunkjsLICENSEtxt)
+	route.GET("/static/js/2.2cf6164d.chunk.js.LICENSE.txt", func(c *gin.Context) {
+		c.Data(200, "text/plain; charset=utf-8", Staticjs22cf6164dchunkjsLICENSEtxt)
 	})
 
-	route.GET("/static/js/2.84d4a004.chunk.js.map", func(c *gin.Context) {
-		c.Data(200, "application/json", Staticjs284d4a004chunkjsmap)
+	route.GET("/static/js/2.2cf6164d.chunk.js.map", func(c *gin.Context) {
+		c.Data(200, "application/json", Staticjs22cf6164dchunkjsmap)
 	})
 
-	route.GET("/static/js/main.cc15501f.chunk.js", func(c *gin.Context) {
-		c.Data(200, "application/javascript; charset=utf-8", Staticjsmaincc15501fchunkjs)
+	route.GET("/static/js/main.b78fe386.chunk.js", func(c *gin.Context) {
+		c.Data(200, "application/javascript; charset=utf-8", Staticjsmainb78fe386chunkjs)
 	})
 
-	route.GET("/static/js/main.cc15501f.chunk.js.map", func(c *gin.Context) {
-		c.Data(200, "application/json", Staticjsmaincc15501fchunkjsmap)
+	route.GET("/static/js/main.b78fe386.chunk.js.map", func(c *gin.Context) {
+		c.Data(200, "application/json", Staticjsmainb78fe386chunkjsmap)
 	})
 
 	route.GET("/static/js/runtime-main.64d07802.js", func(c *gin.Context) {