sovonegr/TorrServerJellyfin
1
0
Fork 0
mirror of https://github.com/Ernous/TorrServerJellyfin.git synced 2025-12-19 21:46:11 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
nikk gitanes
2023-03-02 05:06:50 +03:00
parent d497964b6e
commit f40cf0e17f
11 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/go.mod
View File

@@ -2,7 +2,7 @@ module server
go 1.18 go 1.18
replace github.com/anacrolix/torrent v1.48.1-0.20230214014649-2cb7121a93c7 => github.com/tsynik/torrent v1.2.8 replace github.com/anacrolix/torrent v1.48.1-0.20230301031729-c069849b4040 => github.com/tsynik/torrent v1.2.8
require ( require (
github.com/agnivade/levenshtein v1.1.1 github.com/agnivade/levenshtein v1.1.1

2
server/go.sum
View File

@@ -71,8 +71,6 @@ github.com/anacrolix/sync v0.4.0/go.mod h1:BbecHL6jDSExojhNtgTFSBcdGerzNc64tz3DC
github.com/anacrolix/tagflag v0.0.0-20180109131632-2146c8d41bf0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw= github.com/anacrolix/tagflag v0.0.0-20180109131632-2146c8d41bf0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw=
github.com/anacrolix/tagflag v1.0.0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw= github.com/anacrolix/tagflag v1.0.0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw=
github.com/anacrolix/tagflag v1.1.0/go.mod h1:Scxs9CV10NQatSmbyjqmqmeQNwGzlNe0CMUMIxqHIG8= github.com/anacrolix/tagflag v1.1.0/go.mod h1:Scxs9CV10NQatSmbyjqmqmeQNwGzlNe0CMUMIxqHIG8=
github.com/anacrolix/torrent v1.48.1-0.20230301031729-c069849b4040 h1:QJUcCAfKObrE/XVTDSzer0uhCR3iCSzFY135LInL5Bg=
github.com/anacrolix/torrent v1.48.1-0.20230301031729-c069849b4040/go.mod h1:qT3yS5oQwDUHnBXy+zf3nozLPudG7SFNDL3Jl/zQwFw=
github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96 h1:QAVZ3pN/J4/UziniAhJR2OZ9Ox5kOY2053tBbbqUPYA= github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96 h1:QAVZ3pN/J4/UziniAhJR2OZ9Ox5kOY2053tBbbqUPYA=
github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96/go.mod h1:Wa6n8cYIdaG35x15aH3Zy6d03f7P728QfdcDeD/IEOs= github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96/go.mod h1:Wa6n8cYIdaG35x15aH3Zy6d03f7P728QfdcDeD/IEOs=
github.com/anacrolix/utp v0.1.0 h1:FOpQOmIwYsnENnz7tAGohA+r6iXpRjrq8ssKSre2Cp4= github.com/anacrolix/utp v0.1.0 h1:FOpQOmIwYsnENnz7tAGohA+r6iXpRjrq8ssKSre2Cp4=

8
server/web/pages/template/html.go
View File

@@ -127,11 +127,11 @@ var Staticjs2d3f8d41dchunkjsLICENSEtxt []byte
//go:embed pages/static/js/2.d3f8d41d.chunk.js.map //go:embed pages/static/js/2.d3f8d41d.chunk.js.map
var Staticjs2d3f8d41dchunkjsmap []byte var Staticjs2d3f8d41dchunkjsmap []byte
//go:embed pages/static/js/main.e240e160.chunk.js //go:embed pages/static/js/main.8b3cda0f.chunk.js
var Staticjsmaine240e160chunkjs []byte var Staticjsmain8b3cda0fchunkjs []byte
//go:embed pages/static/js/main.e240e160.chunk.js.map //go:embed pages/static/js/main.8b3cda0f.chunk.js.map
var Staticjsmaine240e160chunkjsmap []byte var Staticjsmain8b3cda0fchunkjsmap []byte
//go:embed pages/static/js/runtime-main.64d07802.js //go:embed pages/static/js/runtime-main.64d07802.js
var Staticjsruntimemain64d07802js []byte var Staticjsruntimemain64d07802js []byte

6
server/web/pages/template/pages/asset-manifest.json
View File

@@ -1,7 +1,7 @@
{ {
"files": { "files": {
"main.js": "/static/js/main.e240e160.chunk.js", "main.js": "/static/js/main.8b3cda0f.chunk.js",
"main.js.map": "/static/js/main.e240e160.chunk.js.map", "main.js.map": "/static/js/main.8b3cda0f.chunk.js.map",
"runtime-main.js": "/static/js/runtime-main.64d07802.js", "runtime-main.js": "/static/js/runtime-main.64d07802.js",
"runtime-main.js.map": "/static/js/runtime-main.64d07802.js.map", "runtime-main.js.map": "/static/js/runtime-main.64d07802.js.map",
"static/js/2.d3f8d41d.chunk.js": "/static/js/2.d3f8d41d.chunk.js", "static/js/2.d3f8d41d.chunk.js": "/static/js/2.d3f8d41d.chunk.js",
@@ -12,6 +12,6 @@
"entrypoints": [ "entrypoints": [
"static/js/runtime-main.64d07802.js", "static/js/runtime-main.64d07802.js",
"static/js/2.d3f8d41d.chunk.js", "static/js/2.d3f8d41d.chunk.js",
"static/js/main.e240e160.chunk.js" "static/js/main.8b3cda0f.chunk.js"
] ]
} }

2
server/web/pages/template/pages/index.html
View File

File diff suppressed because one or more lines are too long

2
server/web/pages/template/pages/static/js/main.4bd54915.chunk.js
View File

File diff suppressed because one or more lines are too long

1
server/web/pages/template/pages/static/js/main.4bd54915.chunk.js.map
View File

File diff suppressed because one or more lines are too long

2
server/web/pages/template/pages/static/js/main.8b3cda0f.chunk.js Normal file
View File

File diff suppressed because one or more lines are too long

2
server/web/pages/template/pages/static/js/main.e240e160.chunk.js.map → server/web/pages/template/pages/static/js/main.8b3cda0f.chunk.js.map
View File

File diff suppressed because one or more lines are too long

2
server/web/pages/template/pages/static/js/main.e240e160.chunk.js
View File

File diff suppressed because one or more lines are too long

8
server/web/pages/template/route.go
View File

@@ -173,12 +173,12 @@ func RouteWebPages(route *gin.RouterGroup) {
c.Data(200, "application/json", Staticjs2d3f8d41dchunkjsmap) c.Data(200, "application/json", Staticjs2d3f8d41dchunkjsmap)
}) })
route.GET("/static/js/main.e240e160.chunk.js", func(c *gin.Context) { route.GET("/static/js/main.8b3cda0f.chunk.js", func(c *gin.Context) {
c.Data(200, "application/javascript; charset=utf-8", Staticjsmaine240e160chunkjs) c.Data(200, "application/javascript; charset=utf-8", Staticjsmain8b3cda0fchunkjs)
}) })
route.GET("/static/js/main.e240e160.chunk.js.map", func(c *gin.Context) { route.GET("/static/js/main.8b3cda0f.chunk.js.map", func(c *gin.Context) {
c.Data(200, "application/json", Staticjsmaine240e160chunkjsmap) c.Data(200, "application/json", Staticjsmain8b3cda0fchunkjsmap)
}) })
route.GET("/static/js/runtime-main.64d07802.js", func(c *gin.Context) { route.GET("/static/js/runtime-main.64d07802.js", func(c *gin.Context) {