LBRYCommunity/voidwalker
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases 1 Packages Wiki Activity

redirect everything to player

Browse source
This commit is contained in:
Alex Grintsvayg 2020-12-01 14:59:28 -05:00
parent 2346864c82
commit 2b3c83023e
No known key found for this signature in database
GPG key ID: AEB3F089F86A22B5
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -9,7 +9,7 @@ VERSION = $(shell git --git-dir=${DIR}/.git describe --dirty --always --long --a
LDFLAGS = -ldflags "-X ${IMPORT_PATH}/meta.Version=${VERSION} -X ${IMPORT_PATH}/meta.Time=$(shell date +%s) -w" LDFLAGS = -ldflags "-X ${IMPORT_PATH}/meta.Version=${VERSION} -X ${IMPORT_PATH}/meta.Time=$(shell date +%s) -w"
.PHONY: build clean test lint .PHONY: build clean test lint dev
.DEFAULT_GOAL: build .DEFAULT_GOAL: build
@ -24,3 +24,6 @@ test:
lint: lint:
go get github.com/alecthomas/gometalinter && gometalinter --install && gometalinter ./... go get github.com/alecthomas/gometalinter && gometalinter --install && gometalinter ./...
dev:
reflex --decoration=none --start-service=true --regex='main.go' go run .

20
main.go
View file

@ -91,7 +91,7 @@ func main() {
corsConfig.AllowOrigins = []string{"*"} corsConfig.AllowOrigins = []string{"*"}
r.Use(cors.New(corsConfig)) r.Use(cors.New(corsConfig))
r.POST("/api/claim/publish", publish) r.POST("/api/claim/publish", publish)
r.GET("/view/:id/:claimname", view) r.GET("/*url", view)
r.MaxMultipartMemory = 8 << 20 // 8 MiB r.MaxMultipartMemory = 8 << 20 // 8 MiB
r.Run(":5000") r.Run(":5000")
} }
@ -99,6 +99,23 @@ func main() {
var daemon *jsonrpc.Client var daemon *jsonrpc.Client
func view(c *gin.Context) { func view(c *gin.Context) {
url := c.Param("url")
if url == "favicon.ico" {
c.AbortWithStatus(http.StatusNotFound)
return
}
url = strings.TrimLeft(url, "/")
if url == "" {
_ = c.AbortWithError(http.StatusBadRequest, fmt.Errorf("invalid url: %s", c.Param("url")))
return
}
c.Redirect(302, "https://cdn.lbryplayer.xyz/speech/"+url)
return
}
func viewOld(c *gin.Context) {
id := c.Param("id") id := c.Param("id")
claimNameWithExt := c.Param("claimname") claimNameWithExt := c.Param("claimname")
claimName := strings.TrimSuffix(claimNameWithExt, filepath.Ext(claimNameWithExt)) claimName := strings.TrimSuffix(claimNameWithExt, filepath.Ext(claimNameWithExt))
@ -221,7 +238,6 @@ func view(c *gin.Context) {
} }
c.DataFromReader(http.StatusOK, f.Size(), contentType, reader, nil) c.DataFromReader(http.StatusOK, f.Size(), contentType, reader, nil)
return return
} }
func isFileInDir(directory, fileName string) (bool, error) { func isFileInDir(directory, fileName string) (bool, error) {