diff --git a/src/server/torr/dbwrapper.go b/src/server/torr/dbwrapper.go index 9e52575..18e5705 100644 --- a/src/server/torr/dbwrapper.go +++ b/src/server/torr/dbwrapper.go @@ -28,6 +28,7 @@ func GetTorrentDB(hash metainfo.Hash) *Torrent { torr.TorrentSpec = db.TorrentSpec torr.Title = db.Title torr.Poster = db.Poster + torr.Timestamp = db.Timestamp torr.Stat = state.TorrentInDB return torr } @@ -47,6 +48,7 @@ func ListTorrentsDB() map[metainfo.Hash]*Torrent { torr.TorrentSpec = db.TorrentSpec torr.Title = db.Title torr.Poster = db.Poster + torr.Timestamp = db.Timestamp torr.Stat = state.TorrentInDB ret[torr.TorrentSpec.InfoHash] = torr } diff --git a/src/server/web/pages/route.go b/src/server/web/pages/route.go index 47543c3..17f04d6 100644 --- a/src/server/web/pages/route.go +++ b/src/server/web/pages/route.go @@ -12,6 +12,6 @@ func SetupRoute(route *gin.Engine) { temp = template.InitTemplate(route) route.GET("/", mainPage) - route.GET("/api.js", apijsPage) - route.GET("/main.js", mainjsPage) + // route.GET("/api.js", apijsPage) + // route.GET("/main.js", mainjsPage) } diff --git a/src/server/web/pages/template/mainPage.go b/src/server/web/pages/template/mainPage.go index 62c45cb..e8639f4 100644 --- a/src/server/web/pages/template/mainPage.go +++ b/src/server/web/pages/template/mainPage.go @@ -12,22 +12,8 @@ const mainPage = ` ` + header + ` -
- - - - - -Please click a menu item
-You chose {{active}}
- + +TorrServer ` + version.Version + `
diff --git a/src/server/web/pages/template/template.go b/src/server/web/pages/template/template.go index c9162ad..5c9bc6f 100644 --- a/src/server/web/pages/template/template.go +++ b/src/server/web/pages/template/template.go @@ -8,24 +8,6 @@ import ( var ctx *gin.Engine -// -// func InitTemplate(route *gin.Engine) { -// ctx = route -// -// tmpl := getTemplate("favicon", faviconB64) -// tmpl = getTemplate("header", header) -// -// route.SetHTMLTemplate(tmpl) -// } -// -// func getTemplate(name, body string) *template.Template { -// tmpl, err := template.New(name).ParseFiles(body) -// if err != nil { -// log.TLogln("error parse template", err) -// } -// return tmpl -// } - type Template struct { templates *template.Template } @@ -34,8 +16,8 @@ func InitTemplate(c *gin.Engine) *Template { temp := new(Template) temp.parsePage("mainPage", mainPage) - temp.parsePage("apijsPage", apiJS) - temp.parsePage("mainjsPage", mainJS) + // temp.parsePage("apijsPage", apiJS) + // temp.parsePage("mainjsPage", mainJS) c.SetHTMLTemplate(temp.templates) return temp