Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
ec0e76d041 | |||
f480df1e1b |
@ -45,8 +45,6 @@ module.exports = {
|
|||||||
|
|
||||||
// Map from global var to bool specifying if it can be redefined
|
// Map from global var to bool specifying if it can be redefined
|
||||||
globals: {
|
globals: {
|
||||||
File: true,
|
|
||||||
FileList: true,
|
|
||||||
jest: true,
|
jest: true,
|
||||||
__DEV__: true,
|
__DEV__: true,
|
||||||
__dirname: false,
|
__dirname: false,
|
||||||
@ -99,7 +97,6 @@ module.exports = {
|
|||||||
rules: {
|
rules: {
|
||||||
"@typescript-eslint/no-explicit-any": "error",
|
"@typescript-eslint/no-explicit-any": "error",
|
||||||
"@typescript-eslint/explicit-function-return-type": "error",
|
"@typescript-eslint/explicit-function-return-type": "error",
|
||||||
"@typescript-eslint/no-shadow": "warn",
|
|
||||||
|
|
||||||
// General
|
// General
|
||||||
'comma-dangle': [1, 'never'], // allow or disallow trailing commas
|
'comma-dangle': [1, 'never'], // allow or disallow trailing commas
|
||||||
@ -185,7 +182,7 @@ module.exports = {
|
|||||||
'no-catch-shadow': 1, // disallow the catch clause parameter name being the same as a variable in the outer scope (off by default in the node environment)
|
'no-catch-shadow': 1, // disallow the catch clause parameter name being the same as a variable in the outer scope (off by default in the node environment)
|
||||||
'no-delete-var': 1, // disallow deletion of variables
|
'no-delete-var': 1, // disallow deletion of variables
|
||||||
'no-label-var': 1, // disallow labels that share a name with a variable
|
'no-label-var': 1, // disallow labels that share a name with a variable
|
||||||
// 'no-shadow': 1, // disallow declaration of variables already declared in the outer scope
|
'no-shadow': 1, // disallow declaration of variables already declared in the outer scope
|
||||||
'no-shadow-restricted-names': 1, // disallow shadowing of names such as arguments
|
'no-shadow-restricted-names': 1, // disallow shadowing of names such as arguments
|
||||||
'no-undef': 2, // disallow use of undeclared variables unless mentioned in a /*global */ block
|
'no-undef': 2, // disallow use of undeclared variables unless mentioned in a /*global */ block
|
||||||
'no-undefined': 0, // disallow use of undefined variable (off by default)
|
'no-undefined': 0, // disallow use of undefined variable (off by default)
|
||||||
|
@ -25,11 +25,11 @@ Minimize_Frontend:
|
|||||||
- node_modules/
|
- node_modules/
|
||||||
|
|
||||||
Build_Backend:
|
Build_Backend:
|
||||||
image: luki42/go-ffmpeg:latest
|
image: golang:latest
|
||||||
stage: build_backend
|
stage: build_backend
|
||||||
script:
|
script:
|
||||||
- cd apiGo
|
- cd apiGo
|
||||||
- go build -v -tags sharedffmpeg -o openmediacenter
|
- go build -v -o openmediacenter
|
||||||
- cp -r ../build/ ./static/
|
- cp -r ../build/ ./static/
|
||||||
- go build -v -tags static -o openmediacenter_full
|
- go build -v -tags static -o openmediacenter_full
|
||||||
- env GOOS=windows GOARCH=amd64 go build -v -tags static -o openmediacenter.exe
|
- env GOOS=windows GOARCH=amd64 go build -v -tags static -o openmediacenter.exe
|
||||||
@ -62,7 +62,7 @@ Backend_Tests:
|
|||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- cd apiGo
|
- cd apiGo
|
||||||
- go install github.com/jstemmer/go-junit-report@v0.9.1
|
- go get -u github.com/jstemmer/go-junit-report
|
||||||
- go test -v ./... 2>&1 | go-junit-report -set-exit-code > report.xml
|
- go test -v ./... 2>&1 | go-junit-report -set-exit-code > report.xml
|
||||||
needs: []
|
needs: []
|
||||||
artifacts:
|
artifacts:
|
||||||
@ -93,9 +93,11 @@ Debian_Server:
|
|||||||
- vers=$(grep -Po '"version":.*?[^\\]",' package.json | grep -Po '[0-9]+\.[0-9]+\.[0-9]+') # parse the version out of package .json
|
- vers=$(grep -Po '"version":.*?[^\\]",' package.json | grep -Po '[0-9]+\.[0-9]+\.[0-9]+') # parse the version out of package .json
|
||||||
- cd deb
|
- cd deb
|
||||||
- mkdir -p "./OpenMediaCenter/var/www/openmediacenter/videos/"
|
- mkdir -p "./OpenMediaCenter/var/www/openmediacenter/videos/"
|
||||||
|
- mkdir -p "./OpenMediaCenter/tmp/"
|
||||||
- mkdir -p "./OpenMediaCenter/usr/bin/"
|
- mkdir -p "./OpenMediaCenter/usr/bin/"
|
||||||
- cp -r ../build/* ./OpenMediaCenter/var/www/openmediacenter/
|
- cp -r ../build/* ./OpenMediaCenter/var/www/openmediacenter/
|
||||||
- cp ../apiGo/openmediacenter ./OpenMediaCenter/usr/bin/
|
- cp ../apiGo/openmediacenter ./OpenMediaCenter/usr/bin/
|
||||||
|
- cp ../database.sql ./OpenMediaCenter/tmp/openmediacenter.sql
|
||||||
- 'echo "Version: ${vers}" >> ./OpenMediaCenter/DEBIAN/control'
|
- 'echo "Version: ${vers}" >> ./OpenMediaCenter/DEBIAN/control'
|
||||||
- chmod -R 0775 *
|
- chmod -R 0775 *
|
||||||
- dpkg-deb --build OpenMediaCenter
|
- dpkg-deb --build OpenMediaCenter
|
||||||
@ -108,13 +110,15 @@ Debian_Server:
|
|||||||
- Minimize_Frontend
|
- Minimize_Frontend
|
||||||
- Build_Backend
|
- Build_Backend
|
||||||
|
|
||||||
.Test_Server_Common:
|
Test_Server:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
image: luki42/ssh:latest
|
image: luki42/ssh:latest
|
||||||
needs:
|
needs:
|
||||||
- Frontend_Tests
|
- Frontend_Tests
|
||||||
- Backend_Tests
|
- Backend_Tests
|
||||||
- Debian_Server
|
- Debian_Server
|
||||||
|
only:
|
||||||
|
- master
|
||||||
script:
|
script:
|
||||||
- eval $(ssh-agent -s)
|
- eval $(ssh-agent -s)
|
||||||
- echo "$SSH_PRIVATE_KEY" | ssh-add -
|
- echo "$SSH_PRIVATE_KEY" | ssh-add -
|
||||||
@ -124,38 +128,3 @@ Debian_Server:
|
|||||||
- ssh root@192.168.0.42 "DEBIAN_FRONTEND=noninteractive apt-get --reinstall -y -qq install /tmp/OpenMediaCenter-*.deb && rm /tmp/OpenMediaCenter-*.deb"
|
- ssh root@192.168.0.42 "DEBIAN_FRONTEND=noninteractive apt-get --reinstall -y -qq install /tmp/OpenMediaCenter-*.deb && rm /tmp/OpenMediaCenter-*.deb"
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
|
||||||
Test_Server_CD:
|
|
||||||
extends: .Test_Server_Common
|
|
||||||
only:
|
|
||||||
refs:
|
|
||||||
- master
|
|
||||||
|
|
||||||
Test_Server_MANUAL:
|
|
||||||
extends: .Test_Server_Common
|
|
||||||
when: manual
|
|
||||||
|
|
||||||
.Test_Server_2_Common:
|
|
||||||
stage: deploy
|
|
||||||
image: luki42/ssh:latest
|
|
||||||
needs:
|
|
||||||
- Frontend_Tests
|
|
||||||
- Backend_Tests
|
|
||||||
- Debian_Server
|
|
||||||
script:
|
|
||||||
- eval $(ssh-agent -s)
|
|
||||||
- echo "$SSH_PRIVATE_KEY_2" | ssh-add -
|
|
||||||
- mkdir -p ~/.ssh
|
|
||||||
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
|
|
||||||
- scp deb/OpenMediaCenter-*.deb root@192.168.0.44:/tmp/
|
|
||||||
- ssh root@192.168.0.44 "DEBIAN_FRONTEND=noninteractive apt-get --reinstall -y -qq install /tmp/OpenMediaCenter-*.deb && rm /tmp/OpenMediaCenter-*.deb"
|
|
||||||
allow_failure: true
|
|
||||||
|
|
||||||
Test_Server_2_CD:
|
|
||||||
extends: .Test_Server_2_Common
|
|
||||||
only:
|
|
||||||
refs:
|
|
||||||
- master
|
|
||||||
|
|
||||||
Test_Server_2_MANUAL:
|
|
||||||
extends: .Test_Server_2_Common
|
|
||||||
when: manual
|
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
package api
|
|
||||||
|
|
||||||
func AddHandlers() {
|
|
||||||
addVideoHandlers()
|
|
||||||
addSettingsHandlers()
|
|
||||||
addTagHandlers()
|
|
||||||
addActorsHandlers()
|
|
||||||
addTvshowHandlers()
|
|
||||||
addUploadHandler()
|
|
||||||
}
|
|
@ -2,12 +2,11 @@ package api
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"openmediacenter/apiGo/api/api"
|
|
||||||
"openmediacenter/apiGo/api/types"
|
"openmediacenter/apiGo/api/types"
|
||||||
"openmediacenter/apiGo/database"
|
"openmediacenter/apiGo/database"
|
||||||
)
|
)
|
||||||
|
|
||||||
func addActorsHandlers() {
|
func AddActorsHandlers() {
|
||||||
saveActorsToDB()
|
saveActorsToDB()
|
||||||
getActorsFromDB()
|
getActorsFromDB()
|
||||||
}
|
}
|
||||||
@ -24,9 +23,9 @@ func getActorsFromDB() {
|
|||||||
* @apiSuccess {string} .Name Actor Name
|
* @apiSuccess {string} .Name Actor Name
|
||||||
* @apiSuccess {string} .Thumbnail Portrait Thumbnail
|
* @apiSuccess {string} .Thumbnail Portrait Thumbnail
|
||||||
*/
|
*/
|
||||||
api.AddHandler("getAllActors", api.ActorNode, api.PermUser, func(context api.Context) {
|
AddHandler("getAllActors", ActorNode, func(info *HandlerInfo) []byte {
|
||||||
query := "SELECT actor_id, name, thumbnail FROM actors ORDER BY name ASC"
|
query := "SELECT actor_id, name, thumbnail FROM actors"
|
||||||
context.Json(readActorsFromResultset(database.Query(query)))
|
return jsonify(readActorsFromResultset(database.Query(query)))
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -42,21 +41,20 @@ func getActorsFromDB() {
|
|||||||
* @apiSuccess {string} .Name Actor Name
|
* @apiSuccess {string} .Name Actor Name
|
||||||
* @apiSuccess {string} .Thumbnail Portrait Thumbnail
|
* @apiSuccess {string} .Thumbnail Portrait Thumbnail
|
||||||
*/
|
*/
|
||||||
api.AddHandler("getActorsOfVideo", api.ActorNode, api.PermUser, func(context api.Context) {
|
AddHandler("getActorsOfVideo", ActorNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
MovieId int
|
MovieId int
|
||||||
}
|
}
|
||||||
err := api.DecodeRequest(context.GetRequest(), &args)
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
if err != nil {
|
fmt.Println(err.Error())
|
||||||
context.Text("failed to decode request")
|
return nil
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
query := fmt.Sprintf(`SELECT a.actor_id, name, thumbnail FROM actors_videos
|
query := fmt.Sprintf(`SELECT a.actor_id, name, thumbnail FROM actors_videos
|
||||||
JOIN actors a on actors_videos.actor_id = a.actor_id
|
JOIN actors a on actors_videos.actor_id = a.actor_id
|
||||||
WHERE actors_videos.video_id=%d`, args.MovieId)
|
WHERE actors_videos.video_id=%d`, args.MovieId)
|
||||||
|
|
||||||
context.Json(readActorsFromResultset(database.Query(query)))
|
return jsonify(readActorsFromResultset(database.Query(query)))
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -76,15 +74,13 @@ func getActorsFromDB() {
|
|||||||
* @apiSuccess {string} Info.Name Actor Name
|
* @apiSuccess {string} Info.Name Actor Name
|
||||||
* @apiSuccess {string} Info.Thumbnail Actor Thumbnail
|
* @apiSuccess {string} Info.Thumbnail Actor Thumbnail
|
||||||
*/
|
*/
|
||||||
api.AddHandler("getActorInfo", api.ActorNode, api.PermUser, func(context api.Context) {
|
AddHandler("getActorInfo", ActorNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
ActorId int
|
ActorId int
|
||||||
}
|
}
|
||||||
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
err := api.DecodeRequest(context.GetRequest(), &args)
|
fmt.Println(err.Error())
|
||||||
if err != nil {
|
return nil
|
||||||
context.Error("unable to decode request")
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
query := fmt.Sprintf(`SELECT movie_id, movie_name FROM actors_videos
|
query := fmt.Sprintf(`SELECT movie_id, movie_name FROM actors_videos
|
||||||
@ -103,7 +99,7 @@ func getActorsFromDB() {
|
|||||||
Info: actor,
|
Info: actor,
|
||||||
}
|
}
|
||||||
|
|
||||||
context.Json(result)
|
return jsonify(result)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,17 +112,19 @@ func saveActorsToDB() {
|
|||||||
*
|
*
|
||||||
* @apiParam {string} ActorName Name of new Actor
|
* @apiParam {string} ActorName Name of new Actor
|
||||||
*
|
*
|
||||||
* @apiSuccess {string} result 'success' if successfully or Error message if not
|
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||||
*/
|
*/
|
||||||
api.AddHandler("createActor", api.ActorNode, api.PermUser, func(context api.Context) {
|
AddHandler("createActor", ActorNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
ActorName string
|
ActorName string
|
||||||
}
|
}
|
||||||
api.DecodeRequest(context.GetRequest(), &args)
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
|
fmt.Println(err.Error())
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
query := "INSERT IGNORE INTO actors (name) VALUES (?)"
|
query := "INSERT IGNORE INTO actors (name) VALUES (?)"
|
||||||
// todo bit ugly
|
return database.SuccessQuery(query, args.ActorName)
|
||||||
context.Text(string(database.SuccessQuery(query, args.ActorName)))
|
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -138,20 +136,19 @@ func saveActorsToDB() {
|
|||||||
* @apiParam {int} ActorId Id of Actor
|
* @apiParam {int} ActorId Id of Actor
|
||||||
* @apiParam {int} MovieId Id of Movie to add to
|
* @apiParam {int} MovieId Id of Movie to add to
|
||||||
*
|
*
|
||||||
* @apiSuccess {string} result 'success' if successfully or Error message if not
|
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||||
*/
|
*/
|
||||||
api.AddHandler("addActorToVideo", api.ActorNode, api.PermUser, func(context api.Context) {
|
AddHandler("addActorToVideo", ActorNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
ActorId int
|
ActorId int
|
||||||
MovieId int
|
MovieId int
|
||||||
}
|
}
|
||||||
err := api.DecodeRequest(context.GetRequest(), &args)
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
if err != nil {
|
fmt.Println(err.Error())
|
||||||
context.Error("unable to decode request")
|
return nil
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
query := fmt.Sprintf("INSERT IGNORE INTO actors_videos (actor_id, video_id) VALUES (%d,%d)", args.ActorId, args.MovieId)
|
query := fmt.Sprintf("INSERT IGNORE INTO actors_videos (actor_id, video_id) VALUES (%d,%d)", args.ActorId, args.MovieId)
|
||||||
context.Text(string(database.SuccessQuery(query)))
|
return database.SuccessQuery(query)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
121
apiGo/api/ApiBase.go
Normal file
121
apiGo/api/ApiBase.go
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"gopkg.in/oauth2.v3"
|
||||||
|
"net/http"
|
||||||
|
"openmediacenter/apiGo/api/oauth"
|
||||||
|
"openmediacenter/apiGo/database/settings"
|
||||||
|
)
|
||||||
|
|
||||||
|
const APIPREFIX = "/api"
|
||||||
|
|
||||||
|
const (
|
||||||
|
VideoNode = iota
|
||||||
|
TagNode = iota
|
||||||
|
SettingsNode = iota
|
||||||
|
ActorNode = iota
|
||||||
|
TVShowNode = iota
|
||||||
|
PhotoNode = iota
|
||||||
|
)
|
||||||
|
|
||||||
|
type HandlerInfo struct {
|
||||||
|
ID string
|
||||||
|
Token string
|
||||||
|
Data map[string]interface{}
|
||||||
|
}
|
||||||
|
|
||||||
|
type actionStruct struct {
|
||||||
|
Action string
|
||||||
|
}
|
||||||
|
|
||||||
|
type Handler struct {
|
||||||
|
action string
|
||||||
|
handler func(info *HandlerInfo) []byte
|
||||||
|
apiNode int
|
||||||
|
}
|
||||||
|
|
||||||
|
var handlers = make(map[string]Handler)
|
||||||
|
|
||||||
|
func AddHandler(action string, apiNode int, h func(info *HandlerInfo) []byte) {
|
||||||
|
// append new handler to the handlers
|
||||||
|
handlers[fmt.Sprintf("%s/%d", action, apiNode)] = Handler{action, h, apiNode}
|
||||||
|
}
|
||||||
|
|
||||||
|
func ServerInit() {
|
||||||
|
http.Handle(APIPREFIX+"/video", oauth.ValidateToken(handlefunc, VideoNode))
|
||||||
|
http.Handle(APIPREFIX+"/tags", oauth.ValidateToken(handlefunc, TagNode))
|
||||||
|
http.Handle(APIPREFIX+"/settings", oauth.ValidateToken(handlefunc, SettingsNode))
|
||||||
|
http.Handle(APIPREFIX+"/actor", oauth.ValidateToken(handlefunc, ActorNode))
|
||||||
|
|
||||||
|
// add tvshow endpoint only if tvshows enabled
|
||||||
|
if settings.TVShowsEnabled() {
|
||||||
|
http.Handle(APIPREFIX+"/tvshow", oauth.ValidateToken(handlefunc, TVShowNode))
|
||||||
|
}
|
||||||
|
|
||||||
|
http.Handle(APIPREFIX+"/photos", oauth.ValidateToken(handlefunc, PhotoNode))
|
||||||
|
|
||||||
|
// initialize oauth service and add corresponding auth routes
|
||||||
|
oauth.InitOAuth()
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleAPICall(action string, requestBody string, apiNode int, info *HandlerInfo) []byte {
|
||||||
|
handler, ok := handlers[fmt.Sprintf("%s/%d", action, apiNode)]
|
||||||
|
if !ok {
|
||||||
|
// handler doesn't exist!
|
||||||
|
fmt.Printf("no handler found for Action: %d/%s\n", apiNode, action)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if info even exists
|
||||||
|
if info == nil {
|
||||||
|
info = &HandlerInfo{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// parse the arguments
|
||||||
|
var args map[string]interface{}
|
||||||
|
err := json.Unmarshal([]byte(requestBody), &args)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("failed to decode arguments of action %s :: %s\n", action, requestBody)
|
||||||
|
} else {
|
||||||
|
// check if map has an action
|
||||||
|
if _, ok := args["action"]; ok {
|
||||||
|
delete(args, "action")
|
||||||
|
}
|
||||||
|
|
||||||
|
info.Data = args
|
||||||
|
}
|
||||||
|
|
||||||
|
// call the handler
|
||||||
|
return handler.handler(info)
|
||||||
|
}
|
||||||
|
|
||||||
|
func handlefunc(rw http.ResponseWriter, req *http.Request, node int, tokenInfo *oauth2.TokenInfo) {
|
||||||
|
// only allow post requests
|
||||||
|
if req.Method != "POST" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
buf := new(bytes.Buffer)
|
||||||
|
buf.ReadFrom(req.Body)
|
||||||
|
body := buf.String()
|
||||||
|
|
||||||
|
var t actionStruct
|
||||||
|
err := json.Unmarshal([]byte(body), &t)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println("failed to read action from request! :: " + body)
|
||||||
|
}
|
||||||
|
|
||||||
|
// load userid from received token object
|
||||||
|
id := (*tokenInfo).GetClientID()
|
||||||
|
|
||||||
|
userinfo := &HandlerInfo{
|
||||||
|
ID: id,
|
||||||
|
Token: (*tokenInfo).GetCode(),
|
||||||
|
}
|
||||||
|
|
||||||
|
rw.Write(handleAPICall(t.Action, body, node, userinfo))
|
||||||
|
}
|
72
apiGo/api/ApiBase_test.go
Normal file
72
apiGo/api/ApiBase_test.go
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func cleanUp() {
|
||||||
|
handlers = make(map[string]Handler)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAddHandler(t *testing.T) {
|
||||||
|
cleanUp()
|
||||||
|
|
||||||
|
AddHandler("test", ActorNode, func(info *HandlerInfo) []byte {
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
if len(handlers) != 1 {
|
||||||
|
t.Errorf("Handler insertion failed, got: %d handlers, want: %d.", len(handlers), 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCallOfHandler(t *testing.T) {
|
||||||
|
cleanUp()
|
||||||
|
|
||||||
|
i := 0
|
||||||
|
AddHandler("test", ActorNode, func(info *HandlerInfo) []byte {
|
||||||
|
i++
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
|
||||||
|
// simulate the call of the api
|
||||||
|
handleAPICall("test", "", ActorNode, nil)
|
||||||
|
|
||||||
|
if i != 1 {
|
||||||
|
t.Errorf("Unexpected number of Lambda calls : %d/1", i)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDecodingOfArguments(t *testing.T) {
|
||||||
|
cleanUp()
|
||||||
|
|
||||||
|
AddHandler("test", ActorNode, func(info *HandlerInfo) []byte {
|
||||||
|
var args struct {
|
||||||
|
Test string
|
||||||
|
TestInt int
|
||||||
|
}
|
||||||
|
err := FillStruct(&args, info.Data)
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Error parsing args: %s", err.Error())
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if args.TestInt != 42 || args.Test != "myString" {
|
||||||
|
t.Errorf("Wrong parsing of argument parameters : %d/42 - %s/myString", args.TestInt, args.Test)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
|
||||||
|
// simulate the call of the api
|
||||||
|
handleAPICall("test", `{"Test":"myString","TestInt":42}`, ActorNode, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNoHandlerCovers(t *testing.T) {
|
||||||
|
cleanUp()
|
||||||
|
|
||||||
|
ret := handleAPICall("test", "", ActorNode, nil)
|
||||||
|
|
||||||
|
if ret != nil {
|
||||||
|
t.Error("Expect nil return within unhandled api action")
|
||||||
|
}
|
||||||
|
}
|
@ -1,69 +0,0 @@
|
|||||||
package api
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"openmediacenter/apiGo/api/api"
|
|
||||||
"openmediacenter/apiGo/database"
|
|
||||||
"openmediacenter/apiGo/videoparser"
|
|
||||||
"os"
|
|
||||||
)
|
|
||||||
|
|
||||||
func addUploadHandler() {
|
|
||||||
api.AddHandler("fileupload", api.VideoNode, api.PermUser, func(ctx api.Context) {
|
|
||||||
// get path where to store videos to
|
|
||||||
mSettings, PathPrefix, _ := database.GetSettings()
|
|
||||||
|
|
||||||
req := ctx.GetRequest()
|
|
||||||
|
|
||||||
mr, err := req.MultipartReader()
|
|
||||||
if err != nil {
|
|
||||||
ctx.Errorf("incorrect request!")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
videoparser.InitDeps(&mSettings)
|
|
||||||
|
|
||||||
for {
|
|
||||||
part, err := mr.NextPart()
|
|
||||||
if err == io.EOF {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
// only allow valid extensions
|
|
||||||
if !videoparser.ValidVideoSuffix(part.FileName()) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
vidpath := PathPrefix + mSettings.VideoPath + part.FileName()
|
|
||||||
dst, err := os.OpenFile(vidpath, os.O_WRONLY|os.O_CREATE, 0644)
|
|
||||||
if err != nil {
|
|
||||||
ctx.Error("error opening file")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Printf("Uploading file %s\n", part.FileName())
|
|
||||||
|
|
||||||
// so now loop through every appended file and upload
|
|
||||||
buffer := make([]byte, 100000)
|
|
||||||
for {
|
|
||||||
cBytes, err := part.Read(buffer)
|
|
||||||
if cBytes > 0 {
|
|
||||||
dst.Write(buffer[0:cBytes])
|
|
||||||
}
|
|
||||||
|
|
||||||
if err == io.EOF {
|
|
||||||
fmt.Printf("Finished uploading file %s\n", part.FileName())
|
|
||||||
go videoparser.ProcessVideo(part.FileName())
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
_ = dst.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx.Json(struct {
|
|
||||||
Message string
|
|
||||||
}{Message: "finished all files"})
|
|
||||||
})
|
|
||||||
}
|
|
@ -2,8 +2,10 @@ package api
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"openmediacenter/apiGo/api/types"
|
"openmediacenter/apiGo/api/types"
|
||||||
|
"reflect"
|
||||||
)
|
)
|
||||||
|
|
||||||
// MovieId - MovieName : pay attention to the order!
|
// MovieId - MovieName : pay attention to the order!
|
||||||
@ -13,8 +15,7 @@ func readVideosFromResultset(rows *sql.Rows) []types.VideoUnloadedType {
|
|||||||
var vid types.VideoUnloadedType
|
var vid types.VideoUnloadedType
|
||||||
err := rows.Scan(&vid.MovieId, &vid.MovieName)
|
err := rows.Scan(&vid.MovieId, &vid.MovieName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err.Error())
|
panic(err.Error()) // proper error handling instead of panic in your app
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
result = append(result, vid)
|
result = append(result, vid)
|
||||||
}
|
}
|
||||||
@ -31,7 +32,7 @@ func readTagsFromResultset(rows *sql.Rows) []types.Tag {
|
|||||||
var tag types.Tag
|
var tag types.Tag
|
||||||
err := rows.Scan(&tag.TagId, &tag.TagName)
|
err := rows.Scan(&tag.TagId, &tag.TagName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err.Error()) // proper Error handling instead of panic in your app
|
panic(err.Error()) // proper error handling instead of panic in your app
|
||||||
}
|
}
|
||||||
result = append(result, tag)
|
result = append(result, tag)
|
||||||
}
|
}
|
||||||
@ -52,7 +53,7 @@ func readActorsFromResultset(rows *sql.Rows) []types.Actor {
|
|||||||
actor.Thumbnail = string(thumbnail)
|
actor.Thumbnail = string(thumbnail)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err.Error()) // proper Error handling instead of panic in your app
|
panic(err.Error()) // proper error handling instead of panic in your app
|
||||||
}
|
}
|
||||||
result = append(result, actor)
|
result = append(result, actor)
|
||||||
}
|
}
|
||||||
@ -68,7 +69,7 @@ func readTVshowsFromResultset(rows *sql.Rows) []types.TVShow {
|
|||||||
var vid types.TVShow
|
var vid types.TVShow
|
||||||
err := rows.Scan(&vid.Id, &vid.Name)
|
err := rows.Scan(&vid.Id, &vid.Name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err.Error()) // proper Error handling instead of panic in your app
|
panic(err.Error()) // proper error handling instead of panic in your app
|
||||||
}
|
}
|
||||||
result = append(result, vid)
|
result = append(result, vid)
|
||||||
}
|
}
|
||||||
@ -76,3 +77,54 @@ func readTVshowsFromResultset(rows *sql.Rows) []types.TVShow {
|
|||||||
|
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func jsonify(v interface{}) []byte {
|
||||||
|
// jsonify results
|
||||||
|
str, err := json.Marshal(v)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println("Error while Jsonifying return object: " + err.Error())
|
||||||
|
}
|
||||||
|
return str
|
||||||
|
}
|
||||||
|
|
||||||
|
// setField set a specific field of an object with an object provided
|
||||||
|
func setField(obj interface{}, name string, value interface{}) error {
|
||||||
|
structValue := reflect.ValueOf(obj).Elem()
|
||||||
|
structFieldValue := structValue.FieldByName(name)
|
||||||
|
|
||||||
|
if !structFieldValue.IsValid() {
|
||||||
|
return fmt.Errorf("no such field: %s in obj", name)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !structFieldValue.CanSet() {
|
||||||
|
return fmt.Errorf("cannot set %s field value", name)
|
||||||
|
}
|
||||||
|
|
||||||
|
structFieldType := structFieldValue.Type()
|
||||||
|
val := reflect.ValueOf(value)
|
||||||
|
|
||||||
|
if structFieldType != val.Type() {
|
||||||
|
if val.Type().ConvertibleTo(structFieldType) {
|
||||||
|
// if type is convertible - convert and set
|
||||||
|
structFieldValue.Set(val.Convert(structFieldType))
|
||||||
|
} else {
|
||||||
|
return fmt.Errorf("provided value %s type didn't match obj field type and isn't convertible", name)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// set value if type is the same
|
||||||
|
structFieldValue.Set(val)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// FillStruct fill a custom struct with objects of a map
|
||||||
|
func FillStruct(i interface{}, m map[string]interface{}) error {
|
||||||
|
for k, v := range m {
|
||||||
|
err := setField(i, k, v)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
15
apiGo/api/Photos.go
Normal file
15
apiGo/api/Photos.go
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
func AddPhotoHandlers() {
|
||||||
|
/**
|
||||||
|
* @api {post} /api/photos [getPhotos]
|
||||||
|
* @apiDescription get all available pictures
|
||||||
|
* @apiName getPhotos
|
||||||
|
* @apiGroup Photos
|
||||||
|
*
|
||||||
|
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||||
|
*/
|
||||||
|
AddHandler("getPhotos", PhotoNode, func(info *HandlerInfo) []byte {
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}
|
@ -1,9 +1,9 @@
|
|||||||
package api
|
package api
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"openmediacenter/apiGo/api/api"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
"openmediacenter/apiGo/api/types"
|
"openmediacenter/apiGo/api/types"
|
||||||
"openmediacenter/apiGo/config"
|
|
||||||
"openmediacenter/apiGo/database"
|
"openmediacenter/apiGo/database"
|
||||||
"openmediacenter/apiGo/database/settings"
|
"openmediacenter/apiGo/database/settings"
|
||||||
"openmediacenter/apiGo/videoparser"
|
"openmediacenter/apiGo/videoparser"
|
||||||
@ -11,7 +11,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
func addSettingsHandlers() {
|
func AddSettingsHandlers() {
|
||||||
saveSettingsToDB()
|
saveSettingsToDB()
|
||||||
getSettingsFromDB()
|
getSettingsFromDB()
|
||||||
reIndexHandling()
|
reIndexHandling()
|
||||||
@ -37,7 +37,7 @@ func getSettingsFromDB() {
|
|||||||
* @apiSuccess {uint32} Sizes.DifferentTags number of different tags available
|
* @apiSuccess {uint32} Sizes.DifferentTags number of different tags available
|
||||||
* @apiSuccess {uint32} Sizes.TagsAdded number of different tags added to videos
|
* @apiSuccess {uint32} Sizes.TagsAdded number of different tags added to videos
|
||||||
*/
|
*/
|
||||||
api.AddHandler("loadGeneralSettings", api.SettingsNode, api.PermUser, func(context api.Context) {
|
AddHandler("loadGeneralSettings", SettingsNode, func(info *HandlerInfo) []byte {
|
||||||
result, _, sizes := database.GetSettings()
|
result, _, sizes := database.GetSettings()
|
||||||
|
|
||||||
var ret = struct {
|
var ret = struct {
|
||||||
@ -47,7 +47,7 @@ func getSettingsFromDB() {
|
|||||||
Settings: &result,
|
Settings: &result,
|
||||||
Sizes: &sizes,
|
Sizes: &sizes,
|
||||||
}
|
}
|
||||||
context.Json(ret)
|
return jsonify(ret)
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -63,7 +63,7 @@ func getSettingsFromDB() {
|
|||||||
* @apiSuccess {bool} DarkMode Darkmode enabled?
|
* @apiSuccess {bool} DarkMode Darkmode enabled?
|
||||||
* @apiSuccess {bool} TVShowEnabled is are TVShows enabled
|
* @apiSuccess {bool} TVShowEnabled is are TVShows enabled
|
||||||
*/
|
*/
|
||||||
api.AddHandler("loadInitialData", api.SettingsNode, api.PermUser, func(context api.Context) {
|
AddHandler("loadInitialData", SettingsNode, func(info *HandlerInfo) []byte {
|
||||||
sett := settings.LoadSettings()
|
sett := settings.LoadSettings()
|
||||||
|
|
||||||
type InitialDataTypeResponse struct {
|
type InitialDataTypeResponse struct {
|
||||||
@ -73,7 +73,6 @@ func getSettingsFromDB() {
|
|||||||
VideoPath string
|
VideoPath string
|
||||||
TVShowPath string
|
TVShowPath string
|
||||||
TVShowEnabled bool
|
TVShowEnabled bool
|
||||||
FullDeleteEnabled bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
regexMatchUrl := regexp.MustCompile("^http(|s)://([0-9]){1,3}\\.([0-9]){1,3}\\.([0-9]){1,3}\\.([0-9]){1,3}:[0-9]{1,5}")
|
regexMatchUrl := regexp.MustCompile("^http(|s)://([0-9]){1,3}\\.([0-9]){1,3}\\.([0-9]){1,3}\\.([0-9]){1,3}:[0-9]{1,5}")
|
||||||
@ -88,11 +87,11 @@ func getSettingsFromDB() {
|
|||||||
MediacenterName: sett.MediacenterName,
|
MediacenterName: sett.MediacenterName,
|
||||||
VideoPath: serverVideoPath,
|
VideoPath: serverVideoPath,
|
||||||
TVShowPath: serverTVShowPath,
|
TVShowPath: serverTVShowPath,
|
||||||
TVShowEnabled: !config.GetConfig().Features.DisableTVSupport,
|
TVShowEnabled: settings.TVShowsEnabled(),
|
||||||
FullDeleteEnabled: config.GetConfig().Features.FullyDeletableVideos,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
context.Json(res)
|
str, _ := json.Marshal(res)
|
||||||
|
return str
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -110,14 +109,13 @@ func saveSettingsToDB() {
|
|||||||
* @apiParam {bool} TMDBGrabbing TMDB grabbing support to grab tag info and thumbnails
|
* @apiParam {bool} TMDBGrabbing TMDB grabbing support to grab tag info and thumbnails
|
||||||
* @apiParam {bool} DarkMode Darkmode enabled?
|
* @apiParam {bool} DarkMode Darkmode enabled?
|
||||||
*
|
*
|
||||||
* @apiSuccess {string} result 'success' if successfully or Error message if not
|
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||||
*/
|
*/
|
||||||
api.AddHandler("saveGeneralSettings", api.SettingsNode, api.PermUser, func(context api.Context) {
|
AddHandler("saveGeneralSettings", SettingsNode, func(info *HandlerInfo) []byte {
|
||||||
var args types.SettingsType
|
var args types.SettingsType
|
||||||
err := api.DecodeRequest(context.GetRequest(), &args)
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
if err != nil {
|
fmt.Println(err.Error())
|
||||||
context.Error("unable to decode arguments")
|
return nil
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
query := `
|
query := `
|
||||||
@ -129,10 +127,9 @@ func saveSettingsToDB() {
|
|||||||
TMDB_grabbing=?,
|
TMDB_grabbing=?,
|
||||||
DarkMode=?
|
DarkMode=?
|
||||||
WHERE 1`
|
WHERE 1`
|
||||||
// todo avoid conversion
|
return database.SuccessQuery(query,
|
||||||
context.Text(string(database.SuccessQuery(query,
|
|
||||||
args.VideoPath, args.EpisodePath, args.Password,
|
args.VideoPath, args.EpisodePath, args.Password,
|
||||||
args.MediacenterName, args.TMDBGrabbing, args.DarkMode)))
|
args.MediacenterName, args.TMDBGrabbing, args.DarkMode)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -144,11 +141,11 @@ func reIndexHandling() {
|
|||||||
* @apiName startReindex
|
* @apiName startReindex
|
||||||
* @apiGroup Settings
|
* @apiGroup Settings
|
||||||
*
|
*
|
||||||
* @apiSuccess {string} result 'success' if successfully or Error message if not
|
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||||
*/
|
*/
|
||||||
api.AddHandler("startReindex", api.SettingsNode, api.PermUser, func(context api.Context) {
|
AddHandler("startReindex", SettingsNode, func(info *HandlerInfo) []byte {
|
||||||
videoparser.StartReindex()
|
videoparser.StartReindex()
|
||||||
context.Text(string(database.ManualSuccessResponse(nil)))
|
return database.ManualSuccessResponse(nil)
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -157,11 +154,11 @@ func reIndexHandling() {
|
|||||||
* @apiName startTVShowReindex
|
* @apiName startTVShowReindex
|
||||||
* @apiGroup Settings
|
* @apiGroup Settings
|
||||||
*
|
*
|
||||||
* @apiSuccess {string} result 'success' if successfully or Error message if not
|
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||||
*/
|
*/
|
||||||
api.AddHandler("startTVShowReindex", api.SettingsNode, api.PermUser, func(context api.Context) {
|
AddHandler("startTVShowReindex", SettingsNode, func(info *HandlerInfo) []byte {
|
||||||
videoparser.StartTVShowReindex()
|
videoparser.StartTVShowReindex()
|
||||||
context.Text(string(database.ManualSuccessResponse(nil)))
|
return database.ManualSuccessResponse(nil)
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -170,7 +167,8 @@ func reIndexHandling() {
|
|||||||
* @apiName cleanupGravity
|
* @apiName cleanupGravity
|
||||||
* @apiGroup Settings
|
* @apiGroup Settings
|
||||||
*/
|
*/
|
||||||
api.AddHandler("cleanupGravity", api.SettingsNode, api.PermUser, func(context api.Context) {
|
AddHandler("cleanupGravity", SettingsNode, func(info *HandlerInfo) []byte {
|
||||||
videoparser.StartCleanup()
|
videoparser.StartCleanup()
|
||||||
|
return nil
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -2,14 +2,13 @@ package api
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"openmediacenter/apiGo/api/api"
|
|
||||||
"openmediacenter/apiGo/config"
|
|
||||||
"openmediacenter/apiGo/database"
|
"openmediacenter/apiGo/database"
|
||||||
|
"openmediacenter/apiGo/database/settings"
|
||||||
)
|
)
|
||||||
|
|
||||||
func addTvshowHandlers() {
|
func AddTvshowHandlers() {
|
||||||
// do not add handlers if tvshows not enabled
|
// do not add handlers if tvshows not enabled
|
||||||
if config.GetConfig().Features.DisableTVSupport {
|
if !settings.TVShowsEnabled() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -23,10 +22,10 @@ func addTvshowHandlers() {
|
|||||||
* @apiSuccess {uint32} .Id tvshow id
|
* @apiSuccess {uint32} .Id tvshow id
|
||||||
* @apiSuccess {string} .Name tvshow name
|
* @apiSuccess {string} .Name tvshow name
|
||||||
*/
|
*/
|
||||||
api.AddHandler("getTVShows", api.TVShowNode, api.PermUser, func(context api.Context) {
|
AddHandler("getTVShows", TVShowNode, func(info *HandlerInfo) []byte {
|
||||||
query := "SELECT id, name FROM tvshow"
|
query := "SELECT id, name FROM tvshow"
|
||||||
rows := database.Query(query)
|
rows := database.Query(query)
|
||||||
context.Json(readTVshowsFromResultset(rows))
|
return jsonify(readTVshowsFromResultset(rows))
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -43,14 +42,13 @@ func addTvshowHandlers() {
|
|||||||
* @apiSuccess {uint8} .Season Season number
|
* @apiSuccess {uint8} .Season Season number
|
||||||
* @apiSuccess {uint8} .Episode Episode number
|
* @apiSuccess {uint8} .Episode Episode number
|
||||||
*/
|
*/
|
||||||
api.AddHandler("getEpisodes", api.TVShowNode, api.PermUser, func(context api.Context) {
|
AddHandler("getEpisodes", TVShowNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
ShowID uint32
|
ShowID uint32
|
||||||
}
|
}
|
||||||
err := api.DecodeRequest(context.GetRequest(), &args)
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
if err != nil {
|
fmt.Println(err.Error())
|
||||||
context.Text("unable to decode request")
|
return nil
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
query := fmt.Sprintf("SELECT id, name, season, episode FROM tvshow_episodes WHERE tvshow_id=%d", args.ShowID)
|
query := fmt.Sprintf("SELECT id, name, season, episode FROM tvshow_episodes WHERE tvshow_id=%d", args.ShowID)
|
||||||
@ -75,7 +73,7 @@ func addTvshowHandlers() {
|
|||||||
episodes = append(episodes, ep)
|
episodes = append(episodes, ep)
|
||||||
}
|
}
|
||||||
|
|
||||||
context.Json(episodes)
|
return jsonify(episodes)
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -92,14 +90,13 @@ func addTvshowHandlers() {
|
|||||||
* @apiSuccess {uint8} Episode Episode number
|
* @apiSuccess {uint8} Episode Episode number
|
||||||
* @apiSuccess {string} Path webserver path of video file
|
* @apiSuccess {string} Path webserver path of video file
|
||||||
*/
|
*/
|
||||||
api.AddHandler("loadEpisode", api.TVShowNode, api.PermUser, func(context api.Context) {
|
AddHandler("loadEpisode", TVShowNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
ID uint32
|
ID uint32
|
||||||
}
|
}
|
||||||
err := api.DecodeRequest(context.GetRequest(), &args)
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
if err != nil {
|
fmt.Println(err.Error())
|
||||||
context.Text("unable to decode argument")
|
return nil
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
query := fmt.Sprintf(`
|
query := fmt.Sprintf(`
|
||||||
@ -119,16 +116,15 @@ WHERE tvshow_episodes.id=%d`, args.ID)
|
|||||||
var filename string
|
var filename string
|
||||||
var foldername string
|
var foldername string
|
||||||
|
|
||||||
err = row.Scan(&ret.Name, &ret.Season, &ret.TVShowID, &ret.Episode, &filename, &foldername)
|
err := row.Scan(&ret.Name, &ret.Season, &ret.TVShowID, &ret.Episode, &filename, &foldername)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err.Error())
|
fmt.Println(err.Error())
|
||||||
context.Error(err.Error())
|
return nil
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ret.Path = foldername + "/" + filename
|
ret.Path = foldername + "/" + filename
|
||||||
|
|
||||||
context.Json(ret)
|
return jsonify(ret)
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -141,26 +137,25 @@ WHERE tvshow_episodes.id=%d`, args.ID)
|
|||||||
*
|
*
|
||||||
* @apiSuccess {string} . Base64 encoded Thubnail
|
* @apiSuccess {string} . Base64 encoded Thubnail
|
||||||
*/
|
*/
|
||||||
api.AddHandler("readThumbnail", api.TVShowNode, api.PermUser, func(context api.Context) {
|
AddHandler("readThumbnail", TVShowNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
Id int
|
Id int
|
||||||
}
|
}
|
||||||
err := api.DecodeRequest(context.GetRequest(), &args)
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
if err != nil {
|
fmt.Println(err.Error())
|
||||||
context.Text("unable to decode request")
|
return nil
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var pic []byte
|
var pic []byte
|
||||||
|
|
||||||
query := fmt.Sprintf("SELECT thumbnail FROM tvshow WHERE id=%d", args.Id)
|
query := fmt.Sprintf("SELECT thumbnail FROM tvshow WHERE id=%d", args.Id)
|
||||||
|
|
||||||
err = database.QueryRow(query).Scan(&pic)
|
err := database.QueryRow(query).Scan(&pic)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("the thumbnail of movie id %d couldn't be found", args.Id)
|
fmt.Printf("the thumbnail of movie id %d couldn't be found", args.Id)
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
context.Text(string(pic))
|
return pic
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -2,12 +2,11 @@ package api
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"openmediacenter/apiGo/api/api"
|
|
||||||
"openmediacenter/apiGo/database"
|
"openmediacenter/apiGo/database"
|
||||||
"regexp"
|
"regexp"
|
||||||
)
|
)
|
||||||
|
|
||||||
func addTagHandlers() {
|
func AddTagHandlers() {
|
||||||
getFromDB()
|
getFromDB()
|
||||||
addToDB()
|
addToDB()
|
||||||
deleteFromDB()
|
deleteFromDB()
|
||||||
@ -23,17 +22,16 @@ func deleteFromDB() {
|
|||||||
* @apiParam {bool} [Force] force delete tag with its constraints
|
* @apiParam {bool} [Force] force delete tag with its constraints
|
||||||
* @apiParam {int} TagId id of tag to delete
|
* @apiParam {int} TagId id of tag to delete
|
||||||
*
|
*
|
||||||
* @apiSuccess {string} result 'success' if successfully or Error message if not
|
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||||
*/
|
*/
|
||||||
api.AddHandler("deleteTag", api.TagNode, api.PermUser, func(context api.Context) {
|
AddHandler("deleteTag", TagNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
TagId int
|
TagId int
|
||||||
Force bool
|
Force bool
|
||||||
}
|
}
|
||||||
err := api.DecodeRequest(context.GetRequest(), &args)
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
if err != nil {
|
fmt.Println(err.Error())
|
||||||
context.Text("unable to decode request")
|
return nil
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// delete key constraints first
|
// delete key constraints first
|
||||||
@ -43,24 +41,23 @@ func deleteFromDB() {
|
|||||||
|
|
||||||
// respond only if result not successful
|
// respond only if result not successful
|
||||||
if err != nil {
|
if err != nil {
|
||||||
context.Text(string(database.ManualSuccessResponse(err)))
|
return database.ManualSuccessResponse(err)
|
||||||
return
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
query := fmt.Sprintf("DELETE FROM tags WHERE tag_id=%d", args.TagId)
|
query := fmt.Sprintf("DELETE FROM tags WHERE tag_id=%d", args.TagId)
|
||||||
err = database.Edit(query)
|
err := database.Edit(query)
|
||||||
|
|
||||||
if err == nil {
|
if err == nil {
|
||||||
// return if successful
|
// return if successful
|
||||||
context.Text(string(database.ManualSuccessResponse(err)))
|
return database.ManualSuccessResponse(err)
|
||||||
} else {
|
} else {
|
||||||
// check with regex if its the key constraint Error
|
// check with regex if its the key constraint error
|
||||||
r := regexp.MustCompile("^.*a foreign key constraint fails.*$")
|
r := regexp.MustCompile("^.*a foreign key constraint fails.*$")
|
||||||
if r.MatchString(err.Error()) {
|
if r.MatchString(err.Error()) {
|
||||||
context.Text(string(database.ManualSuccessResponse(fmt.Errorf("not empty tag"))))
|
return database.ManualSuccessResponse(fmt.Errorf("not empty tag"))
|
||||||
} else {
|
} else {
|
||||||
context.Text(string(database.ManualSuccessResponse(err)))
|
return database.ManualSuccessResponse(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -77,9 +74,9 @@ func getFromDB() {
|
|||||||
* @apiSuccess {uint32} TagId
|
* @apiSuccess {uint32} TagId
|
||||||
* @apiSuccess {string} TagName name of the Tag
|
* @apiSuccess {string} TagName name of the Tag
|
||||||
*/
|
*/
|
||||||
api.AddHandler("getAllTags", api.TagNode, api.PermUser, func(context api.Context) {
|
AddHandler("getAllTags", TagNode, func(info *HandlerInfo) []byte {
|
||||||
query := "SELECT tag_id,tag_name from tags ORDER BY tag_name ASC"
|
query := "SELECT tag_id,tag_name from tags"
|
||||||
context.Json(readTagsFromResultset(database.Query(query)))
|
return jsonify(readTagsFromResultset(database.Query(query)))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -92,20 +89,19 @@ func addToDB() {
|
|||||||
*
|
*
|
||||||
* @apiParam {string} TagName name of the tag
|
* @apiParam {string} TagName name of the tag
|
||||||
*
|
*
|
||||||
* @apiSuccess {string} result 'success' if successfully or Error message if not
|
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||||
*/
|
*/
|
||||||
api.AddHandler("createTag", api.TagNode, api.PermUser, func(context api.Context) {
|
AddHandler("createTag", TagNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
TagName string
|
TagName string
|
||||||
}
|
}
|
||||||
err := api.DecodeRequest(context.GetRequest(), &args)
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
if err != nil {
|
fmt.Println(err.Error())
|
||||||
context.Text("unable to decode request")
|
return nil
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
query := "INSERT IGNORE INTO tags (tag_name) VALUES (?)"
|
query := "INSERT IGNORE INTO tags (tag_name) VALUES (?)"
|
||||||
context.Text(string(database.SuccessQuery(query, args.TagName)))
|
return database.SuccessQuery(query, args.TagName)
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -117,20 +113,19 @@ func addToDB() {
|
|||||||
* @apiParam {int} TagId Tag id to add to video
|
* @apiParam {int} TagId Tag id to add to video
|
||||||
* @apiParam {int} MovieId Video Id of video to add tag to
|
* @apiParam {int} MovieId Video Id of video to add tag to
|
||||||
*
|
*
|
||||||
* @apiSuccess {string} result 'success' if successfully or Error message if not
|
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||||
*/
|
*/
|
||||||
api.AddHandler("addTag", api.TagNode, api.PermUser, func(context api.Context) {
|
AddHandler("addTag", TagNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
MovieId int
|
MovieId int
|
||||||
TagId int
|
TagId int
|
||||||
}
|
}
|
||||||
err := api.DecodeRequest(context.GetRequest(), &args)
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
if err != nil {
|
fmt.Println(err.Error())
|
||||||
context.Text("unable to decode request")
|
return nil
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
query := "INSERT IGNORE INTO video_tags(tag_id, video_id) VALUES (?,?)"
|
query := "INSERT IGNORE INTO video_tags(tag_id, video_id) VALUES (?,?)"
|
||||||
context.Text(string(database.SuccessQuery(query, args.TagId, args.MovieId)))
|
return database.SuccessQuery(query, args.TagId, args.MovieId)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -4,16 +4,12 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/url"
|
"net/url"
|
||||||
"openmediacenter/apiGo/api/api"
|
|
||||||
"openmediacenter/apiGo/api/types"
|
"openmediacenter/apiGo/api/types"
|
||||||
"openmediacenter/apiGo/config"
|
|
||||||
"openmediacenter/apiGo/database"
|
"openmediacenter/apiGo/database"
|
||||||
"os"
|
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func addVideoHandlers() {
|
func AddVideoHandlers() {
|
||||||
getVideoHandlers()
|
getVideoHandlers()
|
||||||
loadVideosHandlers()
|
loadVideosHandlers()
|
||||||
addToVideoHandlers()
|
addToVideoHandlers()
|
||||||
@ -33,15 +29,14 @@ func getVideoHandlers() {
|
|||||||
* @apiSuccess {String} Videos.MovieName Name of video
|
* @apiSuccess {String} Videos.MovieName Name of video
|
||||||
* @apiSuccess {String} TagName Name of the Tag returned
|
* @apiSuccess {String} TagName Name of the Tag returned
|
||||||
*/
|
*/
|
||||||
api.AddHandler("getMovies", api.VideoNode, api.PermUser, func(context api.Context) {
|
AddHandler("getMovies", VideoNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
Tag uint32
|
Tag uint32
|
||||||
Sort uint8
|
Sort uint8
|
||||||
}
|
}
|
||||||
err := api.DecodeRequest(context.GetRequest(), &args)
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
if err != nil {
|
fmt.Println(err.Error())
|
||||||
context.Text("unable to decode request")
|
return nil
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -49,11 +44,9 @@ func getVideoHandlers() {
|
|||||||
likes = iota
|
likes = iota
|
||||||
random = iota
|
random = iota
|
||||||
names = iota
|
names = iota
|
||||||
length = iota
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// if wrong number passed no sorting is performed
|
var SortClause string
|
||||||
var SortClause = ""
|
|
||||||
switch args.Sort {
|
switch args.Sort {
|
||||||
case date:
|
case date:
|
||||||
SortClause = "ORDER BY create_date DESC, movie_name"
|
SortClause = "ORDER BY create_date DESC, movie_name"
|
||||||
@ -67,20 +60,17 @@ func getVideoHandlers() {
|
|||||||
case names:
|
case names:
|
||||||
SortClause = "ORDER BY movie_name"
|
SortClause = "ORDER BY movie_name"
|
||||||
break
|
break
|
||||||
case length:
|
|
||||||
SortClause = "ORDER BY length DESC"
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var query string
|
var query string
|
||||||
// 1 is the id of the ALL tag
|
// 1 is the id of the ALL tag
|
||||||
if args.Tag != 1 {
|
if args.Tag != 1 {
|
||||||
query = fmt.Sprintf(`SELECT movie_id,movie_name,previewratio,t.tag_name FROM videos
|
query = fmt.Sprintf(`SELECT movie_id,movie_name,t.tag_name FROM videos
|
||||||
INNER JOIN video_tags vt on videos.movie_id = vt.video_id
|
INNER JOIN video_tags vt on videos.movie_id = vt.video_id
|
||||||
INNER JOIN tags t on vt.tag_id = t.tag_id
|
INNER JOIN tags t on vt.tag_id = t.tag_id
|
||||||
WHERE t.tag_id = %d %s`, args.Tag, SortClause)
|
WHERE t.tag_id = %d %s`, args.Tag, SortClause)
|
||||||
} else {
|
} else {
|
||||||
query = fmt.Sprintf("SELECT movie_id,movie_name,previewratio, (SELECT 'All' as tag_name) FROM videos %s", SortClause)
|
query = fmt.Sprintf("SELECT movie_id,movie_name, (SELECT 'All' as tag_name) FROM videos %s", SortClause)
|
||||||
}
|
}
|
||||||
|
|
||||||
var result struct {
|
var result struct {
|
||||||
@ -93,24 +83,26 @@ func getVideoHandlers() {
|
|||||||
var name string
|
var name string
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var vid types.VideoUnloadedType
|
var vid types.VideoUnloadedType
|
||||||
err := rows.Scan(&vid.MovieId, &vid.MovieName, &vid.Ratio, &name)
|
err := rows.Scan(&vid.MovieId, &vid.MovieName, &name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
vids = append(vids, vid)
|
vids = append(vids, vid)
|
||||||
}
|
}
|
||||||
if rows.Close() != nil {
|
if rows.Close() != nil {
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// if the tag id doesn't exist the query won't return a name
|
// if the tag id doesn't exist the query won't return a name
|
||||||
if name == "" {
|
if name == "" {
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
result.Videos = vids
|
result.Videos = vids
|
||||||
result.TagName = name
|
result.TagName = name
|
||||||
context.Json(result)
|
// jsonify results
|
||||||
|
str, _ := json.Marshal(result)
|
||||||
|
return str
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -123,27 +115,26 @@ func getVideoHandlers() {
|
|||||||
*
|
*
|
||||||
* @apiSuccess {string} . Base64 encoded Thubnail
|
* @apiSuccess {string} . Base64 encoded Thubnail
|
||||||
*/
|
*/
|
||||||
api.AddHandler("readThumbnail", api.VideoNode, api.PermUser, func(context api.Context) {
|
AddHandler("readThumbnail", VideoNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
Movieid int
|
Movieid int
|
||||||
}
|
}
|
||||||
err := api.DecodeRequest(context.GetRequest(), &args)
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
if err != nil {
|
fmt.Println(err.Error())
|
||||||
context.Text("unable to decode request")
|
return nil
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var pic []byte
|
var pic []byte
|
||||||
|
|
||||||
query := fmt.Sprintf("SELECT thumbnail FROM videos WHERE movie_id=%d", args.Movieid)
|
query := fmt.Sprintf("SELECT thumbnail FROM videos WHERE movie_id=%d", args.Movieid)
|
||||||
|
|
||||||
err = database.QueryRow(query).Scan(&pic)
|
err := database.QueryRow(query).Scan(&pic)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("the thumbnail of movie id %d couldn't be found", args.Movieid)
|
fmt.Printf("the thumbnail of movie id %d couldn't be found", args.Movieid)
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
context.Text(string(pic))
|
return pic
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -162,14 +153,13 @@ func getVideoHandlers() {
|
|||||||
* @apiSuccess {string} Videos.MovieName Video Name
|
* @apiSuccess {string} Videos.MovieName Video Name
|
||||||
* @apiSuccess {int} Videos.MovieId Video ID
|
* @apiSuccess {int} Videos.MovieId Video ID
|
||||||
*/
|
*/
|
||||||
api.AddHandler("getRandomMovies", api.VideoNode, api.PermUser, func(context api.Context) {
|
AddHandler("getRandomMovies", VideoNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
Number int
|
Number int
|
||||||
TagFilter []uint32
|
|
||||||
}
|
}
|
||||||
if api.DecodeRequest(context.GetRequest(), &args) != nil {
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
context.Text("unable to decode request")
|
fmt.Println(err.Error())
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var result struct {
|
var result struct {
|
||||||
@ -177,23 +167,9 @@ func getVideoHandlers() {
|
|||||||
Videos []types.VideoUnloadedType
|
Videos []types.VideoUnloadedType
|
||||||
}
|
}
|
||||||
|
|
||||||
whereclause := "WHERE 1"
|
query := fmt.Sprintf("SELECT movie_id,movie_name FROM videos ORDER BY RAND() LIMIT %d", args.Number)
|
||||||
if len(args.TagFilter) > 0 {
|
|
||||||
d, _ := json.Marshal(args.TagFilter)
|
|
||||||
vals := strings.Trim(string(d), "[]")
|
|
||||||
|
|
||||||
whereclause = fmt.Sprintf("WHERE tag_id IN (%s)", vals)
|
|
||||||
}
|
|
||||||
|
|
||||||
query := fmt.Sprintf(`
|
|
||||||
SELECT video_tags.video_id,v.movie_name FROM video_tags join videos v on v.movie_id = video_tags.video_id
|
|
||||||
%s
|
|
||||||
group by video_id
|
|
||||||
ORDER BY RAND()
|
|
||||||
LIMIT %d`, whereclause, args.Number)
|
|
||||||
result.Videos = readVideosFromResultset(database.Query(query))
|
result.Videos = readVideosFromResultset(database.Query(query))
|
||||||
|
|
||||||
if len(result.Videos) > 0 {
|
|
||||||
var ids string
|
var ids string
|
||||||
for i := range result.Videos {
|
for i := range result.Videos {
|
||||||
ids += "video_tags.video_id=" + strconv.Itoa(result.Videos[i].MovieId)
|
ids += "video_tags.video_id=" + strconv.Itoa(result.Videos[i].MovieId)
|
||||||
@ -210,22 +186,20 @@ SELECT video_tags.video_id,v.movie_name FROM video_tags join videos v on v.movie
|
|||||||
GROUP BY t.tag_id`, ids)
|
GROUP BY t.tag_id`, ids)
|
||||||
|
|
||||||
rows := database.Query(query)
|
rows := database.Query(query)
|
||||||
if rows != nil {
|
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var tag types.Tag
|
var tag types.Tag
|
||||||
err := rows.Scan(&tag.TagName, &tag.TagId)
|
err := rows.Scan(&tag.TagName, &tag.TagId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err.Error()) // proper Error handling instead of panic in your app
|
panic(err.Error()) // proper error handling instead of panic in your app
|
||||||
}
|
}
|
||||||
// append to final array
|
// append to final array
|
||||||
result.Tags = append(result.Tags, tag)
|
result.Tags = append(result.Tags, tag)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
} else {
|
|
||||||
result.Tags = []types.Tag{}
|
|
||||||
}
|
|
||||||
|
|
||||||
context.Json(result)
|
// jsonify results
|
||||||
|
str, _ := json.Marshal(result)
|
||||||
|
return str
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -240,19 +214,23 @@ SELECT video_tags.video_id,v.movie_name FROM video_tags join videos v on v.movie
|
|||||||
* @apiSuccess {number} .MovieId Id of Video
|
* @apiSuccess {number} .MovieId Id of Video
|
||||||
* @apiSuccess {String} .MovieName Name of video
|
* @apiSuccess {String} .MovieName Name of video
|
||||||
*/
|
*/
|
||||||
api.AddHandler("getSearchKeyWord", api.VideoNode, api.PermUser, func(context api.Context) {
|
AddHandler("getSearchKeyWord", VideoNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
KeyWord string
|
KeyWord string
|
||||||
}
|
}
|
||||||
if api.DecodeRequest(context.GetRequest(), &args) != nil {
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
context.Text("unable to decode request")
|
fmt.Println(err.Error())
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
query := fmt.Sprintf(`SELECT movie_id,movie_name FROM videos
|
query := fmt.Sprintf(`SELECT movie_id,movie_name FROM videos
|
||||||
WHERE movie_name LIKE '%%%s%%'
|
WHERE movie_name LIKE '%%%s%%'
|
||||||
ORDER BY likes DESC, create_date DESC, movie_name`, args.KeyWord)
|
ORDER BY likes DESC, create_date DESC, movie_name`, args.KeyWord)
|
||||||
context.Json(readVideosFromResultset(database.Query(query)))
|
|
||||||
|
result := readVideosFromResultset(database.Query(query))
|
||||||
|
// jsonify results
|
||||||
|
str, _ := json.Marshal(result)
|
||||||
|
return str
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -288,27 +266,27 @@ func loadVideosHandlers() {
|
|||||||
* @apiSuccess {string} Actors.Name Actor Name
|
* @apiSuccess {string} Actors.Name Actor Name
|
||||||
* @apiSuccess {string} Actors.Thumbnail Portrait Thumbnail
|
* @apiSuccess {string} Actors.Thumbnail Portrait Thumbnail
|
||||||
*/
|
*/
|
||||||
api.AddHandler("loadVideo", api.VideoNode, api.PermUser, func(context api.Context) {
|
AddHandler("loadVideo", VideoNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
MovieId int
|
MovieId int
|
||||||
}
|
}
|
||||||
if api.DecodeRequest(context.GetRequest(), &args) != nil {
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
context.Text("unable to decode request")
|
fmt.Println(err.Error())
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
query := fmt.Sprintf(`SELECT movie_name,movie_url,movie_id,thumbnail,poster,likes,quality,length,release_date
|
query := fmt.Sprintf(`SELECT movie_name,movie_url,movie_id,thumbnail,poster,likes,quality,length
|
||||||
FROM videos WHERE movie_id=%d`, args.MovieId)
|
FROM videos WHERE movie_id=%d`, args.MovieId)
|
||||||
|
|
||||||
var res types.FullVideoType
|
var res types.FullVideoType
|
||||||
var poster []byte
|
var poster []byte
|
||||||
var thumbnail []byte
|
var thumbnail []byte
|
||||||
|
|
||||||
err := database.QueryRow(query).Scan(&res.MovieName, &res.MovieUrl, &res.MovieId, &thumbnail, &poster, &res.Likes, &res.Quality, &res.Length, &res.ReleaseDate)
|
err := database.QueryRow(query).Scan(&res.MovieName, &res.MovieUrl, &res.MovieId, &thumbnail, &poster, &res.Likes, &res.Quality, &res.Length)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("Error getting full data list of videoid - %d", args.MovieId)
|
fmt.Printf("error getting full data list of videoid - %d", args.MovieId)
|
||||||
fmt.Println(err.Error())
|
fmt.Println(err.Error())
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// we ned to urlencode the movieurl
|
// we ned to urlencode the movieurl
|
||||||
@ -346,7 +324,9 @@ func loadVideosHandlers() {
|
|||||||
|
|
||||||
res.Actors = readActorsFromResultset(database.Query(query))
|
res.Actors = readActorsFromResultset(database.Query(query))
|
||||||
|
|
||||||
context.Json(res)
|
// jsonify results
|
||||||
|
str, _ := json.Marshal(res)
|
||||||
|
return str
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -362,7 +342,7 @@ func loadVideosHandlers() {
|
|||||||
* @apiSuccess {uint32} DifferentTags number of different Tags available
|
* @apiSuccess {uint32} DifferentTags number of different Tags available
|
||||||
* @apiSuccess {uint32} Tagged number of different Tags assigned
|
* @apiSuccess {uint32} Tagged number of different Tags assigned
|
||||||
*/
|
*/
|
||||||
api.AddHandler("getStartData", api.VideoNode, api.PermUser, func(context api.Context) {
|
AddHandler("getStartData", VideoNode, func(info *HandlerInfo) []byte {
|
||||||
var result types.StartData
|
var result types.StartData
|
||||||
// query settings and infotile values
|
// query settings and infotile values
|
||||||
query := `
|
query := `
|
||||||
@ -396,7 +376,9 @@ func loadVideosHandlers() {
|
|||||||
|
|
||||||
_ = database.QueryRow(query).Scan(&result.VideoNr, &result.Tagged, &result.HDNr, &result.FullHdNr, &result.SDNr, &result.DifferentTags)
|
_ = database.QueryRow(query).Scan(&result.VideoNr, &result.Tagged, &result.HDNr, &result.FullHdNr, &result.SDNr, &result.DifferentTags)
|
||||||
|
|
||||||
context.Json(result)
|
// jsonify results
|
||||||
|
str, _ := json.Marshal(result)
|
||||||
|
return str
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -409,19 +391,19 @@ func addToVideoHandlers() {
|
|||||||
*
|
*
|
||||||
* @apiParam {int} MovieId ID of video
|
* @apiParam {int} MovieId ID of video
|
||||||
*
|
*
|
||||||
* @apiSuccess {string} result 'success' if successfully or Error message if not
|
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||||
*/
|
*/
|
||||||
api.AddHandler("addLike", api.VideoNode, api.PermUser, func(context api.Context) {
|
AddHandler("addLike", VideoNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
MovieId int
|
MovieId int
|
||||||
}
|
}
|
||||||
if api.DecodeRequest(context.GetRequest(), &args) != nil {
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
context.Text("unable to decode request")
|
fmt.Println(err.Error())
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
query := fmt.Sprintf("update videos set likes = likes + 1 where movie_id = %d", args.MovieId)
|
query := fmt.Sprintf("update videos set likes = likes + 1 where movie_id = %d", args.MovieId)
|
||||||
context.Text(string(database.SuccessQuery(query)))
|
return database.SuccessQuery(query)
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -431,18 +413,16 @@ func addToVideoHandlers() {
|
|||||||
* @apiGroup video
|
* @apiGroup video
|
||||||
*
|
*
|
||||||
* @apiParam {int} MovieId ID of video
|
* @apiParam {int} MovieId ID of video
|
||||||
* @apiParam {bool} FullyDelete Delete video from disk?
|
|
||||||
*
|
*
|
||||||
* @apiSuccess {string} result 'success' if successfully or Error message if not
|
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||||
*/
|
*/
|
||||||
api.AddHandler("deleteVideo", api.VideoNode, api.PermUser, func(context api.Context) {
|
AddHandler("deleteVideo", VideoNode, func(info *HandlerInfo) []byte {
|
||||||
var args struct {
|
var args struct {
|
||||||
MovieId int
|
MovieId int
|
||||||
FullyDelete bool
|
|
||||||
}
|
}
|
||||||
if api.DecodeRequest(context.GetRequest(), &args) != nil {
|
if err := FillStruct(&args, info.Data); err != nil {
|
||||||
context.Text("unable to decode request")
|
fmt.Println(err.Error())
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// delete tag constraints
|
// delete tag constraints
|
||||||
@ -455,31 +435,10 @@ func addToVideoHandlers() {
|
|||||||
|
|
||||||
// respond only if result not successful
|
// respond only if result not successful
|
||||||
if err != nil {
|
if err != nil {
|
||||||
context.Text(string(database.ManualSuccessResponse(err)))
|
return database.ManualSuccessResponse(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// only allow deletion of video if cli flag is set, independent of passed api arg
|
|
||||||
if config.GetConfig().Features.FullyDeletableVideos && args.FullyDelete {
|
|
||||||
// get physical path of video to delete
|
|
||||||
query = fmt.Sprintf("SELECT movie_url FROM videos WHERE movie_id=%d", args.MovieId)
|
|
||||||
var vidpath string
|
|
||||||
err := database.QueryRow(query).Scan(&vidpath)
|
|
||||||
if err != nil {
|
|
||||||
context.Text(string(database.ManualSuccessResponse(err)))
|
|
||||||
}
|
|
||||||
|
|
||||||
sett, videoprefix, _ := database.GetSettings()
|
|
||||||
assembledPath := videoprefix + sett.VideoPath + vidpath
|
|
||||||
|
|
||||||
err = os.Remove(assembledPath)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Printf("unable to delete file: %s -- %s\n", assembledPath, err.Error())
|
|
||||||
context.Text(string(database.ManualSuccessResponse(err)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// delete video row from db
|
|
||||||
query = fmt.Sprintf("DELETE FROM videos WHERE movie_id=%d", args.MovieId)
|
query = fmt.Sprintf("DELETE FROM videos WHERE movie_id=%d", args.MovieId)
|
||||||
context.Text(string(database.SuccessQuery(query)))
|
return database.SuccessQuery(query)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -1,64 +0,0 @@
|
|||||||
package api
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"net/http"
|
|
||||||
"openmediacenter/apiGo/database/settings"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
VideoNode = "video"
|
|
||||||
TagNode = "tags"
|
|
||||||
SettingsNode = "settings"
|
|
||||||
ActorNode = "actor"
|
|
||||||
TVShowNode = "tv"
|
|
||||||
LoginNode = "login"
|
|
||||||
)
|
|
||||||
|
|
||||||
func AddHandler(action string, apiNode string, perm Perm, handler func(ctx Context)) {
|
|
||||||
http.Handle(fmt.Sprintf("/api/%s/%s", apiNode, action), http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
|
|
||||||
srvPwd := settings.GetPassword()
|
|
||||||
if srvPwd == nil {
|
|
||||||
// no password set
|
|
||||||
ctx := &apicontext{writer: writer, responseWritten: false, request: request, userid: -1, permid: PermUnauthorized}
|
|
||||||
callHandler(ctx, handler, writer)
|
|
||||||
} else {
|
|
||||||
tokenheader := request.Header.Get("Token")
|
|
||||||
|
|
||||||
id := -1
|
|
||||||
permid := PermUnauthorized
|
|
||||||
|
|
||||||
// check token if token provided
|
|
||||||
if tokenheader != "" {
|
|
||||||
id, permid = TokenValid(request.Header.Get("Token"))
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx := &apicontext{writer: writer, responseWritten: false, request: request, userid: id, permid: permid}
|
|
||||||
|
|
||||||
// check if rights are sufficient to perform the action
|
|
||||||
if permid <= perm {
|
|
||||||
callHandler(ctx, handler, writer)
|
|
||||||
} else {
|
|
||||||
ctx.Error("insufficient permissions")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
func callHandler(ctx *apicontext, handler func(ctx Context), writer http.ResponseWriter) {
|
|
||||||
handler(ctx)
|
|
||||||
|
|
||||||
if !ctx.responseWritten {
|
|
||||||
// none of the response functions called so send default response
|
|
||||||
ctx.Error("Unknown server Error occured")
|
|
||||||
writer.WriteHeader(501)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func ServerInit(port uint16) error {
|
|
||||||
// initialize auth service and add corresponding auth routes
|
|
||||||
InitOAuth()
|
|
||||||
|
|
||||||
fmt.Printf("OpenMediacenter server up and running on port %d\n", port)
|
|
||||||
return http.ListenAndServe(fmt.Sprintf(":%d", port), nil)
|
|
||||||
}
|
|
@ -1,100 +0,0 @@
|
|||||||
package api
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"github.com/dgrijalva/jwt-go"
|
|
||||||
"openmediacenter/apiGo/database"
|
|
||||||
"strconv"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Perm uint8
|
|
||||||
|
|
||||||
const (
|
|
||||||
PermAdmin Perm = iota
|
|
||||||
PermUser
|
|
||||||
PermUnauthorized
|
|
||||||
)
|
|
||||||
|
|
||||||
func (p Perm) String() string {
|
|
||||||
return [...]string{"PermAdmin", "PermUser", "PermUnauthorized"}[p]
|
|
||||||
}
|
|
||||||
|
|
||||||
const SignKey = "89013f1753a6890c6090b09e3c23ff43"
|
|
||||||
const TokenExpireHours = 8760
|
|
||||||
|
|
||||||
type Token struct {
|
|
||||||
Token string
|
|
||||||
ExpiresAt int64
|
|
||||||
}
|
|
||||||
|
|
||||||
func TokenValid(token string) (int, Perm) {
|
|
||||||
t, err := jwt.ParseWithClaims(token, &jwt.StandardClaims{}, func(token *jwt.Token) (interface{}, error) {
|
|
||||||
return []byte(SignKey), nil
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return -1, PermUnauthorized
|
|
||||||
}
|
|
||||||
|
|
||||||
claims := t.Claims.(*jwt.StandardClaims)
|
|
||||||
|
|
||||||
id, err := strconv.Atoi(claims.Issuer)
|
|
||||||
permid, err := strconv.Atoi(claims.Subject)
|
|
||||||
if err != nil {
|
|
||||||
return -1, PermUnauthorized
|
|
||||||
}
|
|
||||||
return id, Perm(permid)
|
|
||||||
}
|
|
||||||
|
|
||||||
func InitOAuth() {
|
|
||||||
AddHandler("login", LoginNode, PermUnauthorized, func(ctx Context) {
|
|
||||||
var t struct {
|
|
||||||
Password string
|
|
||||||
}
|
|
||||||
|
|
||||||
if DecodeRequest(ctx.GetRequest(), &t) != nil {
|
|
||||||
fmt.Println("Error accured while decoding Testrequest!!")
|
|
||||||
}
|
|
||||||
|
|
||||||
// empty check
|
|
||||||
if t.Password == "" {
|
|
||||||
ctx.Error("empty password")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// generate Argon2 Hash of passed pwd
|
|
||||||
HashPassword(t.Password)
|
|
||||||
// todo use hashed password
|
|
||||||
|
|
||||||
var password string
|
|
||||||
|
|
||||||
err := database.QueryRow("SELECT password FROM settings WHERE 1").Scan(&password)
|
|
||||||
if err != nil || t.Password != password {
|
|
||||||
ctx.Error("unauthorized")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
expires := time.Now().Add(time.Hour * TokenExpireHours).Unix()
|
|
||||||
claims := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.StandardClaims{
|
|
||||||
Issuer: strconv.Itoa(int(0)),
|
|
||||||
Subject: strconv.Itoa(int(PermUser)),
|
|
||||||
ExpiresAt: expires,
|
|
||||||
})
|
|
||||||
|
|
||||||
token, err := claims.SignedString([]byte(SignKey))
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err.Error())
|
|
||||||
ctx.Error("failed to generate authorization token")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
type ResponseType struct {
|
|
||||||
Token Token
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx.Json(Token{
|
|
||||||
Token: token,
|
|
||||||
ExpiresAt: expires,
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
@ -1,65 +0,0 @@
|
|||||||
package api
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"net/http"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Context interface {
|
|
||||||
Json(t interface{})
|
|
||||||
Text(msg string)
|
|
||||||
Error(msg string)
|
|
||||||
Errorf(msg string, args ...interface{})
|
|
||||||
GetRequest() *http.Request
|
|
||||||
GetWriter() http.ResponseWriter
|
|
||||||
UserID() int
|
|
||||||
PermID() Perm
|
|
||||||
}
|
|
||||||
|
|
||||||
type apicontext struct {
|
|
||||||
writer http.ResponseWriter
|
|
||||||
request *http.Request
|
|
||||||
responseWritten bool
|
|
||||||
userid int
|
|
||||||
permid Perm
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *apicontext) GetRequest() *http.Request {
|
|
||||||
return r.request
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *apicontext) UserID() int {
|
|
||||||
return r.userid
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *apicontext) GetWriter() http.ResponseWriter {
|
|
||||||
return r.writer
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *apicontext) Json(t interface{}) {
|
|
||||||
r.writer.Write(Jsonify(t))
|
|
||||||
r.responseWritten = true
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *apicontext) Text(msg string) {
|
|
||||||
r.writer.Write([]byte(msg))
|
|
||||||
r.responseWritten = true
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *apicontext) Error(msg string) {
|
|
||||||
type Error struct {
|
|
||||||
Message string
|
|
||||||
}
|
|
||||||
|
|
||||||
r.writer.WriteHeader(500)
|
|
||||||
r.writer.Write(Jsonify(Error{Message: msg}))
|
|
||||||
r.responseWritten = true
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *apicontext) Errorf(msg string, args ...interface{}) {
|
|
||||||
r.Error(fmt.Sprintf(msg, &args))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *apicontext) PermID() Perm {
|
|
||||||
return r.permid
|
|
||||||
}
|
|
@ -1,13 +0,0 @@
|
|||||||
package api
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/hex"
|
|
||||||
"golang.org/x/crypto/argon2"
|
|
||||||
)
|
|
||||||
|
|
||||||
func HashPassword(pwd string) *string {
|
|
||||||
// todo generate random salt
|
|
||||||
hash := argon2.IDKey([]byte(pwd), []byte(SignKey), 3, 64*1024, 2, 32)
|
|
||||||
hexx := hex.EncodeToString(hash)
|
|
||||||
return &hexx
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
package api
|
|
||||||
|
|
||||||
import "testing"
|
|
||||||
|
|
||||||
func TestHashlength(t *testing.T) {
|
|
||||||
h := HashPassword("test")
|
|
||||||
|
|
||||||
if len(*h) != 64 {
|
|
||||||
t.Errorf("Invalid hash length: %d", len(*h))
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,31 +0,0 @@
|
|||||||
package api
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"net/http"
|
|
||||||
)
|
|
||||||
|
|
||||||
func Jsonify(v interface{}) []byte {
|
|
||||||
// Jsonify results
|
|
||||||
str, err := json.Marshal(v)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println("Error while Jsonifying return object: " + err.Error())
|
|
||||||
}
|
|
||||||
return str
|
|
||||||
}
|
|
||||||
|
|
||||||
// DecodeRequest decodes the request
|
|
||||||
func DecodeRequest(request *http.Request, arg interface{}) error {
|
|
||||||
buf := new(bytes.Buffer)
|
|
||||||
buf.ReadFrom(request.Body)
|
|
||||||
body := buf.String()
|
|
||||||
|
|
||||||
err := json.Unmarshal([]byte(body), &arg)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println("JSON decode Error" + err.Error())
|
|
||||||
}
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
|
@ -1,22 +0,0 @@
|
|||||||
package api
|
|
||||||
|
|
||||||
import "testing"
|
|
||||||
|
|
||||||
func TestJsonify(t *testing.T) {
|
|
||||||
var obj = struct {
|
|
||||||
ID uint32
|
|
||||||
Str string
|
|
||||||
Boo bool
|
|
||||||
}{
|
|
||||||
ID: 42,
|
|
||||||
Str: "teststr",
|
|
||||||
Boo: true,
|
|
||||||
}
|
|
||||||
|
|
||||||
res := Jsonify(obj)
|
|
||||||
exp := `{"ID":42,"Str":"teststr","Boo":true}`
|
|
||||||
|
|
||||||
if string(res) != exp {
|
|
||||||
t.Errorf("Invalid json response: %s !== %s", string(res), exp)
|
|
||||||
}
|
|
||||||
}
|
|
57
apiGo/api/oauth/CustomClientStore.go
Normal file
57
apiGo/api/oauth/CustomClientStore.go
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
package oauth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"gopkg.in/oauth2.v3"
|
||||||
|
"openmediacenter/apiGo/database/settings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type CustomClientStore struct {
|
||||||
|
oauth2.ClientStore
|
||||||
|
}
|
||||||
|
|
||||||
|
type CustomClientInfo struct {
|
||||||
|
oauth2.ClientInfo
|
||||||
|
ID string
|
||||||
|
Secret string
|
||||||
|
Domain string
|
||||||
|
UserID string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewCustomStore() oauth2.ClientStore {
|
||||||
|
s := new(CustomClientStore)
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *CustomClientStore) GetByID(id string) (oauth2.ClientInfo, error) {
|
||||||
|
password := settings.GetPassword()
|
||||||
|
// if password not set assign default password
|
||||||
|
if password == nil {
|
||||||
|
defaultpassword := "openmediacenter"
|
||||||
|
password = &defaultpassword
|
||||||
|
}
|
||||||
|
|
||||||
|
clientinfo := CustomClientInfo{
|
||||||
|
ID: "openmediacenter",
|
||||||
|
Secret: *password,
|
||||||
|
Domain: "http://localhost:8081",
|
||||||
|
UserID: "openmediacenter",
|
||||||
|
}
|
||||||
|
|
||||||
|
return &clientinfo, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *CustomClientInfo) GetID() string {
|
||||||
|
return a.ID
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *CustomClientInfo) GetSecret() string {
|
||||||
|
return a.Secret
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *CustomClientInfo) GetDomain() string {
|
||||||
|
return a.Domain
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *CustomClientInfo) GetUserID() string {
|
||||||
|
return a.UserID
|
||||||
|
}
|
62
apiGo/api/oauth/Oauth.go
Normal file
62
apiGo/api/oauth/Oauth.go
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
package oauth
|
||||||
|
|
||||||
|
import (
|
||||||
|
"gopkg.in/oauth2.v3"
|
||||||
|
"gopkg.in/oauth2.v3/errors"
|
||||||
|
"gopkg.in/oauth2.v3/manage"
|
||||||
|
"gopkg.in/oauth2.v3/server"
|
||||||
|
"gopkg.in/oauth2.v3/store"
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
var srv *server.Server
|
||||||
|
|
||||||
|
func InitOAuth() {
|
||||||
|
manager := manage.NewDefaultManager()
|
||||||
|
// token store
|
||||||
|
manager.MustTokenStorage(store.NewMemoryTokenStore())
|
||||||
|
|
||||||
|
// create new secretstore
|
||||||
|
clientStore := NewCustomStore()
|
||||||
|
manager.MapClientStorage(clientStore)
|
||||||
|
|
||||||
|
srv = server.NewServer(server.NewConfig(), manager)
|
||||||
|
srv.SetClientInfoHandler(server.ClientFormHandler)
|
||||||
|
manager.SetRefreshTokenCfg(manage.DefaultRefreshTokenCfg)
|
||||||
|
|
||||||
|
srv.SetInternalErrorHandler(func(err error) (re *errors.Response) {
|
||||||
|
log.Println("Internal Error:", err.Error())
|
||||||
|
return
|
||||||
|
})
|
||||||
|
|
||||||
|
srv.SetResponseErrorHandler(func(re *errors.Response) {
|
||||||
|
log.Println("Response Error:", re.Error.Error())
|
||||||
|
})
|
||||||
|
|
||||||
|
http.HandleFunc("/authorize", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
err := srv.HandleAuthorizeRequest(w, r)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
http.HandleFunc("/token", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
err := srv.HandleTokenRequest(w, r)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func ValidateToken(f func(rw http.ResponseWriter, req *http.Request, node int, tokenInfo *oauth2.TokenInfo), node int) http.HandlerFunc {
|
||||||
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
tokeninfo, err := srv.ValidationBearerToken(r)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
f(w, r, node, &tokeninfo)
|
||||||
|
}
|
||||||
|
}
|
@ -3,7 +3,6 @@ package types
|
|||||||
type VideoUnloadedType struct {
|
type VideoUnloadedType struct {
|
||||||
MovieId int
|
MovieId int
|
||||||
MovieName string
|
MovieName string
|
||||||
Ratio float32
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type FullVideoType struct {
|
type FullVideoType struct {
|
||||||
@ -11,7 +10,6 @@ type FullVideoType struct {
|
|||||||
MovieId uint32
|
MovieId uint32
|
||||||
MovieUrl string
|
MovieUrl string
|
||||||
Poster string
|
Poster string
|
||||||
ReleaseDate *string
|
|
||||||
Likes uint64
|
Likes uint64
|
||||||
Quality uint16
|
Quality uint16
|
||||||
Length uint16
|
Length uint16
|
||||||
|
@ -1,206 +0,0 @@
|
|||||||
package config
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"flag"
|
|
||||||
"fmt"
|
|
||||||
"github.com/pelletier/go-toml/v2"
|
|
||||||
"os"
|
|
||||||
)
|
|
||||||
|
|
||||||
type DatabaseT struct {
|
|
||||||
DBName string
|
|
||||||
DBPassword string
|
|
||||||
DBUser string
|
|
||||||
DBPort uint16
|
|
||||||
DBHost string
|
|
||||||
}
|
|
||||||
|
|
||||||
type FeaturesT struct {
|
|
||||||
DisableTVSupport bool
|
|
||||||
FullyDeletableVideos bool
|
|
||||||
}
|
|
||||||
|
|
||||||
type GeneralT struct {
|
|
||||||
VerboseLogging bool
|
|
||||||
ReindexPrefix string
|
|
||||||
}
|
|
||||||
|
|
||||||
type FileConfT struct {
|
|
||||||
Database DatabaseT
|
|
||||||
General GeneralT
|
|
||||||
Features FeaturesT
|
|
||||||
}
|
|
||||||
|
|
||||||
func defaultConfig() *FileConfT {
|
|
||||||
return &FileConfT{
|
|
||||||
Database: DatabaseT{
|
|
||||||
DBName: "mediacenter",
|
|
||||||
DBPassword: "mediapassword",
|
|
||||||
DBUser: "mediacenteruser",
|
|
||||||
DBPort: 3306,
|
|
||||||
DBHost: "127.0.0.1",
|
|
||||||
},
|
|
||||||
General: GeneralT{
|
|
||||||
VerboseLogging: false,
|
|
||||||
ReindexPrefix: "/var/www/openmediacenter",
|
|
||||||
},
|
|
||||||
Features: FeaturesT{
|
|
||||||
DisableTVSupport: false,
|
|
||||||
FullyDeletableVideos: false,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var liveConf FileConfT
|
|
||||||
|
|
||||||
func Init() {
|
|
||||||
cfgname := "openmediacenter.cfg"
|
|
||||||
cfgpath := "/etc/"
|
|
||||||
|
|
||||||
// load config from disk
|
|
||||||
dat, err := os.ReadFile(cfgpath + cfgname)
|
|
||||||
if err != nil {
|
|
||||||
// handle error if not exists or no sufficient read access
|
|
||||||
if _, ok := err.(*os.PathError); ok {
|
|
||||||
|
|
||||||
// check if config exists on local dir
|
|
||||||
dat, err = os.ReadFile(cfgname)
|
|
||||||
if err != nil {
|
|
||||||
generateNewConfig(cfgpath, cfgname)
|
|
||||||
} else {
|
|
||||||
// ok decode local config
|
|
||||||
decodeConfig(&dat)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// other error
|
|
||||||
fmt.Println(err.Error())
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
decodeConfig(&dat)
|
|
||||||
}
|
|
||||||
|
|
||||||
handleCommandLineArguments()
|
|
||||||
}
|
|
||||||
|
|
||||||
func generateNewConfig(cfgpath string, cfgname string) {
|
|
||||||
// config really doesn't exist!
|
|
||||||
fmt.Printf("config not existing -- generating new empty config at %s%s\n", cfgpath, cfgname)
|
|
||||||
|
|
||||||
// generate new default config
|
|
||||||
obj, _ := toml.Marshal(defaultConfig())
|
|
||||||
liveConf = *defaultConfig()
|
|
||||||
|
|
||||||
err := os.WriteFile(cfgpath+cfgname, obj, 777)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, os.ErrPermission) {
|
|
||||||
// permisson denied to create file try to create at current dir
|
|
||||||
err = os.WriteFile(cfgname, obj, 777)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println("failed to create default config file!")
|
|
||||||
} else {
|
|
||||||
fmt.Println("config file created at .")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
fmt.Println(err.Error())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func decodeConfig(bin *[]byte) {
|
|
||||||
config := FileConfT{}
|
|
||||||
|
|
||||||
err := toml.Unmarshal(*bin, &config)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err)
|
|
||||||
liveConf = *defaultConfig()
|
|
||||||
} else {
|
|
||||||
fmt.Println("Successfully loaded config file!")
|
|
||||||
|
|
||||||
liveConf = config
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// handleCommandLineArguments let cli args override the config
|
|
||||||
func handleCommandLineArguments() {
|
|
||||||
// get a defaultconfig obj to set defaults
|
|
||||||
dconf := defaultConfig()
|
|
||||||
|
|
||||||
const (
|
|
||||||
DBHost = "DBHost"
|
|
||||||
DBPort = "DBPort"
|
|
||||||
DBUser = "DBUser"
|
|
||||||
DBPassword = "DBPassword"
|
|
||||||
DBName = "DBName"
|
|
||||||
Verbose = "v"
|
|
||||||
ReindexPrefix = "ReindexPrefix"
|
|
||||||
DisableTVSupport = "DisableTVSupport"
|
|
||||||
FullyDeletableVideos = "FullyDeletableVideos"
|
|
||||||
)
|
|
||||||
|
|
||||||
dbhostPtr := flag.String(DBHost, dconf.Database.DBHost, "database host name")
|
|
||||||
dbPortPtr := flag.Int(DBPort, int(dconf.Database.DBPort), "database port")
|
|
||||||
dbUserPtr := flag.String(DBUser, dconf.Database.DBUser, "database username")
|
|
||||||
dbPassPtr := flag.String(DBPassword, dconf.Database.DBPassword, "database username")
|
|
||||||
dbNamePtr := flag.String(DBName, dconf.Database.DBName, "database name")
|
|
||||||
|
|
||||||
verbosePtr := flag.Bool(Verbose, dconf.General.VerboseLogging, "Verbose log output")
|
|
||||||
|
|
||||||
pathPrefix := flag.String(ReindexPrefix, dconf.General.ReindexPrefix, "Prefix path for videos to reindex")
|
|
||||||
|
|
||||||
disableTVShowSupport := flag.Bool(DisableTVSupport, dconf.Features.DisableTVSupport, "Disable the TVShow support and pages")
|
|
||||||
videosFullyDeletable := flag.Bool(FullyDeletableVideos, dconf.Features.FullyDeletableVideos, "Allow deletion from harddisk")
|
|
||||||
|
|
||||||
flag.Parse()
|
|
||||||
|
|
||||||
if isFlagPassed(DBHost) {
|
|
||||||
liveConf.Database.DBHost = *dbhostPtr
|
|
||||||
}
|
|
||||||
|
|
||||||
if isFlagPassed(DBPort) {
|
|
||||||
liveConf.Database.DBPort = uint16(*dbPortPtr)
|
|
||||||
}
|
|
||||||
|
|
||||||
if isFlagPassed(DBName) {
|
|
||||||
liveConf.Database.DBName = *dbNamePtr
|
|
||||||
}
|
|
||||||
|
|
||||||
if isFlagPassed(DBUser) {
|
|
||||||
liveConf.Database.DBUser = *dbUserPtr
|
|
||||||
}
|
|
||||||
|
|
||||||
if isFlagPassed(DBPassword) {
|
|
||||||
liveConf.Database.DBPassword = *dbPassPtr
|
|
||||||
}
|
|
||||||
|
|
||||||
if isFlagPassed(Verbose) {
|
|
||||||
liveConf.General.VerboseLogging = *verbosePtr
|
|
||||||
}
|
|
||||||
|
|
||||||
if isFlagPassed(ReindexPrefix) {
|
|
||||||
liveConf.General.ReindexPrefix = *pathPrefix
|
|
||||||
}
|
|
||||||
|
|
||||||
if isFlagPassed(DisableTVSupport) {
|
|
||||||
liveConf.Features.DisableTVSupport = *disableTVShowSupport
|
|
||||||
}
|
|
||||||
|
|
||||||
if isFlagPassed(FullyDeletableVideos) {
|
|
||||||
liveConf.Features.FullyDeletableVideos = *videosFullyDeletable
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// isFlagPassed check whether a flag was passed
|
|
||||||
func isFlagPassed(name string) bool {
|
|
||||||
found := false
|
|
||||||
flag.Visit(func(f *flag.Flag) {
|
|
||||||
if f.Name == name {
|
|
||||||
found = true
|
|
||||||
}
|
|
||||||
})
|
|
||||||
return found
|
|
||||||
}
|
|
||||||
|
|
||||||
func GetConfig() *FileConfT {
|
|
||||||
return &liveConf
|
|
||||||
}
|
|
@ -1,9 +0,0 @@
|
|||||||
package config
|
|
||||||
|
|
||||||
import "testing"
|
|
||||||
|
|
||||||
func TestSaveLoadConfig(t *testing.T) {
|
|
||||||
generateNewConfig("", "openmediacenter.cfg")
|
|
||||||
|
|
||||||
Init()
|
|
||||||
}
|
|
@ -2,24 +2,26 @@ package database
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"embed"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
_ "github.com/go-sql-driver/mysql"
|
_ "github.com/go-sql-driver/mysql"
|
||||||
"github.com/pressly/goose/v3"
|
|
||||||
"log"
|
|
||||||
"openmediacenter/apiGo/api/types"
|
"openmediacenter/apiGo/api/types"
|
||||||
"openmediacenter/apiGo/config"
|
|
||||||
"os"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var db *sql.DB
|
var db *sql.DB
|
||||||
var DBName string
|
var DBName string
|
||||||
|
|
||||||
//go:embed migrations/*.sql
|
// store the command line parameter for Videoprefix
|
||||||
var embedMigrations embed.FS
|
var SettingsVideoPrefix = ""
|
||||||
|
|
||||||
func InitDB() error {
|
type DatabaseConfig struct {
|
||||||
dbconf := config.GetConfig().Database
|
DBHost string
|
||||||
|
DBPort int
|
||||||
|
DBUser string
|
||||||
|
DBPassword string
|
||||||
|
DBName string
|
||||||
|
}
|
||||||
|
|
||||||
|
func InitDB(dbconf *DatabaseConfig) {
|
||||||
DBName = dbconf.DBName
|
DBName = dbconf.DBName
|
||||||
|
|
||||||
// Open up our database connection.
|
// Open up our database connection.
|
||||||
@ -28,32 +30,15 @@ func InitDB() error {
|
|||||||
|
|
||||||
// if there is an error opening the connection, handle it
|
// if there is an error opening the connection, handle it
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Error while connecting to database! - %s\n", err.Error())
|
fmt.Printf("Error while connecting to database! - %s\n", err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
if db != nil {
|
if db != nil {
|
||||||
ping := db.Ping()
|
ping := db.Ping()
|
||||||
if ping != nil {
|
if ping != nil {
|
||||||
return fmt.Errorf("Error while connecting to database! - %s\n", ping.Error())
|
fmt.Printf("Error while connecting to database! - %s\n", ping.Error())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println("Running Database migrations!")
|
|
||||||
// perform database migrations
|
|
||||||
goose.SetBaseFS(embedMigrations)
|
|
||||||
goose.SetLogger(log.New(os.Stdout, "", 0))
|
|
||||||
|
|
||||||
// set mysql dialect
|
|
||||||
err = goose.SetDialect("mysql")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := goose.Up(db, "migrations"); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func Query(query string, args ...interface{}) *sql.Rows {
|
func Query(query string, args ...interface{}) *sql.Rows {
|
||||||
@ -143,6 +128,6 @@ func GetSettings() (result types.SettingsType, PathPrefix string, sizes types.Se
|
|||||||
result.TMDBGrabbing = TMDBGrabbing != 0
|
result.TMDBGrabbing = TMDBGrabbing != 0
|
||||||
result.PasswordEnabled = result.Password != "-1"
|
result.PasswordEnabled = result.Password != "-1"
|
||||||
result.DarkMode = DarkMode != 0
|
result.DarkMode = DarkMode != 0
|
||||||
PathPrefix = config.GetConfig().General.ReindexPrefix
|
PathPrefix = SettingsVideoPrefix
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -1,122 +0,0 @@
|
|||||||
-- +goose Up
|
|
||||||
-- +goose StatementBegin
|
|
||||||
create table if not exists actors
|
|
||||||
(
|
|
||||||
actor_id int auto_increment
|
|
||||||
primary key,
|
|
||||||
name varchar(50) null,
|
|
||||||
thumbnail mediumblob null
|
|
||||||
)
|
|
||||||
comment 'informations about different actors';
|
|
||||||
-- +goose StatementEnd
|
|
||||||
-- +goose StatementBegin
|
|
||||||
create table if not exists settings
|
|
||||||
(
|
|
||||||
video_path varchar(255) null,
|
|
||||||
episode_path varchar(255) null,
|
|
||||||
password varchar(32) default '-1' null,
|
|
||||||
mediacenter_name varchar(32) default 'OpenMediaCenter' null,
|
|
||||||
TMDB_grabbing tinyint null,
|
|
||||||
DarkMode tinyint default 0 null
|
|
||||||
);
|
|
||||||
-- +goose StatementEnd
|
|
||||||
-- +goose StatementBegin
|
|
||||||
create table if not exists tags
|
|
||||||
(
|
|
||||||
tag_id int auto_increment
|
|
||||||
primary key,
|
|
||||||
tag_name varchar(50) null
|
|
||||||
);
|
|
||||||
-- +goose StatementEnd
|
|
||||||
-- +goose StatementBegin
|
|
||||||
create table if not exists tvshow
|
|
||||||
(
|
|
||||||
name varchar(100) null,
|
|
||||||
thumbnail mediumblob null,
|
|
||||||
id int auto_increment
|
|
||||||
primary key,
|
|
||||||
foldername varchar(100) null
|
|
||||||
);
|
|
||||||
-- +goose StatementEnd
|
|
||||||
-- +goose StatementBegin
|
|
||||||
create table if not exists tvshow_episodes
|
|
||||||
(
|
|
||||||
id int auto_increment
|
|
||||||
primary key,
|
|
||||||
name varchar(100) null,
|
|
||||||
season int null,
|
|
||||||
poster mediumblob null,
|
|
||||||
tvshow_id int null,
|
|
||||||
episode int null,
|
|
||||||
filename varchar(100) null,
|
|
||||||
constraint tvshow_episodes_tvshow_id_fk
|
|
||||||
foreign key (tvshow_id) references tvshow (id)
|
|
||||||
);
|
|
||||||
-- +goose StatementEnd
|
|
||||||
-- +goose StatementBegin
|
|
||||||
create table if not exists videos
|
|
||||||
(
|
|
||||||
movie_id int auto_increment
|
|
||||||
primary key,
|
|
||||||
movie_name varchar(200) null,
|
|
||||||
movie_url varchar(250) null,
|
|
||||||
thumbnail mediumblob null,
|
|
||||||
poster mediumblob null,
|
|
||||||
likes int default 0 null,
|
|
||||||
quality int default 0 null,
|
|
||||||
length int default 0 null comment 'in seconds',
|
|
||||||
create_date datetime default current_timestamp() null
|
|
||||||
);
|
|
||||||
-- +goose StatementEnd
|
|
||||||
-- +goose StatementBegin
|
|
||||||
create table if not exists actors_videos
|
|
||||||
(
|
|
||||||
actor_id int null,
|
|
||||||
video_id int null,
|
|
||||||
constraint actors_videos_actors_id_fk
|
|
||||||
foreign key (actor_id) references actors (actor_id),
|
|
||||||
constraint actors_videos_videos_movie_id_fk
|
|
||||||
foreign key (video_id) references videos (movie_id)
|
|
||||||
);
|
|
||||||
-- +goose StatementEnd
|
|
||||||
-- +goose StatementBegin
|
|
||||||
create index if not exists actors_videos_actor_id_index
|
|
||||||
on actors_videos (actor_id);
|
|
||||||
-- +goose StatementEnd
|
|
||||||
-- +goose StatementBegin
|
|
||||||
create index if not exists actors_videos_video_id_index
|
|
||||||
on actors_videos (video_id);
|
|
||||||
-- +goose StatementEnd
|
|
||||||
-- +goose StatementBegin
|
|
||||||
create table if not exists video_tags
|
|
||||||
(
|
|
||||||
tag_id int null,
|
|
||||||
video_id int null,
|
|
||||||
constraint video_tags_tags_tag_id_fk
|
|
||||||
foreign key (tag_id) references tags (tag_id),
|
|
||||||
constraint video_tags_videos_movie_id_fk
|
|
||||||
foreign key (video_id) references videos (movie_id)
|
|
||||||
on delete cascade
|
|
||||||
);
|
|
||||||
|
|
||||||
-- +goose StatementEnd
|
|
||||||
-- +goose StatementBegin
|
|
||||||
INSERT IGNORE INTO tags (tag_id, tag_name)
|
|
||||||
VALUES (2, 'fullhd');
|
|
||||||
-- +goose StatementEnd
|
|
||||||
-- +goose StatementBegin
|
|
||||||
INSERT IGNORE INTO tags (tag_id, tag_name)
|
|
||||||
VALUES (3, 'lowquality');
|
|
||||||
-- +goose StatementEnd
|
|
||||||
-- +goose StatementBegin
|
|
||||||
INSERT IGNORE INTO tags (tag_id, tag_name)
|
|
||||||
VALUES (4, 'hd');
|
|
||||||
-- +goose StatementEnd
|
|
||||||
-- +goose StatementBegin
|
|
||||||
INSERT IGNORE INTO settings (video_path, episode_path, password, mediacenter_name)
|
|
||||||
VALUES ('./videos/', './tvshows/', -1, 'OpenMediaCenter');
|
|
||||||
|
|
||||||
|
|
||||||
-- +goose StatementEnd
|
|
||||||
|
|
||||||
-- +goose Down
|
|
@ -1,12 +0,0 @@
|
|||||||
-- +goose Up
|
|
||||||
-- +goose StatementBegin
|
|
||||||
alter table videos
|
|
||||||
add release_date date null;
|
|
||||||
|
|
||||||
-- +goose StatementEnd
|
|
||||||
|
|
||||||
-- +goose Down
|
|
||||||
-- +goose StatementBegin
|
|
||||||
alter table videos
|
|
||||||
drop release_date;
|
|
||||||
-- +goose StatementEnd
|
|
@ -1,11 +0,0 @@
|
|||||||
-- +goose Up
|
|
||||||
-- +goose StatementBegin
|
|
||||||
alter table videos
|
|
||||||
add previewratio FLOAT default -1.0 null;
|
|
||||||
-- +goose StatementEnd
|
|
||||||
|
|
||||||
-- +goose Down
|
|
||||||
-- +goose StatementBegin
|
|
||||||
alter table videos
|
|
||||||
drop previewratio;
|
|
||||||
-- +goose StatementEnd
|
|
11
apiGo/database/settings/Settings.go
Normal file
11
apiGo/database/settings/Settings.go
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
package settings
|
||||||
|
|
||||||
|
var tvShowEnabled bool
|
||||||
|
|
||||||
|
func TVShowsEnabled() bool {
|
||||||
|
return tvShowEnabled
|
||||||
|
}
|
||||||
|
|
||||||
|
func SetTVShowEnabled(enabled bool) {
|
||||||
|
tvShowEnabled = enabled
|
||||||
|
}
|
@ -3,12 +3,7 @@ module openmediacenter/apiGo
|
|||||||
go 1.16
|
go 1.16
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/3d0c/gmf v0.0.0-20210925211039-e278e6e53b16
|
github.com/go-sql-driver/mysql v1.5.0
|
||||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible
|
gopkg.in/oauth2.v3 v3.12.0
|
||||||
github.com/fsnotify/fsnotify v1.5.4
|
|
||||||
github.com/go-sql-driver/mysql v1.6.0
|
|
||||||
github.com/pelletier/go-toml/v2 v2.0.0-beta.3
|
|
||||||
github.com/pressly/goose/v3 v3.1.0
|
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
|
|
||||||
nhooyr.io/websocket v1.8.7
|
nhooyr.io/websocket v1.8.7
|
||||||
)
|
)
|
||||||
|
134
apiGo/go.sum
134
apiGo/go.sum
@ -1,104 +1,114 @@
|
|||||||
github.com/3d0c/gmf v0.0.0-20210925211039-e278e6e53b16 h1:LX3XWmS88yKgWJcMXb8vusphpDBe9+6LTI9FyHeFFWQ=
|
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||||
github.com/3d0c/gmf v0.0.0-20210925211039-e278e6e53b16/go.mod h1:0QMRcUq2JsDECeAq7bj4h79k7XbhtTsrPUQf6G7qfPs=
|
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
|
||||||
github.com/ClickHouse/clickhouse-go v1.4.5/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
|
|
||||||
github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
|
|
||||||
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
|
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
|
|
||||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
|
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
|
||||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
|
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
|
||||||
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
|
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
|
||||||
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
|
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
|
||||||
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
|
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||||
|
github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
|
||||||
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
|
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
|
||||||
github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
|
|
||||||
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
|
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
|
||||||
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
|
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
|
||||||
github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
|
|
||||||
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
|
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
|
||||||
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
|
|
||||||
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
|
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
|
||||||
github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
|
|
||||||
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
|
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
|
||||||
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
|
github.com/go-session/session v3.1.2+incompatible/go.mod h1:8B3iivBQjrz/JtC68Np2T1yBBLxTan3mn/3OM0CyRt0=
|
||||||
github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
|
github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
|
||||||
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||||
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
|
|
||||||
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
|
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
|
||||||
github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
|
|
||||||
github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
|
github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
|
||||||
github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
|
|
||||||
github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
|
github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
|
||||||
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
|
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
|
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
|
||||||
github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
|
|
||||||
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
|
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
|
||||||
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
|
|
||||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
|
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
|
||||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||||
github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
|
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
||||||
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||||
github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
|
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||||
github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
|
github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
|
||||||
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||||
|
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
||||||
|
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
|
||||||
|
github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
|
||||||
github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eTO0Q8=
|
github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eTO0Q8=
|
||||||
github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
|
github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
|
||||||
github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
|
github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
|
||||||
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
|
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
|
||||||
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
|
||||||
github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
|
||||||
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
|
|
||||||
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
|
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
|
||||||
github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
|
|
||||||
github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU=
|
|
||||||
github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
|
|
||||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
|
|
||||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
|
|
||||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
||||||
github.com/pelletier/go-toml/v2 v2.0.0-beta.3 h1:PNCTU4naEJ8mKal97P3A2qDU74QRQGlv4FXiL1XDqi4=
|
github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
|
||||||
github.com/pelletier/go-toml/v2 v2.0.0-beta.3/go.mod h1:aNseLYu/uKskg0zpr/kbr2z8yGuWtotWf/0BpGIAL2Y=
|
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||||
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
|
github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
||||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/pressly/goose/v3 v3.1.0 h1:V2Ulfm2XL9GtYNmrPUNFHieimf6diwADyMObnuuR2Mc=
|
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
|
||||||
github.com/pressly/goose/v3 v3.1.0/go.mod h1:tYsY0oL0yd48jg15POIZfOZiu66mqWpfDd/nJ28KWyU=
|
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
|
||||||
|
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||||
github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942 h1:t0lM6y/M5IiUZyvbBTcngso8SZEZICH7is9B6g/obVU=
|
github.com/tidwall/btree v0.0.0-20170113224114-9876f1454cf0 h1:QnyrPZZvPmR0AtJCxxfCtI1qN+fYpKTKJ/5opWmZ34k=
|
||||||
github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/tidwall/btree v0.0.0-20170113224114-9876f1454cf0/go.mod h1:huei1BkDWJ3/sLXmO+bsCNELL+Bp2Kks9OLyQFkzvA8=
|
||||||
github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
|
github.com/tidwall/buntdb v1.1.0 h1:H6LzK59KiNjf1nHVPFrYj4Qnl8d8YLBsYamdL8N+Bao=
|
||||||
|
github.com/tidwall/buntdb v1.1.0/go.mod h1:Y39xhcDW10WlyYXeLgGftXVbjtM0QP+/kpz8xl9cbzE=
|
||||||
|
github.com/tidwall/gjson v1.3.2 h1:+7p3qQFaH3fOMXAJSrdZwGKcOO/lYdGS0HqGhPqDdTI=
|
||||||
|
github.com/tidwall/gjson v1.3.2/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
|
||||||
|
github.com/tidwall/grect v0.0.0-20161006141115-ba9a043346eb h1:5NSYaAdrnblKByzd7XByQEJVT8+9v0W/tIY0Oo4OwrE=
|
||||||
|
github.com/tidwall/grect v0.0.0-20161006141115-ba9a043346eb/go.mod h1:lKYYLFIr9OIgdgrtgkZ9zgRxRdvPYsExnYBsEAd8W5M=
|
||||||
|
github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
|
||||||
|
github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
|
||||||
|
github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
|
||||||
|
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
|
||||||
|
github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e h1:+NL1GDIUOKxVfbp2KoJQD9cTQ6dyP2co9q4yzmT9FZo=
|
||||||
|
github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e/go.mod h1:/h+UnNGt0IhNNJLkGikcdcJqm66zGD/uJGMRxK/9+Ao=
|
||||||
|
github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563 h1:Otn9S136ELckZ3KKDyCkxapfufrqDqwmGjcHfAyXRrE=
|
||||||
|
github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563/go.mod h1:mLqSmt7Dv/CNneF2wfcChfN1rvapyQr01LGKnKex0DQ=
|
||||||
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
|
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
|
||||||
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
|
|
||||||
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
|
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
|
||||||
github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
|
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
|
||||||
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
|
github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
|
||||||
|
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
|
||||||
|
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
|
||||||
|
github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
|
||||||
|
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
|
||||||
|
github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
|
||||||
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
|
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
|
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
|
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
|
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
|
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
|
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
|
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
|
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
|
|
||||||
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
|
||||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
|
||||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
|
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
|
||||||
|
gopkg.in/oauth2.v3 v3.12.0 h1:yOffAPoolH/i2JxwmC+pgtnY3362iPahsDpLXfDFvNg=
|
||||||
|
gopkg.in/oauth2.v3 v3.12.0/go.mod h1:XEYgKqWX095YiPT+Aw5y3tCn+7/FMnlTFKrupgSiJ3I=
|
||||||
|
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
|
||||||
|
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
|
|
||||||
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
|
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
|
||||||
nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
|
nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
|
||||||
nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
|
nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
|
||||||
|
@ -1,18 +0,0 @@
|
|||||||
package housekeeping
|
|
||||||
|
|
||||||
import "fmt"
|
|
||||||
|
|
||||||
func RunHouseKeepingTasks() {
|
|
||||||
fmt.Println("Runnint houskeeping tasks!")
|
|
||||||
|
|
||||||
fmt.Println("Deduplicating Tags")
|
|
||||||
deduplicateTags()
|
|
||||||
|
|
||||||
fmt.Println("Deduplicating Tags assigned to videos")
|
|
||||||
deduplicateVideoTags()
|
|
||||||
|
|
||||||
fmt.Println("Fix missing video metadata like ratio")
|
|
||||||
fixMissingMetadata()
|
|
||||||
|
|
||||||
fmt.Println("Finished housekeeping")
|
|
||||||
}
|
|
@ -1,5 +0,0 @@
|
|||||||
package housekeeping
|
|
||||||
|
|
||||||
func fixMissingMetadata() {
|
|
||||||
// todo
|
|
||||||
}
|
|
@ -1,86 +0,0 @@
|
|||||||
package housekeeping
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"openmediacenter/apiGo/database"
|
|
||||||
)
|
|
||||||
|
|
||||||
func deduplicateTags() {
|
|
||||||
// find all duplicate tags
|
|
||||||
|
|
||||||
// gives first occurence of duplicate
|
|
||||||
query := `
|
|
||||||
SELECT
|
|
||||||
tag_name
|
|
||||||
FROM
|
|
||||||
tags
|
|
||||||
GROUP BY tag_name
|
|
||||||
HAVING COUNT(tag_name) > 1`
|
|
||||||
rows := database.Query(query)
|
|
||||||
duplicates := []string{}
|
|
||||||
if rows != nil {
|
|
||||||
for rows.Next() {
|
|
||||||
var id string
|
|
||||||
err := rows.Scan(&id)
|
|
||||||
if err != nil {
|
|
||||||
panic(err.Error()) // proper Error handling instead of panic in your app
|
|
||||||
}
|
|
||||||
duplicates = append(duplicates, id)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// nothing to do
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Print("deleting duplicate tag ids: ")
|
|
||||||
fmt.Println(duplicates)
|
|
||||||
|
|
||||||
for _, el := range duplicates {
|
|
||||||
query := fmt.Sprintf("SELECT tag_id FROM tags WHERE tag_name='%s'", el)
|
|
||||||
rows := database.Query(query)
|
|
||||||
ids := []uint32{}
|
|
||||||
for rows.Next() {
|
|
||||||
var id uint32
|
|
||||||
err := rows.Scan(&id)
|
|
||||||
if err != nil {
|
|
||||||
panic(err.Error()) // proper Error handling instead of panic in your app
|
|
||||||
}
|
|
||||||
ids = append(ids, id)
|
|
||||||
}
|
|
||||||
|
|
||||||
// id to copy other data to
|
|
||||||
mainid := ids[0]
|
|
||||||
|
|
||||||
// ids to copy from
|
|
||||||
copyids := ids[1:]
|
|
||||||
|
|
||||||
fmt.Printf("Migrating %s\n", el)
|
|
||||||
migrateTags(mainid, copyids)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func migrateTags(destid uint32, sourcids []uint32) {
|
|
||||||
querytempl := `
|
|
||||||
UPDATE video_tags
|
|
||||||
SET
|
|
||||||
tag_id = %d
|
|
||||||
WHERE
|
|
||||||
tag_id = %d`
|
|
||||||
|
|
||||||
for _, id := range sourcids {
|
|
||||||
err := database.Edit(fmt.Sprintf(querytempl, destid, id))
|
|
||||||
if err != nil {
|
|
||||||
fmt.Printf("failed to set id from %d to %d\n", id, destid)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
fmt.Printf("Merged %d into %d\n", id, destid)
|
|
||||||
|
|
||||||
// now lets delete this tag
|
|
||||||
query := fmt.Sprintf(`DELETE FROM tags WHERE tag_id=%d`, id)
|
|
||||||
err = database.Edit(query)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Printf("failed to delete Tag %d", id)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,37 +0,0 @@
|
|||||||
package housekeeping
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"openmediacenter/apiGo/database"
|
|
||||||
)
|
|
||||||
|
|
||||||
func deduplicateVideoTags() {
|
|
||||||
// gives first occurence of duplicate
|
|
||||||
query := `
|
|
||||||
SELECT
|
|
||||||
tag_id, video_id, count(tag_id)
|
|
||||||
FROM
|
|
||||||
video_tags
|
|
||||||
GROUP BY tag_id, video_id
|
|
||||||
HAVING COUNT(tag_id) > 1`
|
|
||||||
rows := database.Query(query)
|
|
||||||
if rows != nil {
|
|
||||||
for rows.Next() {
|
|
||||||
var tagid uint32
|
|
||||||
var vidid uint32
|
|
||||||
var nr uint32
|
|
||||||
err := rows.Scan(&tagid, &vidid, &nr)
|
|
||||||
if err != nil {
|
|
||||||
panic(err.Error()) // proper Error handling instead of panic in your app
|
|
||||||
}
|
|
||||||
|
|
||||||
// now lets delete this tag
|
|
||||||
query := fmt.Sprintf(`DELETE FROM video_tags WHERE tag_id=%d AND video_id=%d LIMIT %d`, tagid, vidid, nr-1)
|
|
||||||
err = database.Edit(query)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Printf("failed to delete Tag %d + vid %d", tagid, vidid)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -3,61 +3,71 @@ package main
|
|||||||
import (
|
import (
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
"openmediacenter/apiGo/api"
|
"openmediacenter/apiGo/api"
|
||||||
api2 "openmediacenter/apiGo/api/api"
|
|
||||||
"openmediacenter/apiGo/config"
|
|
||||||
"openmediacenter/apiGo/database"
|
"openmediacenter/apiGo/database"
|
||||||
"openmediacenter/apiGo/housekeeping"
|
settings2 "openmediacenter/apiGo/database/settings"
|
||||||
"openmediacenter/apiGo/static"
|
"openmediacenter/apiGo/static"
|
||||||
"openmediacenter/apiGo/videoparser"
|
"openmediacenter/apiGo/videoparser"
|
||||||
"os"
|
|
||||||
"os/signal"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
fmt.Println("init OpenMediaCenter server")
|
fmt.Println("init OpenMediaCenter server")
|
||||||
const port uint16 = 8081
|
port := 8081
|
||||||
errc := make(chan error, 1)
|
|
||||||
|
|
||||||
housekPTr := flag.Bool("HouseKeeping", false, "Run housekeeping tasks")
|
|
||||||
|
|
||||||
config.Init()
|
|
||||||
|
|
||||||
|
db, verbose, pathPrefix := handleCommandLineArguments()
|
||||||
// todo some verbosity logger or sth
|
// todo some verbosity logger or sth
|
||||||
fmt.Printf("Use verbose output: %t\n", config.GetConfig().General.VerboseLogging)
|
|
||||||
fmt.Printf("Videopath prefix: %s\n", config.GetConfig().General.ReindexPrefix)
|
|
||||||
|
|
||||||
err := database.InitDB()
|
fmt.Printf("Use verbose output: %t\n", verbose)
|
||||||
if err != nil {
|
fmt.Printf("Videopath prefix: %s\n", *pathPrefix)
|
||||||
errc <- err
|
|
||||||
}
|
// set pathprefix in database settings object
|
||||||
|
database.SettingsVideoPrefix = *pathPrefix
|
||||||
|
|
||||||
|
database.InitDB(db)
|
||||||
defer database.Close()
|
defer database.Close()
|
||||||
|
|
||||||
// check if we should run the housekeeping tasks
|
api.AddVideoHandlers()
|
||||||
if *housekPTr {
|
api.AddSettingsHandlers()
|
||||||
housekeeping.RunHouseKeepingTasks()
|
api.AddTagHandlers()
|
||||||
return
|
api.AddActorsHandlers()
|
||||||
}
|
api.AddTvshowHandlers()
|
||||||
|
api.AddPhotoHandlers()
|
||||||
api.AddHandlers()
|
|
||||||
|
|
||||||
videoparser.SetupSettingsWebsocket()
|
videoparser.SetupSettingsWebsocket()
|
||||||
videoparser.InitFileWatcher()
|
|
||||||
|
|
||||||
// add the static files
|
// add the static files
|
||||||
static.ServeStaticFiles()
|
static.ServeStaticFiles()
|
||||||
|
|
||||||
// init api
|
api.ServerInit()
|
||||||
go func() {
|
|
||||||
errc <- api2.ServerInit(port)
|
|
||||||
}()
|
|
||||||
|
|
||||||
sigs := make(chan os.Signal, 1)
|
fmt.Printf("OpenMediacenter server up and running on port %d\n", port)
|
||||||
signal.Notify(sigs, os.Interrupt)
|
log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", port), nil))
|
||||||
select {
|
}
|
||||||
case err := <-errc:
|
|
||||||
fmt.Printf("failed to serve: %v\n", err)
|
func handleCommandLineArguments() (*database.DatabaseConfig, bool, *string) {
|
||||||
case sig := <-sigs:
|
dbhostPtr := flag.String("DBHost", "127.0.0.1", "database host name")
|
||||||
fmt.Printf("terminating server: %v\n", sig)
|
dbPortPtr := flag.Int("DBPort", 3306, "database port")
|
||||||
}
|
dbUserPtr := flag.String("DBUser", "mediacenteruser", "database username")
|
||||||
|
dbPassPtr := flag.String("DBPassword", "mediapassword", "database username")
|
||||||
|
dbNamePtr := flag.String("DBName", "mediacenter", "database name")
|
||||||
|
|
||||||
|
verbosePtr := flag.Bool("v", true, "Verbose log output")
|
||||||
|
|
||||||
|
pathPrefix := flag.String("ReindexPrefix", "/var/www/openmediacenter", "Prefix path for videos to reindex")
|
||||||
|
|
||||||
|
disableTVShowSupport := flag.Bool("DisableTVSupport", false, "Disable the TVShow support and pages")
|
||||||
|
|
||||||
|
flag.Parse()
|
||||||
|
|
||||||
|
settings2.SetTVShowEnabled(!*disableTVShowSupport)
|
||||||
|
|
||||||
|
return &database.DatabaseConfig{
|
||||||
|
DBHost: *dbhostPtr,
|
||||||
|
DBPort: *dbPortPtr,
|
||||||
|
DBUser: *dbUserPtr,
|
||||||
|
DBPassword: *dbPassPtr,
|
||||||
|
DBName: *dbNamePtr,
|
||||||
|
}, *verbosePtr, pathPrefix
|
||||||
}
|
}
|
||||||
|
@ -1,58 +0,0 @@
|
|||||||
package videoparser
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/fsnotify/fsnotify"
|
|
||||||
"log"
|
|
||||||
"openmediacenter/apiGo/config"
|
|
||||||
"openmediacenter/apiGo/database"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
func InitFileWatcher() {
|
|
||||||
watcher, err := fsnotify.NewWatcher()
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("NewWatcher failed: ", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
mSettings, _, _ := database.GetSettings()
|
|
||||||
vidFolder := config.GetConfig().General.ReindexPrefix + mSettings.VideoPath
|
|
||||||
epsfolder := config.GetConfig().General.ReindexPrefix + mSettings.EpisodePath
|
|
||||||
|
|
||||||
defer watcher.Close()
|
|
||||||
go func() {
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case event, ok := <-watcher.Events:
|
|
||||||
if !ok {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// start new reindex
|
|
||||||
// (may be optimized by checking here if added file is video
|
|
||||||
// and start reindex just for one file)
|
|
||||||
if strings.Contains(event.Name, vidFolder) {
|
|
||||||
StartReindex()
|
|
||||||
} else if strings.Contains(event.Name, epsfolder) {
|
|
||||||
StartTVShowReindex()
|
|
||||||
} else {
|
|
||||||
log.Printf("Event in wrong folder: %s %s\n", event.Name, event.Op)
|
|
||||||
}
|
|
||||||
case err, ok := <-watcher.Errors:
|
|
||||||
if !ok {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
log.Println("error:", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}()
|
|
||||||
|
|
||||||
err = watcher.Add(vidFolder)
|
|
||||||
if err != nil {
|
|
||||||
log.Println("Adding of file watcher failed: ", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
err = watcher.Add(epsfolder)
|
|
||||||
if err != nil {
|
|
||||||
log.Println("Adding of file watcher failed: ", err)
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,7 +1,11 @@
|
|||||||
package videoparser
|
package videoparser
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/base64"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"os/exec"
|
||||||
|
"strconv"
|
||||||
)
|
)
|
||||||
|
|
||||||
func AppendMessage(message string) {
|
func AppendMessage(message string) {
|
||||||
@ -29,3 +33,88 @@ func SendEvent(message string) {
|
|||||||
|
|
||||||
IndexSender.Publish(marshal)
|
IndexSender.Publish(marshal)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ext dependency support check
|
||||||
|
func checkExtDependencySupport() *ExtDependencySupport {
|
||||||
|
var extDepsAvailable ExtDependencySupport
|
||||||
|
|
||||||
|
extDepsAvailable.FFMpeg = commandExists("ffmpeg")
|
||||||
|
extDepsAvailable.MediaInfo = commandExists("mediainfo")
|
||||||
|
|
||||||
|
return &extDepsAvailable
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if a specific system command is available
|
||||||
|
func commandExists(cmd string) bool {
|
||||||
|
_, err := exec.LookPath(cmd)
|
||||||
|
return err == nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parse the thumbail picture from video file
|
||||||
|
func parseFFmpegPic(path string) (*string, error) {
|
||||||
|
app := "ffmpeg"
|
||||||
|
|
||||||
|
cmd := exec.Command(app,
|
||||||
|
"-hide_banner",
|
||||||
|
"-loglevel", "panic",
|
||||||
|
"-ss", "00:04:00",
|
||||||
|
"-i", path,
|
||||||
|
"-vframes", "1",
|
||||||
|
"-q:v", "2",
|
||||||
|
"-f", "singlejpeg",
|
||||||
|
"pipe:1")
|
||||||
|
|
||||||
|
stdout, err := cmd.Output()
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err.Error())
|
||||||
|
fmt.Println(string(err.(*exec.ExitError).Stderr))
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
strEncPic := base64.StdEncoding.EncodeToString(stdout)
|
||||||
|
if strEncPic == "" {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
backpic64 := fmt.Sprintf("data:image/jpeg;base64,%s", strEncPic)
|
||||||
|
|
||||||
|
return &backpic64, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getVideoAttributes(path string) *VideoAttributes {
|
||||||
|
app := "mediainfo"
|
||||||
|
|
||||||
|
arg0 := path
|
||||||
|
arg1 := "--Output=JSON"
|
||||||
|
|
||||||
|
cmd := exec.Command(app, arg1, "-f", arg0)
|
||||||
|
stdout, err := cmd.Output()
|
||||||
|
|
||||||
|
var t struct {
|
||||||
|
Media struct {
|
||||||
|
Track []struct {
|
||||||
|
Duration string
|
||||||
|
FileSize string
|
||||||
|
Width string
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
err = json.Unmarshal(stdout, &t)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err.Error())
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
duration, err := strconv.ParseFloat(t.Media.Track[0].Duration, 32)
|
||||||
|
filesize, err := strconv.Atoi(t.Media.Track[0].FileSize)
|
||||||
|
width, err := strconv.Atoi(t.Media.Track[1].Width)
|
||||||
|
|
||||||
|
ret := VideoAttributes{
|
||||||
|
Duration: float32(duration),
|
||||||
|
FileSize: uint(filesize),
|
||||||
|
Width: uint(width),
|
||||||
|
}
|
||||||
|
|
||||||
|
return &ret
|
||||||
|
}
|
||||||
|
@ -25,18 +25,20 @@ func startTVShowReindex(files []Show) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func insertEpisodesIfNotExisting(show Show) {
|
func insertEpisodesIfNotExisting(show Show) {
|
||||||
query := "SELECT filename FROM tvshow_episodes JOIN tvshow t on t.id = tvshow_episodes.tvshow_id WHERE t.name=?"
|
query := "SELECT tvshow_episodes.name, season, episode FROM tvshow_episodes JOIN tvshow t on t.id = tvshow_episodes.tvshow_id WHERE t.name=?"
|
||||||
rows := database.Query(query, show.Name)
|
rows := database.Query(query, show.Name)
|
||||||
|
|
||||||
var dbepisodes []string
|
var dbepisodes []string
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var filename string
|
var epname string
|
||||||
err := rows.Scan(&filename)
|
var season int
|
||||||
|
var episode int
|
||||||
|
err := rows.Scan(&epname, &season, &episode)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err.Error())
|
fmt.Println(err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
dbepisodes = append(dbepisodes, filename)
|
dbepisodes = append(dbepisodes, fmt.Sprintf("%s S%02dE%02d.mp4", epname, season, episode))
|
||||||
}
|
}
|
||||||
|
|
||||||
// get those episodes that are missing in db
|
// get those episodes that are missing in db
|
||||||
@ -81,10 +83,6 @@ VALUES (?, ?, ?, (SELECT tvshow.id FROM tvshow WHERE tvshow.name=?), ?, ?)`
|
|||||||
|
|
||||||
// difference returns the elements in `a` that aren't in `b`.
|
// difference returns the elements in `a` that aren't in `b`.
|
||||||
func difference(a, b []string) []string {
|
func difference(a, b []string) []string {
|
||||||
if b == nil || len(b) == 0 {
|
|
||||||
return a
|
|
||||||
}
|
|
||||||
|
|
||||||
mb := make(map[string]struct{}, len(b))
|
mb := make(map[string]struct{}, len(b))
|
||||||
for _, x := range b {
|
for _, x := range b {
|
||||||
mb[x] = struct{}{}
|
mb[x] = struct{}{}
|
||||||
@ -131,10 +129,7 @@ func getAllTVShows() *[]string {
|
|||||||
var res []string
|
var res []string
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
var show string
|
var show string
|
||||||
err := rows.Scan(&show)
|
rows.Scan(&show)
|
||||||
if err != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
res = append(res, show)
|
res = append(res, show)
|
||||||
}
|
}
|
||||||
|
@ -4,16 +4,15 @@ import (
|
|||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
"openmediacenter/apiGo/api/types"
|
"openmediacenter/apiGo/api/types"
|
||||||
"openmediacenter/apiGo/config"
|
|
||||||
"openmediacenter/apiGo/database"
|
"openmediacenter/apiGo/database"
|
||||||
"openmediacenter/apiGo/videoparser/thumbnail"
|
|
||||||
"openmediacenter/apiGo/videoparser/tmdb"
|
"openmediacenter/apiGo/videoparser/tmdb"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
var mSettings *types.SettingsType
|
var mSettings types.SettingsType
|
||||||
|
var mExtDepsAvailable *ExtDependencySupport
|
||||||
|
|
||||||
// default Tag ids
|
// default Tag ids
|
||||||
const (
|
const (
|
||||||
@ -22,24 +21,31 @@ const (
|
|||||||
LowQuality = 3
|
LowQuality = 3
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type ExtDependencySupport struct {
|
||||||
|
FFMpeg bool
|
||||||
|
MediaInfo bool
|
||||||
|
}
|
||||||
|
|
||||||
type VideoAttributes struct {
|
type VideoAttributes struct {
|
||||||
Duration float32
|
Duration float32
|
||||||
FileSize uint
|
FileSize uint
|
||||||
Width uint
|
Width uint
|
||||||
}
|
}
|
||||||
|
|
||||||
func InitDeps(sett *types.SettingsType) {
|
func ReIndexVideos(path []string, sett types.SettingsType) {
|
||||||
mSettings = sett
|
mSettings = sett
|
||||||
}
|
// check if the extern dependencies are available
|
||||||
|
mExtDepsAvailable = checkExtDependencySupport()
|
||||||
|
fmt.Printf("FFMPEG support: %t\n", mExtDepsAvailable.FFMpeg)
|
||||||
|
fmt.Printf("MediaInfo support: %t\n", mExtDepsAvailable.MediaInfo)
|
||||||
|
|
||||||
func ReIndexVideos(path []string) {
|
|
||||||
// filter out those urls which are already existing in db
|
// filter out those urls which are already existing in db
|
||||||
nonExisting := filterExisting(path)
|
nonExisting := filterExisting(path)
|
||||||
|
|
||||||
fmt.Printf("There are %d videos not existing in db.\n", len(*nonExisting))
|
fmt.Printf("There are %d videos not existing in db.\n", len(*nonExisting))
|
||||||
|
|
||||||
for _, s := range *nonExisting {
|
for _, s := range *nonExisting {
|
||||||
ProcessVideo(s)
|
processVideo(s)
|
||||||
}
|
}
|
||||||
|
|
||||||
AppendMessage("reindex finished successfully!")
|
AppendMessage("reindex finished successfully!")
|
||||||
@ -86,8 +92,8 @@ func filterExisting(paths []string) *[]string {
|
|||||||
return &resultarr
|
return &resultarr
|
||||||
}
|
}
|
||||||
|
|
||||||
func ProcessVideo(fileNameOrig string) {
|
func processVideo(fileNameOrig string) {
|
||||||
fmt.Printf("Processing %s video\n", fileNameOrig)
|
fmt.Printf("Processing %s video-", fileNameOrig)
|
||||||
|
|
||||||
// match the file extension
|
// match the file extension
|
||||||
r := regexp.MustCompile(`\.[a-zA-Z0-9]+$`)
|
r := regexp.MustCompile(`\.[a-zA-Z0-9]+$`)
|
||||||
@ -103,59 +109,59 @@ func ProcessVideo(fileNameOrig string) {
|
|||||||
// add a video to the database
|
// add a video to the database
|
||||||
func addVideo(videoName string, fileName string, year int) {
|
func addVideo(videoName string, fileName string, year int) {
|
||||||
var ppic *string
|
var ppic *string
|
||||||
|
var poster *string
|
||||||
var tmdbData *tmdb.VideoTMDB
|
var tmdbData *tmdb.VideoTMDB
|
||||||
var err error
|
var err error
|
||||||
var insertid int64
|
|
||||||
|
|
||||||
vidFolder := config.GetConfig().General.ReindexPrefix + mSettings.VideoPath
|
// initialize defaults
|
||||||
|
vidAtr := &VideoAttributes{
|
||||||
|
Duration: 0,
|
||||||
|
FileSize: 0,
|
||||||
|
Width: 0,
|
||||||
|
}
|
||||||
|
|
||||||
|
if mExtDepsAvailable.FFMpeg {
|
||||||
|
ppic, err = parseFFmpegPic(mSettings.VideoPath + fileName)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("FFmpeg error occured: %s\n", err.Error())
|
||||||
|
} else {
|
||||||
|
fmt.Println("successfully extracted thumbnail!!")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if mExtDepsAvailable.MediaInfo {
|
||||||
|
atr := getVideoAttributes(mSettings.VideoPath + fileName)
|
||||||
|
if atr != nil {
|
||||||
|
vidAtr = atr
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// if TMDB grabbing is enabled serach in api for video...
|
// if TMDB grabbing is enabled serach in api for video...
|
||||||
if mSettings.TMDBGrabbing {
|
if mSettings.TMDBGrabbing {
|
||||||
tmdbData = tmdb.SearchVideo(videoName, year)
|
tmdbData = tmdb.SearchVideo(videoName, year)
|
||||||
}
|
if tmdbData != nil {
|
||||||
|
// reassign parsed pic as poster
|
||||||
// parse pic from 4min frame
|
poster = ppic
|
||||||
ppic, vinfo, ffmpegErr := thumbnail.Parse(vidFolder+fileName, 240)
|
// and tmdb pic as thumbnail
|
||||||
|
ppic = &tmdbData.Thumbnail
|
||||||
if ffmpegErr == nil {
|
|
||||||
if mSettings.TMDBGrabbing && tmdbData != nil {
|
|
||||||
// inesert fixed pic ratio what we get from tmdb
|
|
||||||
previewRatio := 2 / 3
|
|
||||||
query := `INSERT INTO videos(movie_name,movie_url,poster,thumbnail,quality,previewratio,length,release_date) VALUES (?,?,?,?,?,?,?,?)`
|
|
||||||
err, insertid = database.Insert(query, videoName, fileName, ppic, tmdbData.Thumbnail, vinfo.Width, previewRatio, vinfo.Length, tmdbData.ReleaseDate)
|
|
||||||
} else {
|
|
||||||
previewRatio := float32(vinfo.Height) / float32(vinfo.Width)
|
|
||||||
// insert without tmdb info
|
|
||||||
query := `INSERT INTO videos(movie_name,movie_url,poster,thumbnail,quality,previewratio,length) VALUES (?,?,?,?,?,?,?)`
|
|
||||||
err, insertid = database.Insert(query, videoName, fileName, ppic, ppic, vinfo.Width, previewRatio, vinfo.Length)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
fmt.Printf("FFmpeg error occured: %s\n", ffmpegErr.Error())
|
|
||||||
|
|
||||||
if mSettings.TMDBGrabbing && tmdbData != nil {
|
|
||||||
query := `INSERT INTO videos(movie_name,movie_url,thumbnail,release_date) VALUES (?,?,?,?)`
|
|
||||||
err, insertid = database.Insert(query, videoName, fileName, tmdbData.Thumbnail, tmdbData.ReleaseDate)
|
|
||||||
} else {
|
|
||||||
query := `INSERT INTO videos(movie_name,movie_url) VALUES (?,?)`
|
|
||||||
err, insertid = database.Insert(query, videoName, fileName)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
query := `INSERT INTO videos(movie_name,movie_url,poster,thumbnail,quality,length) VALUES (?,?,?,?,?,?)`
|
||||||
|
err, insertId := database.Insert(query, videoName, fileName, poster, ppic, vidAtr.Width, vidAtr.Duration)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("Failed to insert video into db: %s\n", err.Error())
|
fmt.Printf("Failed to insert video into db: %s\n", err.Error())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if ffmpegErr == nil {
|
|
||||||
// add default tags
|
// add default tags
|
||||||
if vinfo.Width != 0 {
|
if vidAtr.Width != 0 {
|
||||||
insertSizeTag(uint(vinfo.Width), uint(insertid))
|
insertSizeTag(vidAtr.Width, uint(insertId))
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// add tmdb tags
|
// add tmdb tags
|
||||||
if mSettings.TMDBGrabbing && tmdbData != nil {
|
if mSettings.TMDBGrabbing && tmdbData != nil {
|
||||||
insertTMDBTags(tmdbData.GenreIds, insertid)
|
insertTMDBTags(tmdbData.GenreIds, insertId)
|
||||||
}
|
}
|
||||||
|
|
||||||
AppendMessage(fmt.Sprintf("%s - added!", videoName))
|
AppendMessage(fmt.Sprintf("%s - added!", videoName))
|
||||||
@ -217,30 +223,22 @@ func insertTMDBTags(ids []int, videoId int64) {
|
|||||||
|
|
||||||
// now we check if the tag we want to add already exists
|
// now we check if the tag we want to add already exists
|
||||||
tagId := createTagToDB(idGenre.Name)
|
tagId := createTagToDB(idGenre.Name)
|
||||||
if tagId != -1 {
|
|
||||||
// now we add the tag
|
// now we add the tag
|
||||||
query := fmt.Sprintf("INSERT INTO video_tags(video_id,tag_id) VALUES (%d,%d)", videoId, tagId)
|
query := fmt.Sprintf("INSERT INTO video_tags(video_id,tag_id) VALUES (%d,%d)", videoId, tagId)
|
||||||
_ = database.Edit(query)
|
_ = database.Edit(query)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// returns id of tag or creates it if not existing
|
// returns id of tag or creates it if not existing
|
||||||
func createTagToDB(tagName string) int64 {
|
func createTagToDB(tagName string) int64 {
|
||||||
query := "SELECT tag_id FROM tags WHERE tag_name = ?"
|
query := fmt.Sprintf("SELECT tag_id FROM tags WHERE tag_name = %s", tagName)
|
||||||
var id int64 = -1
|
var id int64
|
||||||
err := database.QueryRow(query, tagName).Scan(&id)
|
err := database.QueryRow(query).Scan(&id)
|
||||||
if err == sql.ErrNoRows {
|
if err == sql.ErrNoRows {
|
||||||
// tag doesn't exist -- add it
|
// tag doesn't exist -- add it
|
||||||
query = "INSERT INTO tags (tag_name) VALUES (?)"
|
query = fmt.Sprintf("INSERT INTO tags (tag_name) VALUES (%s)", tagName)
|
||||||
err, id = database.Insert(query, tagName)
|
err, id = database.Insert(query)
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err.Error())
|
|
||||||
}
|
|
||||||
} else if err != nil {
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err.Error())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return id
|
return id
|
||||||
}
|
}
|
||||||
|
@ -3,9 +3,9 @@ package videoparser
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"openmediacenter/apiGo/config"
|
|
||||||
"openmediacenter/apiGo/database"
|
"openmediacenter/apiGo/database"
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -14,55 +14,42 @@ type StatusMessage struct {
|
|||||||
ContentAvailable bool
|
ContentAvailable bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func getVideoTypes() []string {
|
|
||||||
return []string{".mp4", ".mov", ".mkv", ".flv", ".avi", ".mpeg", ".m4v"}
|
|
||||||
}
|
|
||||||
|
|
||||||
func ValidVideoSuffix(filename string) bool {
|
|
||||||
validExts := getVideoTypes()
|
|
||||||
for _, validExt := range validExts {
|
|
||||||
if strings.HasSuffix(filename, validExt) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func StartReindex() bool {
|
func StartReindex() bool {
|
||||||
fmt.Println("starting reindex..")
|
fmt.Println("starting reindex..")
|
||||||
SendEvent("start")
|
SendEvent("start")
|
||||||
AppendMessage("starting reindex..")
|
AppendMessage("starting reindex..")
|
||||||
|
|
||||||
mSettings, _, _ := database.GetSettings()
|
mSettings, PathPrefix, _ := database.GetSettings()
|
||||||
|
|
||||||
// add the path prefix to videopath
|
// add the path prefix to videopath
|
||||||
vidFolder := config.GetConfig().General.ReindexPrefix + mSettings.VideoPath
|
mSettings.VideoPath = PathPrefix + mSettings.VideoPath
|
||||||
|
|
||||||
// check if path even exists
|
// check if path even exists
|
||||||
if _, err := os.Stat(vidFolder); os.IsNotExist(err) {
|
if _, err := os.Stat(mSettings.VideoPath); os.IsNotExist(err) {
|
||||||
fmt.Println("Reindex path doesn't exist!")
|
fmt.Println("Reindex path doesn't exist!")
|
||||||
AppendMessage(fmt.Sprintf("Reindex path doesn't exist! :%s", vidFolder))
|
AppendMessage(fmt.Sprintf("Reindex path doesn't exist! :%s", mSettings.VideoPath))
|
||||||
SendEvent("stop")
|
SendEvent("stop")
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
filelist, err := ioutil.ReadDir(vidFolder)
|
var files []string
|
||||||
|
err := filepath.Walk(mSettings.VideoPath, func(path string, info os.FileInfo, err error) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err.Error())
|
fmt.Println(err.Error())
|
||||||
return false
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
var files []string
|
if !info.IsDir() && strings.HasSuffix(info.Name(), ".mp4") {
|
||||||
for _, file := range filelist {
|
files = append(files, info.Name())
|
||||||
if !file.IsDir() && ValidVideoSuffix(file.Name()) {
|
|
||||||
files = append(files, file.Name())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err.Error())
|
||||||
|
}
|
||||||
// start reindex process
|
// start reindex process
|
||||||
AppendMessage("Starting Reindexing!")
|
AppendMessage("Starting Reindexing!")
|
||||||
InitDeps(&mSettings)
|
go ReIndexVideos(files, mSettings)
|
||||||
go ReIndexVideos(files)
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -117,7 +104,7 @@ func StartTVShowReindex() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, epfile := range episodefiles {
|
for _, epfile := range episodefiles {
|
||||||
if ValidVideoSuffix(epfile.Name()) {
|
if strings.HasSuffix(epfile.Name(), ".mp4") {
|
||||||
elem.files = append(elem.files, epfile.Name())
|
elem.files = append(elem.files, epfile.Name())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
package thumbnail
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/base64"
|
|
||||||
"fmt"
|
|
||||||
)
|
|
||||||
|
|
||||||
type VidInfo struct {
|
|
||||||
Width uint32
|
|
||||||
Height uint32
|
|
||||||
Length uint64
|
|
||||||
FrameRate float32
|
|
||||||
Size int64
|
|
||||||
}
|
|
||||||
|
|
||||||
func EncodeBase64(data *[]byte, mimetype string) *string {
|
|
||||||
strEncPic := base64.StdEncoding.EncodeToString(*data)
|
|
||||||
backpic64 := fmt.Sprintf("data:%s;base64,%s", mimetype, strEncPic)
|
|
||||||
|
|
||||||
return &backpic64
|
|
||||||
|
|
||||||
}
|
|
@ -1,198 +0,0 @@
|
|||||||
// +build sharedffmpeg
|
|
||||||
|
|
||||||
package thumbnail
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"github.com/3d0c/gmf"
|
|
||||||
"io"
|
|
||||||
"log"
|
|
||||||
"os"
|
|
||||||
)
|
|
||||||
|
|
||||||
func Parse(filename string, time uint64) (*string, *VidInfo, error) {
|
|
||||||
dta, inf, err := decodePic(filename, "mjpeg", time)
|
|
||||||
if err == nil && dta != nil {
|
|
||||||
// base64 encode picture
|
|
||||||
enc := EncodeBase64(dta, "image/jpeg")
|
|
||||||
return enc, inf, nil
|
|
||||||
} else {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func decodePic(srcFileName string, encodeExtension string, time uint64) (pic *[]byte, info *VidInfo, err error) {
|
|
||||||
var swsctx *gmf.SwsCtx
|
|
||||||
|
|
||||||
gmf.LogSetLevel(gmf.AV_LOG_PANIC)
|
|
||||||
|
|
||||||
stat, err := os.Stat(srcFileName)
|
|
||||||
if err != nil {
|
|
||||||
// file seems to not even exist
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
fileSize := stat.Size()
|
|
||||||
|
|
||||||
inputCtx, err := gmf.NewInputCtx(srcFileName)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("Error creating context - %s\n", err)
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
defer inputCtx.Free()
|
|
||||||
|
|
||||||
srcVideoStream, err := inputCtx.GetBestStream(gmf.AVMEDIA_TYPE_VIDEO)
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("No video stream found in '%s'\n", srcFileName)
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
encodeCodec, err := gmf.FindEncoder(encodeExtension)
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("%s\n", err)
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
cc := gmf.NewCodecCtx(encodeCodec)
|
|
||||||
defer gmf.Release(cc)
|
|
||||||
|
|
||||||
cc.SetTimeBase(gmf.AVR{Num: 1, Den: 1})
|
|
||||||
|
|
||||||
cc.SetPixFmt(gmf.AV_PIX_FMT_YUVJ444P).SetWidth(srcVideoStream.CodecPar().Width()).SetHeight(srcVideoStream.CodecPar().Height())
|
|
||||||
if encodeCodec.IsExperimental() {
|
|
||||||
cc.SetStrictCompliance(gmf.FF_COMPLIANCE_EXPERIMENTAL)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := cc.Open(nil); err != nil {
|
|
||||||
log.Println(err)
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
defer cc.Free()
|
|
||||||
|
|
||||||
err = inputCtx.SeekFrameAt(int64(time), srcVideoStream.Index())
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("Error while seeking file: %s\n", err.Error())
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// find encodeCodec to decode video
|
|
||||||
decodeCodec, err := gmf.FindDecoder(srcVideoStream.CodecPar().CodecId())
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err)
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
icc := gmf.NewCodecCtx(decodeCodec)
|
|
||||||
defer gmf.Release(icc)
|
|
||||||
|
|
||||||
// copy stream parameters in codeccontext
|
|
||||||
err = srcVideoStream.CodecPar().ToContext(icc)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err.Error())
|
|
||||||
}
|
|
||||||
|
|
||||||
// convert source pix_fmt into AV_PIX_FMT_RGBA
|
|
||||||
if swsctx, err = gmf.NewSwsCtx(icc.Width(), icc.Height(), icc.PixFmt(), cc.Width(), cc.Height(), cc.PixFmt(), gmf.SWS_BICUBIC); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
defer swsctx.Free()
|
|
||||||
|
|
||||||
frameRate := float32(srcVideoStream.GetRFrameRate().AVR().Num) / float32(srcVideoStream.GetRFrameRate().AVR().Den)
|
|
||||||
inf := VidInfo{
|
|
||||||
Width: uint32(icc.Width()),
|
|
||||||
Height: uint32(icc.Height()),
|
|
||||||
FrameRate: frameRate,
|
|
||||||
Length: uint64(inputCtx.Duration()),
|
|
||||||
Size: fileSize,
|
|
||||||
}
|
|
||||||
|
|
||||||
info = &inf
|
|
||||||
|
|
||||||
var (
|
|
||||||
pkt *gmf.Packet
|
|
||||||
frames []*gmf.Frame
|
|
||||||
drain int = -1
|
|
||||||
frameCount int = 0
|
|
||||||
)
|
|
||||||
|
|
||||||
for {
|
|
||||||
if drain >= 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
pkt, err = inputCtx.GetNextPacket()
|
|
||||||
if err != nil && err != io.EOF {
|
|
||||||
if pkt != nil {
|
|
||||||
pkt.Free()
|
|
||||||
}
|
|
||||||
log.Printf("error getting next packet - %s", err)
|
|
||||||
break
|
|
||||||
} else if err != nil && pkt == nil {
|
|
||||||
drain = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
if pkt != nil && pkt.StreamIndex() != srcVideoStream.Index() {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
frames, err = srcVideoStream.CodecCtx().Decode(pkt)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("Fatal error during decoding - %s\n", err)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
// Decode() method doesn't treat EAGAIN and EOF as errors
|
|
||||||
// it returns empty frames slice instead. Countinue until
|
|
||||||
// input EOF or frames received.
|
|
||||||
if len(frames) == 0 && drain < 0 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if frames, err = gmf.DefaultRescaler(swsctx, frames); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
packets, err := cc.Encode(frames, drain)
|
|
||||||
if len(packets) == 0 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
picdata := packets[0].Data()
|
|
||||||
pic = &picdata
|
|
||||||
|
|
||||||
// cleanup here
|
|
||||||
for _, p := range packets {
|
|
||||||
p.Free()
|
|
||||||
}
|
|
||||||
|
|
||||||
for i := range frames {
|
|
||||||
frames[i].Free()
|
|
||||||
frameCount++
|
|
||||||
}
|
|
||||||
|
|
||||||
if pkt != nil {
|
|
||||||
pkt.Free()
|
|
||||||
pkt = nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// we only want to encode first picture then exit
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
for i := 0; i < inputCtx.StreamsCnt(); i++ {
|
|
||||||
st, err := inputCtx.GetStream(i)
|
|
||||||
if err == nil && st != nil {
|
|
||||||
st.Free()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
icc.Free()
|
|
||||||
srcVideoStream.Free()
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
@ -1,130 +0,0 @@
|
|||||||
// +build !sharedffmpeg
|
|
||||||
|
|
||||||
package thumbnail
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"os/exec"
|
|
||||||
"strconv"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ExtDependencySupport struct {
|
|
||||||
FFMpeg bool
|
|
||||||
MediaInfo bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func Parse(filename string, time uint64) (*string, *VidInfo, error) {
|
|
||||||
// check if the extern dependencies are available
|
|
||||||
mExtDepsAvailable := checkExtDependencySupport()
|
|
||||||
fmt.Printf("FFMPEG support: %t\n", mExtDepsAvailable.FFMpeg)
|
|
||||||
fmt.Printf("MediaInfo support: %t\n", mExtDepsAvailable.MediaInfo)
|
|
||||||
|
|
||||||
var pic *string = nil
|
|
||||||
var info *VidInfo = nil
|
|
||||||
|
|
||||||
if mExtDepsAvailable.FFMpeg {
|
|
||||||
p, err := parseFFmpegPic(filename, time)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
pic = EncodeBase64(p, "image/jpeg")
|
|
||||||
}
|
|
||||||
|
|
||||||
if mExtDepsAvailable.MediaInfo {
|
|
||||||
i, err := getVideoAttributes(filename)
|
|
||||||
if err != nil {
|
|
||||||
return nil, nil, err
|
|
||||||
}
|
|
||||||
info = i
|
|
||||||
}
|
|
||||||
return pic, info, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// check if a specific system command is available
|
|
||||||
func commandExists(cmd string) bool {
|
|
||||||
_, err := exec.LookPath(cmd)
|
|
||||||
return err == nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ext dependency support check
|
|
||||||
func checkExtDependencySupport() *ExtDependencySupport {
|
|
||||||
var extDepsAvailable ExtDependencySupport
|
|
||||||
|
|
||||||
extDepsAvailable.FFMpeg = commandExists("ffmpeg")
|
|
||||||
extDepsAvailable.MediaInfo = commandExists("mediainfo")
|
|
||||||
|
|
||||||
return &extDepsAvailable
|
|
||||||
}
|
|
||||||
|
|
||||||
func secToString(time uint64) string {
|
|
||||||
return fmt.Sprintf("%02d:%02d:%02d", time/3600, (time/60)%60, time%60)
|
|
||||||
}
|
|
||||||
|
|
||||||
// parse the thumbail picture from video file
|
|
||||||
func parseFFmpegPic(path string, time uint64) (*[]byte, error) {
|
|
||||||
app := "ffmpeg"
|
|
||||||
|
|
||||||
cmd := exec.Command(app,
|
|
||||||
"-hide_banner",
|
|
||||||
"-loglevel", "panic",
|
|
||||||
"-ss", secToString(time),
|
|
||||||
"-i", path,
|
|
||||||
"-vframes", "1",
|
|
||||||
"-q:v", "2",
|
|
||||||
"-f", "singlejpeg",
|
|
||||||
"pipe:1")
|
|
||||||
|
|
||||||
stdout, err := cmd.Output()
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err.Error())
|
|
||||||
fmt.Println(string(err.(*exec.ExitError).Stderr))
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return &stdout, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getVideoAttributes(path string) (*VidInfo, error) {
|
|
||||||
app := "mediainfo"
|
|
||||||
|
|
||||||
arg0 := path
|
|
||||||
arg1 := "--Output=JSON"
|
|
||||||
|
|
||||||
cmd := exec.Command(app, arg1, "-f", arg0)
|
|
||||||
stdout, err := cmd.Output()
|
|
||||||
|
|
||||||
var t struct {
|
|
||||||
Media struct {
|
|
||||||
Track []struct {
|
|
||||||
Duration string
|
|
||||||
FileSize string
|
|
||||||
Width string
|
|
||||||
Height string
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
err = json.Unmarshal(stdout, &t)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
duration, err := strconv.ParseFloat(t.Media.Track[0].Duration, 32)
|
|
||||||
filesize, err := strconv.Atoi(t.Media.Track[0].FileSize)
|
|
||||||
width, err := strconv.Atoi(t.Media.Track[1].Width)
|
|
||||||
height, err := strconv.Atoi(t.Media.Track[1].Height)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
ret := VidInfo{
|
|
||||||
Length: uint64(duration),
|
|
||||||
Size: int64(filesize),
|
|
||||||
Width: uint32(width),
|
|
||||||
Height: uint32(height),
|
|
||||||
FrameRate: 0,
|
|
||||||
}
|
|
||||||
|
|
||||||
return &ret, nil
|
|
||||||
}
|
|
@ -18,7 +18,6 @@ type VideoTMDB struct {
|
|||||||
Thumbnail string
|
Thumbnail string
|
||||||
Overview string
|
Overview string
|
||||||
Title string
|
Title string
|
||||||
ReleaseDate string
|
|
||||||
GenreIds []int
|
GenreIds []int
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -124,7 +123,6 @@ cont:
|
|||||||
Thumbnail: thumbnail,
|
Thumbnail: thumbnail,
|
||||||
Overview: tmdbVid.Overview,
|
Overview: tmdbVid.Overview,
|
||||||
Title: tmdbVid.Title,
|
Title: tmdbVid.Title,
|
||||||
ReleaseDate: tmdbVid.ReleaseDate,
|
|
||||||
GenreIds: tmdbVid.GenreIds,
|
GenreIds: tmdbVid.GenreIds,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -207,14 +205,10 @@ func fetchGenres() *[]TMDBGenre {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
type RespType struct {
|
var t []TMDBGenre
|
||||||
Genres []TMDBGenre
|
|
||||||
}
|
|
||||||
|
|
||||||
var t RespType
|
|
||||||
err = json.Unmarshal(body, &t)
|
err = json.Unmarshal(body, &t)
|
||||||
|
|
||||||
return &t.Genres
|
return &t
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetGenres() *[]TMDBGenre {
|
func GetGenres() *[]TMDBGenre {
|
||||||
|
@ -56,8 +56,8 @@ create table if not exists videos
|
|||||||
thumbnail mediumblob null,
|
thumbnail mediumblob null,
|
||||||
poster mediumblob null,
|
poster mediumblob null,
|
||||||
likes int default 0 null,
|
likes int default 0 null,
|
||||||
quality int default 0 null,
|
quality int null,
|
||||||
length int default 0 null comment 'in seconds',
|
length int null comment 'in seconds',
|
||||||
create_date datetime default current_timestamp() null
|
create_date datetime default current_timestamp() null
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
Package: OpenMediaCenter
|
Package: OpenMediaCenter
|
||||||
Depends: nginx, mariadb-server, libffmpeg-ocaml
|
Depends: nginx, mariadb-server, mediainfo
|
||||||
Section: web
|
Section: web
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Architecture: all
|
Architecture: all
|
||||||
|
@ -6,6 +6,10 @@ ln -sf /etc/nginx/sites-available/OpenMediaCenter.conf /etc/nginx/sites-enabled/
|
|||||||
mysql -uroot -pPASS -e "CREATE DATABASE IF NOT EXISTS mediacenter;"
|
mysql -uroot -pPASS -e "CREATE DATABASE IF NOT EXISTS mediacenter;"
|
||||||
mysql -uroot -pPASS -e "CREATE USER IF NOT EXISTS 'mediacenteruser'@'localhost' IDENTIFIED BY 'mediapassword';"
|
mysql -uroot -pPASS -e "CREATE USER IF NOT EXISTS 'mediacenteruser'@'localhost' IDENTIFIED BY 'mediapassword';"
|
||||||
mysql -uroot -pPASS -e "GRANT ALL PRIVILEGES ON mediacenter . * TO 'mediacenteruser'@'localhost';"
|
mysql -uroot -pPASS -e "GRANT ALL PRIVILEGES ON mediacenter . * TO 'mediacenteruser'@'localhost';"
|
||||||
|
mysql -u mediacenteruser -pmediapassword mediacenter < /tmp/openmediacenter.sql
|
||||||
|
|
||||||
|
# removed unused sql style file
|
||||||
|
rm /tmp/openmediacenter.sql
|
||||||
|
|
||||||
# correct user rights
|
# correct user rights
|
||||||
chown -R www-data:www-data /var/www/openmediacenter
|
chown -R www-data:www-data /var/www/openmediacenter
|
||||||
|
@ -13,8 +13,7 @@ server {
|
|||||||
try_files $uri /index.html;
|
try_files $uri /index.html;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~* ^/(api) {
|
location ~* ^/(api/|token) {
|
||||||
client_max_body_size 10G;
|
|
||||||
proxy_pass http://127.0.0.1:8081;
|
proxy_pass http://127.0.0.1:8081;
|
||||||
}
|
}
|
||||||
location /subscribe {
|
location /subscribe {
|
||||||
|
1
declaration.d.ts
vendored
1
declaration.d.ts
vendored
@ -1 +1,2 @@
|
|||||||
declare module '*.css';
|
declare module '*.css';
|
||||||
|
declare module 'pro-gallery';
|
||||||
|
35
package.json
35
package.json
@ -12,21 +12,22 @@
|
|||||||
"@fortawesome/free-regular-svg-icons": "^5.15.1",
|
"@fortawesome/free-regular-svg-icons": "^5.15.1",
|
||||||
"@fortawesome/free-solid-svg-icons": "^5.15.1",
|
"@fortawesome/free-solid-svg-icons": "^5.15.1",
|
||||||
"@fortawesome/react-fontawesome": "^0.1.13",
|
"@fortawesome/react-fontawesome": "^0.1.13",
|
||||||
"bootstrap": "^5.0.2",
|
"bootstrap": "^5.0.1",
|
||||||
"plyr-react": "^3.0.7",
|
"plyr-react": "^3.0.7",
|
||||||
|
"pro-gallery": "^4.0.4",
|
||||||
"react": "^17.0.1",
|
"react": "^17.0.1",
|
||||||
"react-bootstrap": "^1.4.0",
|
"react-bootstrap": "^1.4.0",
|
||||||
"react-dom": "^17.0.1",
|
"react-dom": "^17.0.1",
|
||||||
"react-router": "^5.2.0",
|
"react-router": "^5.2.0",
|
||||||
"react-router-dom": "^5.2.0",
|
"react-router-dom": "^5.2.0",
|
||||||
"typescript": "^4.3.5"
|
"typescript": "^4.1.3"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "react-scripts start",
|
"start": "react-scripts start",
|
||||||
"build": "CI=false react-scripts build",
|
"build": "CI=false react-scripts build",
|
||||||
"test": "CI=true react-scripts test --reporters=jest-junit --verbose --silent --coverage --reporters=default",
|
"test": "CI=true react-scripts test --reporters=jest-junit --verbose --silent --coverage --reporters=default",
|
||||||
"lint": "eslint --format gitlab src/",
|
"lint": "eslint --format gitlab src/",
|
||||||
"apidoc": "apidoc --single -i apiGo/ -o doc/"
|
"apidoc": "apidoc -i apiGo/ -o doc/"
|
||||||
},
|
},
|
||||||
"jest": {
|
"jest": {
|
||||||
"collectCoverageFrom": [
|
"collectCoverageFrom": [
|
||||||
@ -53,30 +54,30 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@testing-library/jest-dom": "^5.14.1",
|
"@testing-library/jest-dom": "^5.11.6",
|
||||||
"@testing-library/react": "^12.0.0",
|
"@testing-library/react": "^11.2.2",
|
||||||
"@testing-library/user-event": "^13.2.1",
|
"@testing-library/user-event": "^13.1.9",
|
||||||
"@types/jest": "^26.0.24",
|
"@types/jest": "^26.0.19",
|
||||||
"@types/node": "^16.4.7",
|
"@types/node": "^15.12.2",
|
||||||
"@types/react": "^17.0.15",
|
"@types/react": "^17.0.2",
|
||||||
"@types/react-dom": "^17.0.9",
|
"@types/react-dom": "^17.0.1",
|
||||||
"@types/react-router": "5.1.16",
|
"@types/react-router": "5.1.15",
|
||||||
"@types/react-router-dom": "^5.1.8",
|
"@types/react-router-dom": "^5.1.6",
|
||||||
"@typescript-eslint/eslint-plugin": "^4.28.5",
|
"@typescript-eslint/eslint-plugin": "^4.17.0",
|
||||||
"@typescript-eslint/parser": "^4.28.5",
|
"@typescript-eslint/parser": "^4.17.0",
|
||||||
"apidoc": "^0.28.1",
|
"apidoc": "^0.28.1",
|
||||||
"enzyme": "^3.11.0",
|
"enzyme": "^3.11.0",
|
||||||
"enzyme-adapter-react-16": "^1.15.5",
|
"enzyme-adapter-react-16": "^1.15.5",
|
||||||
"eslint": "^7.31.0",
|
"eslint": "^7.22.0",
|
||||||
"eslint-config-prettier": "^8.1.0",
|
"eslint-config-prettier": "^8.1.0",
|
||||||
"eslint-formatter-gitlab": "^2.2.0",
|
"eslint-formatter-gitlab": "^2.2.0",
|
||||||
"eslint-plugin-eslint-comments": "^3.2.0",
|
"eslint-plugin-eslint-comments": "^3.2.0",
|
||||||
"eslint-plugin-jest": "^24.4.0",
|
"eslint-plugin-jest": "^24.3.1",
|
||||||
"eslint-plugin-prettier": "^3.3.1",
|
"eslint-plugin-prettier": "^3.3.1",
|
||||||
"eslint-plugin-react": "^7.22.0",
|
"eslint-plugin-react": "^7.22.0",
|
||||||
"eslint-plugin-react-hooks": "^4.2.0",
|
"eslint-plugin-react-hooks": "^4.2.0",
|
||||||
"jest-junit": "^12.0.0",
|
"jest-junit": "^12.0.0",
|
||||||
"prettier": "^2.3.2",
|
"prettier": "^2.2.1",
|
||||||
"prettier-config": "^1.0.0",
|
"prettier-config": "^1.0.0",
|
||||||
"react-scripts": "4.0.3"
|
"react-scripts": "4.0.3"
|
||||||
},
|
},
|
||||||
|
@ -2,7 +2,6 @@ import React from 'react';
|
|||||||
import App from './App';
|
import App from './App';
|
||||||
import {shallow} from 'enzyme';
|
import {shallow} from 'enzyme';
|
||||||
import GlobalInfos from "./utils/GlobalInfos";
|
import GlobalInfos from "./utils/GlobalInfos";
|
||||||
import {LoginContext} from './utils/context/LoginContext';
|
|
||||||
|
|
||||||
describe('<App/>', function () {
|
describe('<App/>', function () {
|
||||||
it('renders without crashing ', function () {
|
it('renders without crashing ', function () {
|
||||||
@ -19,9 +18,31 @@ describe('<App/>', function () {
|
|||||||
it('are navlinks correct', function () {
|
it('are navlinks correct', function () {
|
||||||
const wrapper = shallow(<App/>);
|
const wrapper = shallow(<App/>);
|
||||||
wrapper.setState({password: false});
|
wrapper.setState({password: false});
|
||||||
|
expect(wrapper.find('.navitem')).toHaveLength(4);
|
||||||
|
|
||||||
|
GlobalInfos.setTVShowsEnabled(true);
|
||||||
|
|
||||||
|
wrapper.instance().forceUpdate();
|
||||||
expect(wrapper.find('.navitem')).toHaveLength(5);
|
expect(wrapper.find('.navitem')).toHaveLength(5);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('test initial fetch from api', done => {
|
||||||
|
callAPIMock({
|
||||||
|
MediacenterName: 'testname'
|
||||||
|
})
|
||||||
|
|
||||||
|
GlobalInfos.enableDarkTheme = jest.fn((r) => {})
|
||||||
|
|
||||||
|
const wrapper = shallow(<App/>);
|
||||||
|
|
||||||
|
process.nextTick(() => {
|
||||||
|
expect(document.title).toBe('testname');
|
||||||
|
|
||||||
|
global.fetch.mockClear();
|
||||||
|
done();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it('test render of password page', function () {
|
it('test render of password page', function () {
|
||||||
const wrapper = shallow(<App/>);
|
const wrapper = shallow(<App/>);
|
||||||
wrapper.setState({password: true});
|
wrapper.setState({password: true});
|
||||||
|
177
src/App.tsx
177
src/App.tsx
@ -1,4 +1,4 @@
|
|||||||
import React, {useContext} from 'react';
|
import React from 'react';
|
||||||
import HomePage from './pages/HomePage/HomePage';
|
import HomePage from './pages/HomePage/HomePage';
|
||||||
import RandomPage from './pages/RandomPage/RandomPage';
|
import RandomPage from './pages/RandomPage/RandomPage';
|
||||||
import GlobalInfos from './utils/GlobalInfos';
|
import GlobalInfos from './utils/GlobalInfos';
|
||||||
@ -9,18 +9,22 @@ import style from './App.module.css';
|
|||||||
|
|
||||||
import SettingsPage from './pages/SettingsPage/SettingsPage';
|
import SettingsPage from './pages/SettingsPage/SettingsPage';
|
||||||
import CategoryPage from './pages/CategoryPage/CategoryPage';
|
import CategoryPage from './pages/CategoryPage/CategoryPage';
|
||||||
|
import {APINode, callAPI} from './utils/Api';
|
||||||
|
|
||||||
import {NavLink, Route, Switch, useRouteMatch} from 'react-router-dom';
|
import {BrowserRouter as Router, NavLink, Route, Switch} from 'react-router-dom';
|
||||||
import Player from './pages/Player/Player';
|
import Player from './pages/Player/Player';
|
||||||
import ActorOverviewPage from './pages/ActorOverviewPage/ActorOverviewPage';
|
import ActorOverviewPage from './pages/ActorOverviewPage/ActorOverviewPage';
|
||||||
import ActorPage from './pages/ActorPage/ActorPage';
|
import ActorPage from './pages/ActorPage/ActorPage';
|
||||||
|
import {SettingsTypes} from './types/ApiTypes';
|
||||||
import AuthenticationPage from './pages/AuthenticationPage/AuthenticationPage';
|
import AuthenticationPage from './pages/AuthenticationPage/AuthenticationPage';
|
||||||
import TVShowPage from './pages/TVShowPage/TVShowPage';
|
import TVShowPage from './pages/TVShowPage/TVShowPage';
|
||||||
import TVPlayer from './pages/TVShowPage/TVPlayer';
|
import TVPlayer from './pages/TVShowPage/TVPlayer';
|
||||||
import {LoginContextProvider} from './utils/context/LoginContextProvider';
|
import {CookieTokenStore} from './utils/TokenStore/CookieTokenStore';
|
||||||
import {FeatureContext} from './utils/context/FeatureContext';
|
import {token} from './utils/TokenHandler';
|
||||||
|
import {PhotoPage} from './pages/PhotoPage/PhotoPage';
|
||||||
|
|
||||||
interface state {
|
interface state {
|
||||||
|
password: boolean | null; // null if uninitialized - true if pwd needed false if not needed
|
||||||
mediacentername: string;
|
mediacentername: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -31,36 +35,100 @@ class App extends React.Component<{}, state> {
|
|||||||
constructor(props: {}) {
|
constructor(props: {}) {
|
||||||
super(props);
|
super(props);
|
||||||
|
|
||||||
|
token.init(new CookieTokenStore());
|
||||||
|
|
||||||
|
let pwdneeded: boolean | null = null;
|
||||||
|
|
||||||
|
if (token.apiTokenValid()) {
|
||||||
|
pwdneeded = false;
|
||||||
|
} else {
|
||||||
|
token.refreshAPIToken((err) => {
|
||||||
|
if (err === 'invalid_client') {
|
||||||
|
this.setState({password: true});
|
||||||
|
} else if (err === '') {
|
||||||
|
this.setState({password: false});
|
||||||
|
} else {
|
||||||
|
console.log('unimplemented token error: ' + err);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
this.state = {
|
this.state = {
|
||||||
mediacentername: 'OpenMediaCenter'
|
mediacentername: 'OpenMediaCenter',
|
||||||
|
password: pwdneeded
|
||||||
};
|
};
|
||||||
|
|
||||||
// force an update on theme change
|
// force an update on theme change
|
||||||
GlobalInfos.onThemeChange(() => {
|
GlobalInfos.onThemeChange(() => {
|
||||||
this.forceUpdate();
|
this.forceUpdate();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// set the hook to load passwordfield on global func call
|
||||||
|
GlobalInfos.loadPasswordPage = (callback?: () => void): void => {
|
||||||
|
// try refreshing the token
|
||||||
|
token.refreshAPIToken((err) => {
|
||||||
|
if (err !== '') {
|
||||||
|
this.setState({password: true});
|
||||||
|
} else {
|
||||||
|
// call callback if request was successful
|
||||||
|
if (callback) {
|
||||||
|
callback();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, true);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
initialAPICall(): void {
|
||||||
|
// this is the first api call so if it fails we know there is no connection to backend
|
||||||
|
callAPI(APINode.Settings, {action: 'loadInitialData'}, (result: SettingsTypes.initialApiCallData) => {
|
||||||
|
// set theme
|
||||||
|
GlobalInfos.enableDarkTheme(result.DarkMode);
|
||||||
|
|
||||||
|
GlobalInfos.setVideoPaths(result.VideoPath, result.TVShowPath);
|
||||||
|
|
||||||
|
GlobalInfos.setTVShowsEnabled(result.TVShowEnabled);
|
||||||
|
|
||||||
|
this.setState({
|
||||||
|
mediacentername: result.MediacenterName
|
||||||
|
});
|
||||||
|
// set tab title to received mediacenter name
|
||||||
|
document.title = result.MediacenterName;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidMount(): void {
|
||||||
|
this.initialAPICall();
|
||||||
}
|
}
|
||||||
|
|
||||||
render(): JSX.Element {
|
render(): JSX.Element {
|
||||||
// add the main theme to the page body
|
// add the main theme to the page body
|
||||||
document.body.className = GlobalInfos.getThemeStyle().backgroundcolor;
|
document.body.className = GlobalInfos.getThemeStyle().backgroundcolor;
|
||||||
|
|
||||||
|
if (this.state.password === true) {
|
||||||
|
// render authentication page if auth is neccessary
|
||||||
return (
|
return (
|
||||||
<LoginContextProvider>
|
<AuthenticationPage
|
||||||
<Switch>
|
onSuccessLogin={(): void => {
|
||||||
<Route path='/login'>
|
this.setState({password: false});
|
||||||
<AuthenticationPage />
|
// reinit general infos
|
||||||
</Route>
|
this.initialAPICall();
|
||||||
<Route path='/media'>
|
}}
|
||||||
{this.navBar()}
|
/>
|
||||||
<MyRouter />
|
|
||||||
</Route>
|
|
||||||
</Switch>
|
|
||||||
</LoginContextProvider>
|
|
||||||
);
|
);
|
||||||
|
} else if (this.state.password === false) {
|
||||||
|
return (
|
||||||
|
<Router>
|
||||||
|
<div className={style.app}>
|
||||||
|
{this.navBar()}
|
||||||
|
{this.routing()}
|
||||||
|
</div>
|
||||||
|
</Router>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return <>still loading...</>;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static contextType = FeatureContext;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* render the top navigation bar
|
* render the top navigation bar
|
||||||
@ -71,92 +139,81 @@ class App extends React.Component<{}, state> {
|
|||||||
return (
|
return (
|
||||||
<div className={[style.navcontainer, themeStyle.backgroundcolor, themeStyle.textcolor, themeStyle.hrcolor].join(' ')}>
|
<div className={[style.navcontainer, themeStyle.backgroundcolor, themeStyle.textcolor, themeStyle.hrcolor].join(' ')}>
|
||||||
<div className={style.navbrand}>{this.state.mediacentername}</div>
|
<div className={style.navbrand}>{this.state.mediacentername}</div>
|
||||||
<NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/media'} activeStyle={{opacity: '0.85'}}>
|
<NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/'} activeStyle={{opacity: '0.85'}}>
|
||||||
Home
|
Home
|
||||||
</NavLink>
|
</NavLink>
|
||||||
<NavLink
|
<NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/random'} activeStyle={{opacity: '0.85'}}>
|
||||||
className={[style.navitem, themeStyle.navitem].join(' ')}
|
|
||||||
to={'/media/random'}
|
|
||||||
activeStyle={{opacity: '0.85'}}>
|
|
||||||
Random Video
|
Random Video
|
||||||
</NavLink>
|
</NavLink>
|
||||||
|
|
||||||
<NavLink
|
<NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/categories'} activeStyle={{opacity: '0.85'}}>
|
||||||
className={[style.navitem, themeStyle.navitem].join(' ')}
|
|
||||||
to={'/media/categories'}
|
|
||||||
activeStyle={{opacity: '0.85'}}>
|
|
||||||
Categories
|
Categories
|
||||||
</NavLink>
|
</NavLink>
|
||||||
|
|
||||||
<NavLink
|
{GlobalInfos.isTVShowEnabled() ? (
|
||||||
className={[style.navitem, themeStyle.navitem].join(' ')}
|
<NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/tvshows'} activeStyle={{opacity: '0.85'}}>
|
||||||
to={'/media/actors'}
|
|
||||||
activeStyle={{opacity: '0.85'}}>
|
|
||||||
Actors
|
|
||||||
</NavLink>
|
|
||||||
|
|
||||||
{this.context.TVShowEnabled ? (
|
|
||||||
<NavLink
|
|
||||||
className={[style.navitem, themeStyle.navitem].join(' ')}
|
|
||||||
to={'/media/tvshows'}
|
|
||||||
activeStyle={{opacity: '0.85'}}>
|
|
||||||
TV Shows
|
TV Shows
|
||||||
</NavLink>
|
</NavLink>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
||||||
<NavLink
|
<NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/photos'} activeStyle={{opacity: '0.85'}}>
|
||||||
className={[style.navitem, themeStyle.navitem].join(' ')}
|
Photos
|
||||||
to={'/media/settings'}
|
</NavLink>
|
||||||
activeStyle={{opacity: '0.85'}}>
|
|
||||||
|
<NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/settings'} activeStyle={{opacity: '0.85'}}>
|
||||||
Settings
|
Settings
|
||||||
</NavLink>
|
</NavLink>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
const MyRouter = (): JSX.Element => {
|
|
||||||
const match = useRouteMatch();
|
|
||||||
const features = useContext(FeatureContext);
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* render the react router elements
|
||||||
|
*/
|
||||||
|
routing(): JSX.Element {
|
||||||
return (
|
return (
|
||||||
<Switch>
|
<Switch>
|
||||||
<Route exact path={`${match.url}/random`}>
|
<Route path='/random'>
|
||||||
<RandomPage />
|
<RandomPage />
|
||||||
</Route>
|
</Route>
|
||||||
<Route path={`${match.url}/categories`}>
|
<Route path='/categories'>
|
||||||
<CategoryPage />
|
<CategoryPage />
|
||||||
</Route>
|
</Route>
|
||||||
<Route path={`${match.url}/settings`}>
|
<Route path='/settings'>
|
||||||
<SettingsPage />
|
<SettingsPage />
|
||||||
</Route>
|
</Route>
|
||||||
<Route exact path={`${match.url}/player/:id`}>
|
<Route exact path='/player/:id'>
|
||||||
<Player />
|
<Player />
|
||||||
</Route>
|
</Route>
|
||||||
<Route exact path={`${match.url}/actors`}>
|
<Route exact path='/actors'>
|
||||||
<ActorOverviewPage />
|
<ActorOverviewPage />
|
||||||
</Route>
|
</Route>
|
||||||
<Route exact path={`${match.url}/actors/:id`}>
|
<Route path='/actors/:id'>
|
||||||
<ActorPage />
|
<ActorPage />
|
||||||
</Route>
|
</Route>
|
||||||
|
|
||||||
{features.TVShowEnabled ? (
|
{GlobalInfos.isTVShowEnabled() ? (
|
||||||
<Route path={`${match.url}/tvshows`}>
|
<Route path='/tvshows'>
|
||||||
<TVShowPage />
|
<TVShowPage />
|
||||||
</Route>
|
</Route>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
||||||
{features.TVShowEnabled ? (
|
{GlobalInfos.isTVShowEnabled() ? (
|
||||||
<Route exact path={`${match.url}/tvplayer/:id`}>
|
<Route exact path='/tvplayer/:id'>
|
||||||
<TVPlayer />
|
<TVPlayer />
|
||||||
</Route>
|
</Route>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
||||||
<Route path={`${match.url}/`}>
|
<Route exact path='/photos'>
|
||||||
|
<PhotoPage />
|
||||||
|
</Route>
|
||||||
|
|
||||||
|
<Route path='/'>
|
||||||
<HomePage />
|
<HomePage />
|
||||||
</Route>
|
</Route>
|
||||||
</Switch>
|
</Switch>
|
||||||
);
|
);
|
||||||
};
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export default App;
|
export default App;
|
||||||
|
@ -21,7 +21,7 @@ class ActorTile extends React.Component<Props> {
|
|||||||
if (this.props.onClick) {
|
if (this.props.onClick) {
|
||||||
return this.renderActorTile(this.props.onClick);
|
return this.renderActorTile(this.props.onClick);
|
||||||
} else {
|
} else {
|
||||||
return <Link to={{pathname: '/media/actors/' + this.props.actor.ActorId}}>{this.renderActorTile(() => {})}</Link>;
|
return <Link to={{pathname: '/actors/' + this.props.actor.ActorId}}>{this.renderActorTile(() => {})}</Link>;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,30 +0,0 @@
|
|||||||
.dropArea {
|
|
||||||
border: 2px dashed #ccc;
|
|
||||||
border-radius: 20px;
|
|
||||||
width: 480px;
|
|
||||||
font-family: sans-serif;
|
|
||||||
padding: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dropArea:hover {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dropArea.highlight {
|
|
||||||
border-color: purple;
|
|
||||||
}
|
|
||||||
|
|
||||||
.myForm {
|
|
||||||
margin-bottom: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.progresswrapper {
|
|
||||||
width: 100%;
|
|
||||||
height: 5px;
|
|
||||||
margin-top: 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.finished {
|
|
||||||
margin-top: 10px;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
@ -1,108 +0,0 @@
|
|||||||
import style from './DropZone.module.css';
|
|
||||||
import React, {useState} from 'react';
|
|
||||||
import {cookie} from '../../utils/context/Cookie';
|
|
||||||
import GlobalInfos from '../../utils/GlobalInfos';
|
|
||||||
|
|
||||||
export const DropZone = (): JSX.Element => {
|
|
||||||
const [ondrag, setDrag] = useState(0);
|
|
||||||
const [percent, setpercent] = useState(0.0);
|
|
||||||
const [finished, setfinished] = useState<string | null>(null);
|
|
||||||
|
|
||||||
const theme = GlobalInfos.getThemeStyle();
|
|
||||||
|
|
||||||
const uploadFile = (f: FileList): void => {
|
|
||||||
const xhr = new XMLHttpRequest(); // create XMLHttpRequest
|
|
||||||
const data = new FormData(); // create formData object
|
|
||||||
|
|
||||||
for (let i = 0; i < f.length; i++) {
|
|
||||||
const file = f.item(i);
|
|
||||||
if (file) {
|
|
||||||
data.append('file' + i, file);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
xhr.onload = function (): void {
|
|
||||||
console.log(this.responseText); // whatever the server returns
|
|
||||||
|
|
||||||
const resp = JSON.parse(this.responseText);
|
|
||||||
if (resp.Message === 'finished all files') {
|
|
||||||
setfinished('');
|
|
||||||
} else {
|
|
||||||
setfinished(resp.Message);
|
|
||||||
}
|
|
||||||
|
|
||||||
setTimeout(() => {
|
|
||||||
setpercent(0);
|
|
||||||
setfinished(null);
|
|
||||||
}, 2000);
|
|
||||||
};
|
|
||||||
|
|
||||||
xhr.upload.onprogress = function (e): void {
|
|
||||||
console.log(e.loaded / e.total);
|
|
||||||
setpercent((e.loaded * 100.0) / e.total);
|
|
||||||
};
|
|
||||||
|
|
||||||
xhr.open('post', '/api/video/fileupload'); // open connection
|
|
||||||
xhr.setRequestHeader('Accept', 'multipart/form-data');
|
|
||||||
|
|
||||||
const tkn = cookie.Load();
|
|
||||||
if (tkn) {
|
|
||||||
xhr.setRequestHeader('Token', tkn.Token);
|
|
||||||
}
|
|
||||||
|
|
||||||
xhr.send(data); // send data
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
className={style.dropArea + (ondrag > 0 ? ' ' + style.highlight : '') + ' ' + theme.secbackground}
|
|
||||||
onDragEnter={(e): void => {
|
|
||||||
e.preventDefault();
|
|
||||||
e.stopPropagation();
|
|
||||||
setDrag(ondrag + 1);
|
|
||||||
}}
|
|
||||||
onDragLeave={(e): void => {
|
|
||||||
e.preventDefault();
|
|
||||||
e.stopPropagation();
|
|
||||||
setDrag(ondrag - 1);
|
|
||||||
}}
|
|
||||||
onDragOver={(e): void => {
|
|
||||||
e.stopPropagation();
|
|
||||||
e.preventDefault();
|
|
||||||
}}
|
|
||||||
onDrop={(e): void => {
|
|
||||||
setDrag(0);
|
|
||||||
e.preventDefault();
|
|
||||||
e.stopPropagation();
|
|
||||||
|
|
||||||
uploadFile(e.dataTransfer.files);
|
|
||||||
}}
|
|
||||||
onClick={(): void => {
|
|
||||||
let input = document.createElement('input');
|
|
||||||
input.type = 'file';
|
|
||||||
input.multiple = true;
|
|
||||||
input.onchange = function (): void {
|
|
||||||
if (input.files) {
|
|
||||||
uploadFile(input.files);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
input.click();
|
|
||||||
}}>
|
|
||||||
<div className={style.myForm}>
|
|
||||||
<p>To upload new Videos darg and drop them here or click to select some...</p>
|
|
||||||
<div className={style.progresswrapper}>
|
|
||||||
<div style={{width: percent + '%', backgroundColor: 'green', height: 5}} />
|
|
||||||
</div>
|
|
||||||
{finished !== null ? (
|
|
||||||
finished === '' ? (
|
|
||||||
<div className={style.finished}>Finished uploading</div>
|
|
||||||
) : (
|
|
||||||
<div className={style.finished}>Upload failed: {finished}</div>
|
|
||||||
)
|
|
||||||
) : (
|
|
||||||
<></>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
@ -2,10 +2,7 @@
|
|||||||
background-color: green;
|
background-color: green;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
border-width: 0;
|
border-width: 0;
|
||||||
|
color: white;
|
||||||
margin-right: 15px;
|
margin-right: 15px;
|
||||||
padding: 6px;
|
padding: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button:hover{
|
|
||||||
opacity: 0.7;
|
|
||||||
}
|
|
||||||
|
@ -1,6 +1,14 @@
|
|||||||
import {shallow} from 'enzyme';
|
import {shallow} from 'enzyme';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import {Button, IconButton} from './Button';
|
import {Button} from './Button';
|
||||||
|
|
||||||
|
function prepareFetchApi(response) {
|
||||||
|
const mockJsonPromise = Promise.resolve(response);
|
||||||
|
const mockFetchPromise = Promise.resolve({
|
||||||
|
json: () => mockJsonPromise
|
||||||
|
});
|
||||||
|
return (jest.fn().mockImplementation(() => mockFetchPromise));
|
||||||
|
}
|
||||||
|
|
||||||
describe('<Button/>', function () {
|
describe('<Button/>', function () {
|
||||||
it('renders without crashing ', function () {
|
it('renders without crashing ', function () {
|
||||||
@ -22,24 +30,3 @@ describe('<Button/>', function () {
|
|||||||
expect(func).toHaveBeenCalledTimes(1);
|
expect(func).toHaveBeenCalledTimes(1);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('<IconButton/>', function () {
|
|
||||||
it('renders without crashing ', function () {
|
|
||||||
const wrapper = shallow(<IconButton onClick={() => {}} title='test'/>);
|
|
||||||
wrapper.unmount();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('renders title', function () {
|
|
||||||
const wrapper = shallow(<IconButton onClick={() => {}} title='test1'/>);
|
|
||||||
expect(wrapper.text()).toBe('<FontAwesomeIcon />test1');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('test onclick handling', () => {
|
|
||||||
const func = jest.fn();
|
|
||||||
const wrapper = shallow(<IconButton onClick={func} title='test1'/>);
|
|
||||||
|
|
||||||
wrapper.find('button').simulate('click');
|
|
||||||
|
|
||||||
expect(func).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import style from './Button.module.css';
|
import style from './Button.module.css';
|
||||||
import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
|
|
||||||
import {IconDefinition} from '@fortawesome/fontawesome-common-types';
|
|
||||||
import GlobalInfos from '../../utils/GlobalInfos';
|
|
||||||
|
|
||||||
interface ButtonProps {
|
interface ButtonProps {
|
||||||
title: string | JSX.Element;
|
title: string | JSX.Element;
|
||||||
@ -11,30 +8,9 @@ interface ButtonProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function Button(props: ButtonProps): JSX.Element {
|
export function Button(props: ButtonProps): JSX.Element {
|
||||||
const theme = GlobalInfos.getThemeStyle();
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<button className={style.button + ' ' + theme.textcolor} style={props.color} onClick={props.onClick}>
|
<button className={style.button} style={props.color} onClick={props.onClick}>
|
||||||
{props.title}
|
{props.title}
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
interface IconButtonProps {
|
|
||||||
title: string | JSX.Element;
|
|
||||||
onClick?: () => void;
|
|
||||||
icon: IconDefinition;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function IconButton(props: IconButtonProps): JSX.Element {
|
|
||||||
const theme = GlobalInfos.getThemeStyle();
|
|
||||||
|
|
||||||
return (
|
|
||||||
<button className={style.button + ' ' + theme.textcolor} style={{backgroundColor: '#00000000'}} onClick={props.onClick}>
|
|
||||||
<span style={{fontSize: 12}}>
|
|
||||||
<FontAwesomeIcon className={theme.textcolor} icon={props.icon} size='2x' />
|
|
||||||
</span>
|
|
||||||
<span style={{marginLeft: 10}}>{props.title}</span>
|
|
||||||
</button>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
@ -1,51 +0,0 @@
|
|||||||
import {shallow} from 'enzyme';
|
|
||||||
import React from 'react';
|
|
||||||
import {ButtonPopup} from './ButtonPopup';
|
|
||||||
import exp from "constants";
|
|
||||||
|
|
||||||
describe('<ButtonPopup/>', function () {
|
|
||||||
it('renders without crashing ', function () {
|
|
||||||
const wrapper = shallow(<ButtonPopup/>);
|
|
||||||
wrapper.unmount();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('renders two buttons', function () {
|
|
||||||
const wrapper = shallow(<ButtonPopup/>);
|
|
||||||
expect(wrapper.find('Button')).toHaveLength(2);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('renders three buttons if alternative defined', function () {
|
|
||||||
const wrapper = shallow(<ButtonPopup AlternativeButtonTitle='alt'/>);
|
|
||||||
expect(wrapper.find('Button')).toHaveLength(3);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('test click handlings', function () {
|
|
||||||
const althandler = jest.fn();
|
|
||||||
const denyhandler = jest.fn();
|
|
||||||
const submithandler = jest.fn();
|
|
||||||
|
|
||||||
const wrapper = shallow(<ButtonPopup DenyButtonTitle='deny' onDeny={denyhandler} SubmitButtonTitle='submit'
|
|
||||||
onSubmit={submithandler} AlternativeButtonTitle='alt'
|
|
||||||
onAlternativeButton={althandler}/>);
|
|
||||||
wrapper.find('Button').findWhere(e => e.props().title === "deny").simulate('click');
|
|
||||||
expect(denyhandler).toHaveBeenCalledTimes(1);
|
|
||||||
|
|
||||||
wrapper.find('Button').findWhere(e => e.props().title === "alt").simulate('click');
|
|
||||||
expect(althandler).toHaveBeenCalledTimes(1);
|
|
||||||
|
|
||||||
wrapper.find('Button').findWhere(e => e.props().title === "submit").simulate('click');
|
|
||||||
expect(submithandler).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('test Parentsubmit and parenthide callbacks', function () {
|
|
||||||
const ondeny = jest.fn();
|
|
||||||
const onsubmit = jest.fn();
|
|
||||||
|
|
||||||
const wrapper = shallow(<ButtonPopup DenyButtonTitle='deny' SubmitButtonTitle='submit' onDeny={ondeny} onSubmit={onsubmit} AlternativeButtonTitle='alt'/>);
|
|
||||||
wrapper.find('PopupBase').props().onHide();
|
|
||||||
expect(ondeny).toHaveBeenCalledTimes(1);
|
|
||||||
|
|
||||||
wrapper.find('PopupBase').props().ParentSubmit();
|
|
||||||
expect(onsubmit).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
|
||||||
});
|
|
@ -1,58 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import PopupBase from '../PopupBase';
|
|
||||||
import {Button} from '../../GPElements/Button';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Delete Video popup
|
|
||||||
* can only be rendered once!
|
|
||||||
* @constructor
|
|
||||||
*/
|
|
||||||
export const ButtonPopup = (props: {
|
|
||||||
onSubmit: () => void;
|
|
||||||
onDeny: () => void;
|
|
||||||
onAlternativeButton?: () => void;
|
|
||||||
SubmitButtonTitle: string;
|
|
||||||
DenyButtonTitle: string;
|
|
||||||
AlternativeButtonTitle?: string;
|
|
||||||
Title: string;
|
|
||||||
}): JSX.Element => {
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<PopupBase
|
|
||||||
title={props.Title}
|
|
||||||
onHide={(): void => props.onDeny()}
|
|
||||||
height='200px'
|
|
||||||
width='400px'
|
|
||||||
ParentSubmit={(): void => {
|
|
||||||
props.onSubmit();
|
|
||||||
}}>
|
|
||||||
<Button
|
|
||||||
onClick={(): void => {
|
|
||||||
props.onSubmit();
|
|
||||||
}}
|
|
||||||
title={props.SubmitButtonTitle}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{props.AlternativeButtonTitle ? (
|
|
||||||
<Button
|
|
||||||
color={{backgroundColor: 'darkorange'}}
|
|
||||||
onClick={(): void => {
|
|
||||||
props.onAlternativeButton ? props.onAlternativeButton() : null;
|
|
||||||
}}
|
|
||||||
title={props.AlternativeButtonTitle}
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<></>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<Button
|
|
||||||
color={{backgroundColor: 'red'}}
|
|
||||||
onClick={(): void => {
|
|
||||||
props.onDeny();
|
|
||||||
}}
|
|
||||||
title={props.DenyButtonTitle}
|
|
||||||
/>
|
|
||||||
</PopupBase>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
@ -25,7 +25,7 @@ describe('<NewActorPopupContent/>', () => {
|
|||||||
const wrapper = shallow(<NewActorPopupContent onHide={() => {func();}}/>);
|
const wrapper = shallow(<NewActorPopupContent onHide={() => {func();}}/>);
|
||||||
|
|
||||||
// manually set typed in actorname
|
// manually set typed in actorname
|
||||||
wrapper.instance().nameValue = 'testactorname';
|
wrapper.instance().value = 'testactorname';
|
||||||
|
|
||||||
global.fetch = prepareFetchApi({});
|
global.fetch = prepareFetchApi({});
|
||||||
|
|
||||||
@ -55,6 +55,6 @@ describe('<NewActorPopupContent/>', () => {
|
|||||||
|
|
||||||
wrapper.find('input').simulate('change', {target: {value: 'testinput'}});
|
wrapper.find('input').simulate('change', {target: {value: 'testinput'}});
|
||||||
|
|
||||||
expect(wrapper.instance().nameValue).toBe('testinput');
|
expect(wrapper.instance().value).toBe('testinput');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -22,7 +22,7 @@ class NewActorPopup extends React.Component<NewActorPopupProps> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class NewActorPopupContent extends React.Component<NewActorPopupProps> {
|
export class NewActorPopupContent extends React.Component<NewActorPopupProps> {
|
||||||
nameValue: string | undefined;
|
value: string | undefined;
|
||||||
|
|
||||||
render(): JSX.Element {
|
render(): JSX.Element {
|
||||||
return (
|
return (
|
||||||
@ -32,7 +32,7 @@ export class NewActorPopupContent extends React.Component<NewActorPopupProps> {
|
|||||||
type='text'
|
type='text'
|
||||||
placeholder='Actor Name'
|
placeholder='Actor Name'
|
||||||
onChange={(v): void => {
|
onChange={(v): void => {
|
||||||
this.nameValue = v.target.value;
|
this.value = v.target.value;
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@ -48,11 +48,11 @@ export class NewActorPopupContent extends React.Component<NewActorPopupProps> {
|
|||||||
*/
|
*/
|
||||||
storeselection(): void {
|
storeselection(): void {
|
||||||
// check if user typed in name
|
// check if user typed in name
|
||||||
if (this.nameValue === '' || this.nameValue === undefined) {
|
if (this.value === '' || this.value === undefined) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
callAPI(APINode.Actor, {action: 'createActor', ActorName: this.nameValue}, (result: GeneralSuccess) => {
|
callAPI(APINode.Actor, {action: 'createActor', actorname: this.value}, (result: GeneralSuccess) => {
|
||||||
if (result.result !== 'success') {
|
if (result.result !== 'success') {
|
||||||
console.log('error occured while writing to db -- todo error handling');
|
console.log('error occured while writing to db -- todo error handling');
|
||||||
console.log(result.result);
|
console.log(result.result);
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
font-size: smaller;
|
font-size: smaller;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
|
max-width: 266px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -19,6 +20,13 @@
|
|||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.previewimage {
|
||||||
|
max-height: 400px;
|
||||||
|
max-width: 410px;
|
||||||
|
min-height: 150px;
|
||||||
|
min-width: 266px;
|
||||||
|
}
|
||||||
|
|
||||||
.previewbottom {
|
.previewbottom {
|
||||||
height: 20px;
|
height: 20px;
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,6 @@ interface PreviewProps {
|
|||||||
picLoader: (callback: (pic: string) => void) => void;
|
picLoader: (callback: (pic: string) => void) => void;
|
||||||
linkPath?: string;
|
linkPath?: string;
|
||||||
onClick?: () => void;
|
onClick?: () => void;
|
||||||
aspectRatio?: number;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
interface PreviewState {
|
interface PreviewState {
|
||||||
@ -26,11 +25,6 @@ class Preview extends React.Component<PreviewProps, PreviewState> {
|
|||||||
// store the picture to display
|
// store the picture to display
|
||||||
pic?: string;
|
pic?: string;
|
||||||
|
|
||||||
static readonly DefMinWidth = 266;
|
|
||||||
static readonly DefMaxWidth = 410;
|
|
||||||
static readonly DefMinHeight = 150;
|
|
||||||
static readonly DefMaxHeight = 400;
|
|
||||||
|
|
||||||
constructor(props: PreviewProps) {
|
constructor(props: PreviewProps) {
|
||||||
super(props);
|
super(props);
|
||||||
|
|
||||||
@ -49,7 +43,7 @@ class Preview extends React.Component<PreviewProps, PreviewState> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render(): JSX.Element {
|
render(): JSX.Element {
|
||||||
if (this.props.linkPath != null) {
|
if (this.props.linkPath !== undefined) {
|
||||||
return <Link to={this.props.linkPath}>{this.content()}</Link>;
|
return <Link to={this.props.linkPath}>{this.content()}</Link>;
|
||||||
} else {
|
} else {
|
||||||
return this.content();
|
return this.content();
|
||||||
@ -58,31 +52,12 @@ class Preview extends React.Component<PreviewProps, PreviewState> {
|
|||||||
|
|
||||||
content(): JSX.Element {
|
content(): JSX.Element {
|
||||||
const themeStyle = GlobalInfos.getThemeStyle();
|
const themeStyle = GlobalInfos.getThemeStyle();
|
||||||
const ratio = this.props.aspectRatio;
|
|
||||||
let dimstyle = null;
|
|
||||||
|
|
||||||
// check if aspect ratio is passed
|
|
||||||
if (ratio != null) {
|
|
||||||
// if ratio is <1 we need to calc height
|
|
||||||
if (ratio < 1) {
|
|
||||||
const height = Preview.DefMaxWidth * ratio;
|
|
||||||
dimstyle = {height: height, width: Preview.DefMaxWidth};
|
|
||||||
} else {
|
|
||||||
const width = Preview.DefMaxHeight * ratio;
|
|
||||||
dimstyle = {width: width, height: Preview.DefMaxHeight};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={style.videopreview + ' ' + themeStyle.secbackground + ' ' + themeStyle.preview}
|
className={style.videopreview + ' ' + themeStyle.secbackground + ' ' + themeStyle.preview}
|
||||||
onClick={this.props.onClick}>
|
onClick={this.props.onClick}>
|
||||||
<div
|
<div className={style.previewtitle + ' ' + themeStyle.lighttextcolor}>{this.props.name}</div>
|
||||||
style={{maxWidth: dimstyle !== null ? dimstyle.width : Preview.DefMaxWidth}}
|
<div className={style.previewpic}>
|
||||||
className={style.previewtitle + ' ' + themeStyle.lighttextcolor}>
|
|
||||||
{this.props.name}
|
|
||||||
</div>
|
|
||||||
<div style={dimstyle !== null ? dimstyle : undefined} className={style.previewpic}>
|
|
||||||
{this.state.picLoaded === false ? (
|
{this.state.picLoaded === false ? (
|
||||||
<FontAwesomeIcon
|
<FontAwesomeIcon
|
||||||
style={{
|
style={{
|
||||||
@ -97,20 +72,7 @@ class Preview extends React.Component<PreviewProps, PreviewState> {
|
|||||||
<Spinner animation='border' />
|
<Spinner animation='border' />
|
||||||
</span>
|
</span>
|
||||||
) : (
|
) : (
|
||||||
<img
|
<img className={style.previewimage} src={this.pic} alt='Pic loading.' />
|
||||||
style={
|
|
||||||
dimstyle !== null
|
|
||||||
? dimstyle
|
|
||||||
: {
|
|
||||||
minWidth: Preview.DefMinWidth,
|
|
||||||
maxWidth: Preview.DefMaxWidth,
|
|
||||||
minHeight: Preview.DefMinHeight,
|
|
||||||
maxHeight: Preview.DefMaxHeight
|
|
||||||
}
|
|
||||||
}
|
|
||||||
src={this.pic}
|
|
||||||
alt='Pic loading.'
|
|
||||||
/>
|
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className={style.previewbottom} />
|
<div className={style.previewbottom} />
|
||||||
|
@ -20,7 +20,7 @@ describe('<Preview/>', function () {
|
|||||||
expect(func).toHaveBeenCalledTimes(1)
|
expect(func).toHaveBeenCalledTimes(1)
|
||||||
|
|
||||||
// received picture should be rendered into wrapper
|
// received picture should be rendered into wrapper
|
||||||
expect(wrapper.find('img').props().src).toBe('42');
|
expect(wrapper.find('.previewimage').props().src).toBe('42');
|
||||||
// check if preview title renders correctly
|
// check if preview title renders correctly
|
||||||
expect(wrapper.find('.previewtitle').text()).toBe('test');
|
expect(wrapper.find('.previewtitle').text()).toBe('test');
|
||||||
});
|
});
|
||||||
|
@ -17,7 +17,7 @@ class Tag extends React.Component<props> {
|
|||||||
if (this.props.onclick) {
|
if (this.props.onclick) {
|
||||||
return this.renderButton();
|
return this.renderButton();
|
||||||
} else {
|
} else {
|
||||||
return <Link to={'/media/categories/' + this.props.tagInfo.TagId}>{this.renderButton()}</Link>;
|
return <Link to={'/categories/' + this.props.tagInfo.TagId}>{this.renderButton()}</Link>;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,7 +15,6 @@ const VideoContainer = (props: Props): JSX.Element => {
|
|||||||
renderElement={(el): JSX.Element => (
|
renderElement={(el): JSX.Element => (
|
||||||
<Preview
|
<Preview
|
||||||
key={el.MovieId}
|
key={el.MovieId}
|
||||||
aspectRatio={el.Ratio > 0 ? el.Ratio : undefined}
|
|
||||||
picLoader={(callback: (pic: string) => void): void => {
|
picLoader={(callback: (pic: string) => void): void => {
|
||||||
callAPIPlain(
|
callAPIPlain(
|
||||||
APINode.Video,
|
APINode.Video,
|
||||||
@ -27,7 +26,7 @@ const VideoContainer = (props: Props): JSX.Element => {
|
|||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
name={el.MovieName}
|
name={el.MovieName}
|
||||||
linkPath={'/media/player/' + el.MovieId}
|
linkPath={'/player/' + el.MovieId}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
data={props.data}>
|
data={props.data}>
|
||||||
|
@ -1,19 +1,13 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import ReactDOM from 'react-dom';
|
import ReactDOM from 'react-dom';
|
||||||
import App from './App';
|
import App from './App';
|
||||||
import {BrowserRouter} from 'react-router-dom';
|
|
||||||
import {FeatureContextProvider} from './utils/context/FeatureContext';
|
|
||||||
|
|
||||||
// don't allow console logs within production env
|
// don't allow console logs within production env
|
||||||
global.console.log = process.env.NODE_ENV !== 'development' ? (_: string | number | boolean): void => {} : global.console.log;
|
global.console.log = process.env.NODE_ENV !== 'development' ? (_: string | number | boolean): void => {} : global.console.log;
|
||||||
|
|
||||||
ReactDOM.render(
|
ReactDOM.render(
|
||||||
<React.StrictMode>
|
<React.StrictMode>
|
||||||
<BrowserRouter>
|
|
||||||
<FeatureContextProvider>
|
|
||||||
<App />
|
<App />
|
||||||
</FeatureContextProvider>
|
|
||||||
</BrowserRouter>
|
|
||||||
</React.StrictMode>,
|
</React.StrictMode>,
|
||||||
document.getElementById('root')
|
document.getElementById('root')
|
||||||
);
|
);
|
||||||
|
@ -37,7 +37,7 @@ export class ActorPage extends React.Component<Props, state> {
|
|||||||
<>
|
<>
|
||||||
<PageTitle title={this.state.actor.Name} subtitle={this.state.data ? this.state.data.length + ' videos' : null}>
|
<PageTitle title={this.state.actor.Name} subtitle={this.state.data ? this.state.data.length + ' videos' : null}>
|
||||||
<span className={style.overviewbutton}>
|
<span className={style.overviewbutton}>
|
||||||
<Link to='/media/actors'>
|
<Link to='/actors'>
|
||||||
<Button onClick={(): void => {}} title='Go to Actor overview' />
|
<Button onClick={(): void => {}} title='Go to Actor overview' />
|
||||||
</Link>
|
</Link>
|
||||||
</span>
|
</span>
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import AuthenticationPage from './AuthenticationPage';
|
import AuthenticationPage from './AuthenticationPage';
|
||||||
import {shallow} from 'enzyme';
|
import {shallow} from 'enzyme';
|
||||||
|
import {token} from "../../utils/TokenHandler";
|
||||||
|
|
||||||
describe('<AuthenticationPage/>', function () {
|
describe('<AuthenticationPage/>', function () {
|
||||||
it('renders without crashing ', function () {
|
it('renders without crashing ', function () {
|
||||||
@ -11,8 +12,10 @@ describe('<AuthenticationPage/>', function () {
|
|||||||
|
|
||||||
it('test button click', function () {
|
it('test button click', function () {
|
||||||
const func = jest.fn();
|
const func = jest.fn();
|
||||||
const wrapper = shallow(<AuthenticationPage />);
|
const wrapper = shallow(<AuthenticationPage onSuccessLogin={func}/>);
|
||||||
wrapper.instance().authenticate = func;
|
wrapper.instance().authenticate = jest.fn(() => {
|
||||||
|
wrapper.instance().props.onSuccessLogin()
|
||||||
|
});
|
||||||
wrapper.setState({pwdText: 'testpwd'});
|
wrapper.setState({pwdText: 'testpwd'});
|
||||||
|
|
||||||
wrapper.find('Button').simulate('click');
|
wrapper.find('Button').simulate('click');
|
||||||
@ -20,16 +23,33 @@ describe('<AuthenticationPage/>', function () {
|
|||||||
expect(func).toHaveBeenCalledTimes(1);
|
expect(func).toHaveBeenCalledTimes(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('test keyenter', function () {
|
it('test fail authenticate', function () {
|
||||||
const events = mockKeyPress();
|
const events = mockKeyPress();
|
||||||
|
|
||||||
|
token.refreshAPIToken = jest.fn().mockImplementation((callback, force, pwd) => {
|
||||||
|
callback('there was an error')
|
||||||
|
});
|
||||||
|
|
||||||
const wrapper = shallow(<AuthenticationPage/>);
|
const wrapper = shallow(<AuthenticationPage/>);
|
||||||
|
|
||||||
const func = jest.fn();
|
events.keyup({key: 'Enter'});
|
||||||
wrapper.instance().authenticate = func;
|
|
||||||
|
expect(wrapper.state().wrongPWDInfo).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('test success authenticate', function () {
|
||||||
|
const events = mockKeyPress();
|
||||||
|
const func = jest.fn()
|
||||||
|
|
||||||
|
token.refreshAPIToken = jest.fn().mockImplementation((callback, force, pwd) => {
|
||||||
|
callback('')
|
||||||
|
});
|
||||||
|
|
||||||
|
const wrapper = shallow(<AuthenticationPage onSuccessLogin={func}/>);
|
||||||
|
|
||||||
events.keyup({key: 'Enter'});
|
events.keyup({key: 'Enter'});
|
||||||
|
|
||||||
|
expect(wrapper.state().wrongPWDInfo).toBe(false);
|
||||||
expect(func).toHaveBeenCalledTimes(1);
|
expect(func).toHaveBeenCalledTimes(1);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -2,18 +2,18 @@ import React from 'react';
|
|||||||
import {Button} from '../../elements/GPElements/Button';
|
import {Button} from '../../elements/GPElements/Button';
|
||||||
import style from './AuthenticationPage.module.css';
|
import style from './AuthenticationPage.module.css';
|
||||||
import {addKeyHandler, removeKeyHandler} from '../../utils/ShortkeyHandler';
|
import {addKeyHandler, removeKeyHandler} from '../../utils/ShortkeyHandler';
|
||||||
|
import {token} from '../../utils/TokenHandler';
|
||||||
import {faTimes} from '@fortawesome/free-solid-svg-icons';
|
import {faTimes} from '@fortawesome/free-solid-svg-icons';
|
||||||
import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
|
import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
|
||||||
import {LoginContext, LoginState} from '../../utils/context/LoginContext';
|
|
||||||
import {APINode, callApiUnsafe} from '../../utils/Api';
|
|
||||||
import {cookie, Token} from '../../utils/context/Cookie';
|
|
||||||
|
|
||||||
interface state {
|
interface state {
|
||||||
pwdText: string;
|
pwdText: string;
|
||||||
wrongPWDInfo: boolean;
|
wrongPWDInfo: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface Props {}
|
interface Props {
|
||||||
|
onSuccessLogin: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
class AuthenticationPage extends React.Component<Props, state> {
|
class AuthenticationPage extends React.Component<Props, state> {
|
||||||
constructor(props: Props) {
|
constructor(props: Props) {
|
||||||
@ -36,8 +36,6 @@ class AuthenticationPage extends React.Component<Props, state> {
|
|||||||
removeKeyHandler(this.keypress);
|
removeKeyHandler(this.keypress);
|
||||||
}
|
}
|
||||||
|
|
||||||
static contextType = LoginContext;
|
|
||||||
|
|
||||||
render(): JSX.Element {
|
render(): JSX.Element {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@ -78,18 +76,21 @@ class AuthenticationPage extends React.Component<Props, state> {
|
|||||||
* request a new token and check if pwd was valid
|
* request a new token and check if pwd was valid
|
||||||
*/
|
*/
|
||||||
authenticate(): void {
|
authenticate(): void {
|
||||||
callApiUnsafe(
|
token.refreshAPIToken(
|
||||||
APINode.Login,
|
(error) => {
|
||||||
{action: 'login', Password: this.state.pwdText},
|
if (error !== '') {
|
||||||
(r: Token) => {
|
|
||||||
cookie.Store(r);
|
|
||||||
|
|
||||||
this.context.setLoginState(LoginState.LoggedIn);
|
|
||||||
},
|
|
||||||
() => {
|
|
||||||
this.setState({wrongPWDInfo: true});
|
this.setState({wrongPWDInfo: true});
|
||||||
setTimeout(() => this.setState({wrongPWDInfo: false}), 2000);
|
|
||||||
|
// set timeout to make the info auto-disappearing
|
||||||
|
setTimeout(() => {
|
||||||
|
this.setState({wrongPWDInfo: false});
|
||||||
|
}, 2000);
|
||||||
|
} else {
|
||||||
|
this.props.onSuccessLogin();
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
true,
|
||||||
|
this.state.pwdText
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
10
src/pages/CategoryPage/CategoryPage.test.js
Normal file
10
src/pages/CategoryPage/CategoryPage.test.js
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
import {shallow} from 'enzyme';
|
||||||
|
import React from 'react';
|
||||||
|
import CategoryPage from './CategoryPage';
|
||||||
|
|
||||||
|
describe('<CategoryPage/>', function () {
|
||||||
|
it('renders without crashing ', function () {
|
||||||
|
const wrapper = shallow(<CategoryPage/>);
|
||||||
|
wrapper.unmount();
|
||||||
|
});
|
||||||
|
});
|
@ -1,5 +1,5 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import {Route, Switch, useRouteMatch} from 'react-router-dom';
|
import {Route, Switch} from 'react-router-dom';
|
||||||
import {CategoryViewWR} from './CategoryView';
|
import {CategoryViewWR} from './CategoryView';
|
||||||
import TagView from './TagView';
|
import TagView from './TagView';
|
||||||
|
|
||||||
@ -7,19 +7,19 @@ import TagView from './TagView';
|
|||||||
* Component for Category Page
|
* Component for Category Page
|
||||||
* Contains a Tag Overview and loads specific Tag videos in VideoContainer
|
* Contains a Tag Overview and loads specific Tag videos in VideoContainer
|
||||||
*/
|
*/
|
||||||
const CategoryPage = (): JSX.Element => {
|
class CategoryPage extends React.Component {
|
||||||
const match = useRouteMatch();
|
render(): JSX.Element {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Switch>
|
<Switch>
|
||||||
<Route exact path={`${match.url}/:id`}>
|
<Route path='/categories/:id'>
|
||||||
<CategoryViewWR />
|
<CategoryViewWR />
|
||||||
</Route>
|
</Route>
|
||||||
<Route exact path={`${match.url}/`}>
|
<Route path='/categories'>
|
||||||
<TagView />
|
<TagView />
|
||||||
</Route>
|
</Route>
|
||||||
</Switch>
|
</Switch>
|
||||||
);
|
);
|
||||||
};
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export default CategoryPage;
|
export default CategoryPage;
|
||||||
|
@ -119,10 +119,9 @@ export class CategoryView extends React.Component<CategoryViewProps, CategoryVie
|
|||||||
this.videodata = result.Videos;
|
this.videodata = result.Videos;
|
||||||
this.setState({loaded: true, TagName: result.TagName});
|
this.setState({loaded: true, TagName: result.TagName});
|
||||||
},
|
},
|
||||||
(e) => {
|
(_) => {
|
||||||
console.log(e);
|
|
||||||
// if there is an load error redirect to home page
|
// if there is an load error redirect to home page
|
||||||
// this.props.history.push('/');
|
this.props.history.push('/');
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -56,7 +56,7 @@ class TagView extends React.Component<Props, TagViewState> {
|
|||||||
<DynamicContentContainer
|
<DynamicContentContainer
|
||||||
data={this.state.loadedtags}
|
data={this.state.loadedtags}
|
||||||
renderElement={(m): JSX.Element => (
|
renderElement={(m): JSX.Element => (
|
||||||
<Link to={'/media/categories/' + m.TagId} key={m.TagId}>
|
<Link to={'/categories/' + m.TagId} key={m.TagId}>
|
||||||
<TagPreview name={m.TagName} />
|
<TagPreview name={m.TagName} />
|
||||||
</Link>
|
</Link>
|
||||||
)}
|
)}
|
||||||
|
@ -14,12 +14,12 @@ import {DefaultTags} from '../../types/GeneralTypes';
|
|||||||
import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
|
import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
|
||||||
import {faSortDown} from '@fortawesome/free-solid-svg-icons';
|
import {faSortDown} from '@fortawesome/free-solid-svg-icons';
|
||||||
|
|
||||||
|
// eslint-disable-next-line no-shadow
|
||||||
export enum SortBy {
|
export enum SortBy {
|
||||||
date,
|
date,
|
||||||
likes,
|
likes,
|
||||||
random,
|
random,
|
||||||
name,
|
name
|
||||||
length
|
|
||||||
}
|
}
|
||||||
|
|
||||||
interface Props extends RouteComponentProps {}
|
interface Props extends RouteComponentProps {}
|
||||||
@ -58,7 +58,7 @@ export class HomePage extends React.Component<Props, state> {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
sortState = SortBy.random;
|
sortState = SortBy.date;
|
||||||
tagState = DefaultTags.all;
|
tagState = DefaultTags.all;
|
||||||
|
|
||||||
componentDidMount(): void {
|
componentDidMount(): void {
|
||||||
@ -67,17 +67,6 @@ export class HomePage extends React.Component<Props, state> {
|
|||||||
this.fetchStartData();
|
this.fetchStartData();
|
||||||
}
|
}
|
||||||
|
|
||||||
render(): JSX.Element {
|
|
||||||
return (
|
|
||||||
<Switch>
|
|
||||||
<Route path='/media/search/:name'>
|
|
||||||
<SearchHandling />
|
|
||||||
</Route>
|
|
||||||
<Route path='/media/'>{this.homepageContent()}</Route>
|
|
||||||
</Switch>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* fetch available videos for specified tag
|
* fetch available videos for specified tag
|
||||||
* this function clears all preview elements an reloads gravity with tag
|
* this function clears all preview elements an reloads gravity with tag
|
||||||
@ -106,18 +95,20 @@ export class HomePage extends React.Component<Props, state> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
render(): JSX.Element {
|
||||||
* main content of homepage
|
|
||||||
*/
|
|
||||||
homepageContent(): JSX.Element {
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
<Switch>
|
||||||
|
<Route path='/search/:name'>
|
||||||
|
<SearchHandling />
|
||||||
|
</Route>
|
||||||
|
<Route path='/'>
|
||||||
<PageTitle title='Home Page' subtitle={this.state.subtitle + ' - ' + this.state.selectionnr}>
|
<PageTitle title='Home Page' subtitle={this.state.subtitle + ' - ' + this.state.selectionnr}>
|
||||||
<form
|
<form
|
||||||
className={'form-inline ' + style.searchform}
|
className={'form-inline ' + style.searchform}
|
||||||
onSubmit={(e): void => {
|
onSubmit={(e): void => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
this.props.history.push('/media/search/' + this.keyword);
|
this.props.history.push('/search/' + this.keyword);
|
||||||
}}>
|
}}>
|
||||||
<input
|
<input
|
||||||
data-testid='searchtextfield'
|
data-testid='searchtextfield'
|
||||||
@ -198,13 +189,14 @@ export class HomePage extends React.Component<Props, state> {
|
|||||||
<span onClick={(): void => this.onDropDownItemClick(SortBy.likes, 'Most likes')}>Most likes</span>
|
<span onClick={(): void => this.onDropDownItemClick(SortBy.likes, 'Most likes')}>Most likes</span>
|
||||||
<span onClick={(): void => this.onDropDownItemClick(SortBy.random, 'Random')}>Random</span>
|
<span onClick={(): void => this.onDropDownItemClick(SortBy.random, 'Random')}>Random</span>
|
||||||
<span onClick={(): void => this.onDropDownItemClick(SortBy.name, 'Name')}>Name</span>
|
<span onClick={(): void => this.onDropDownItemClick(SortBy.name, 'Name')}>Name</span>
|
||||||
<span onClick={(): void => this.onDropDownItemClick(SortBy.length, 'Length')}>Length</span>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<VideoContainer data={this.state.data} />
|
<VideoContainer data={this.state.data} />
|
||||||
<div className={style.rightinfo} />
|
<div className={style.rightinfo} />
|
||||||
|
</Route>
|
||||||
|
</Switch>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
76
src/pages/PhotoPage/PhotoPage.tsx
Normal file
76
src/pages/PhotoPage/PhotoPage.tsx
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
import 'pro-gallery/dist/statics/main.css';
|
||||||
|
import React from 'react';
|
||||||
|
import ExpandableProGallery from './expandableGallery';
|
||||||
|
|
||||||
|
export function PhotoPage(): JSX.Element {
|
||||||
|
// Add your images here...
|
||||||
|
const items = [
|
||||||
|
{
|
||||||
|
// Image item:
|
||||||
|
itemId: 'sample-id',
|
||||||
|
mediaUrl: 'https://i.picsum.photos/id/674/200/300.jpg?hmac=kS3VQkm7AuZdYJGUABZGmnNj_3KtZ6Twgb5Qb9ITssY',
|
||||||
|
metaData: {
|
||||||
|
type: 'image',
|
||||||
|
height: 200,
|
||||||
|
width: 100,
|
||||||
|
title: 'sample-title',
|
||||||
|
description: 'sample-description',
|
||||||
|
focalPoint: [0, 0],
|
||||||
|
link: {
|
||||||
|
url: 'http://example.com',
|
||||||
|
target: '_blank'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// Another Image item:
|
||||||
|
itemId: 'differentItem',
|
||||||
|
mediaUrl: 'https://i.picsum.photos/id/1003/1181/1772.jpg?hmac=oN9fHMXiqe9Zq2RM6XT-RVZkojgPnECWwyEF1RvvTZk',
|
||||||
|
metaData: {
|
||||||
|
type: 'image',
|
||||||
|
height: 200,
|
||||||
|
width: 100,
|
||||||
|
title: 'sample-title',
|
||||||
|
description: 'sample-description',
|
||||||
|
focalPoint: [0, 0],
|
||||||
|
link: {
|
||||||
|
url: 'http://example.com',
|
||||||
|
target: '_blank'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
// The options of the gallery (from the playground current state)
|
||||||
|
const options = {
|
||||||
|
galleryLayout: -1,
|
||||||
|
hoveringBehaviour: 'NEVER_SHOW',
|
||||||
|
scrollAnimation: 'MAIN_COLOR',
|
||||||
|
imageHoverAnimation: 'ZOOM_IN',
|
||||||
|
itemBorderRadius: 5,
|
||||||
|
allowContextMenu: true
|
||||||
|
};
|
||||||
|
|
||||||
|
// The size of the gallery container. The images will fit themselves in it
|
||||||
|
const container = {
|
||||||
|
width: window.innerWidth,
|
||||||
|
height: window.innerHeight
|
||||||
|
};
|
||||||
|
|
||||||
|
// The eventsListener will notify you anytime something has happened in the gallery.
|
||||||
|
const eventsListener = (eventName: unknown, eventData: unknown): void => console.log({eventName, eventData});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ExpandableProGallery
|
||||||
|
items={items}
|
||||||
|
options={options}
|
||||||
|
container={container}
|
||||||
|
eventsListener={eventsListener}
|
||||||
|
scrollingElement={window}
|
||||||
|
viewMode={1}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enjoy using your new gallery!
|
||||||
|
// For more options, visit https://github.com/wix/pro-gallery
|
106
src/pages/PhotoPage/expandableGallery.js
Normal file
106
src/pages/PhotoPage/expandableGallery.js
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import {GALLERY_CONSTS, ProGallery, ProGalleryRenderer} from 'pro-gallery';
|
||||||
|
import {utils} from 'pro-gallery-lib';
|
||||||
|
// import CLICK_ACTIONS from '../../../common/constants/itemClick';
|
||||||
|
import CloseButton from './x';
|
||||||
|
|
||||||
|
const styles = {
|
||||||
|
gallery: {
|
||||||
|
|
||||||
|
},
|
||||||
|
fullscreen: {
|
||||||
|
position: 'fixed',
|
||||||
|
top: 0,
|
||||||
|
left: 0,
|
||||||
|
width: '100vw',
|
||||||
|
height: '100vh',
|
||||||
|
zIndex: 9999,
|
||||||
|
background: 'white',
|
||||||
|
opacity: 0,
|
||||||
|
transition: 'opacity 2s ease',
|
||||||
|
visibility: 'hidden'
|
||||||
|
},
|
||||||
|
shown: {
|
||||||
|
visibility: 'visible',
|
||||||
|
opacity: 1
|
||||||
|
},
|
||||||
|
close: {
|
||||||
|
boxSizing: 'content-box',
|
||||||
|
zIndex: 10,
|
||||||
|
padding: 10,
|
||||||
|
position: 'fixed',
|
||||||
|
right: 20,
|
||||||
|
top: 20,
|
||||||
|
background: 'rgba(255,255,255,0.8)',
|
||||||
|
borderRadius: 4,
|
||||||
|
width: 25,
|
||||||
|
height: 25,
|
||||||
|
fill: 'black',
|
||||||
|
cursor: 'pointer'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const GALLERY_EVENTS = GALLERY_CONSTS.events;
|
||||||
|
|
||||||
|
export default class ExpandableProGallery extends React.Component {
|
||||||
|
|
||||||
|
constructor(props) {
|
||||||
|
super(props)
|
||||||
|
this.eventListener = this.eventListener.bind(this);
|
||||||
|
this.state = {
|
||||||
|
fullscreenIdx: -1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
eventListener(eventName, eventData) {
|
||||||
|
switch (eventName) {
|
||||||
|
case GALLERY_EVENTS.ITEM_ACTION_TRIGGERED:
|
||||||
|
this.setState({ fullscreenIdx: eventData.idx });
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
console.log({eventName, eventData});
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (typeof this.props.eventsListener === 'function') {
|
||||||
|
this.props.eventsListener(eventName, eventData);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const Gallery = this.props.useBlueprints ? ProGalleryRenderer : ProGallery;
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<section style={{...styles.gallery, display: (this.state.fullscreenIdx < 0 ? 'block' : 'none')}}>
|
||||||
|
<Gallery
|
||||||
|
{...this.props}
|
||||||
|
key={`pro-gallery-${this.props.domId}`}
|
||||||
|
domId={`pro-gallery-${this.props.domId}`}
|
||||||
|
eventsListener={this.eventListener}
|
||||||
|
/>
|
||||||
|
</section>
|
||||||
|
{this.state.fullscreenIdx < 0 ? null : <section style={{ ...styles.fullscreen, ...(this.state.fullscreenIdx >= 0 && styles.shown) }}>
|
||||||
|
<CloseButton style={styles.close} onClick={() => this.setState({fullscreenIdx: -1})} />
|
||||||
|
<Gallery
|
||||||
|
{...this.props}
|
||||||
|
key={`pro-fullscreen-${this.props.domId}`}
|
||||||
|
domId={`pro-fullscreen-${this.props.domId}`}
|
||||||
|
currentIdx={this.state.fullscreenIdx}
|
||||||
|
container= {{
|
||||||
|
width: window.innerWidth,
|
||||||
|
height: window.innerHeight
|
||||||
|
}}
|
||||||
|
styles={{
|
||||||
|
...(this.props.options || this.props.styles),
|
||||||
|
galleryLayout: 5,
|
||||||
|
slideshowInfoSize: 80,
|
||||||
|
slideAnimation: utils.isMobile() ? 'SCROLL' : 'FADE',
|
||||||
|
cubeType:'fit',
|
||||||
|
scrollSnap: true,
|
||||||
|
showArrows: !utils.isMobile()
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</section>}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
16
src/pages/PhotoPage/x.js
Normal file
16
src/pages/PhotoPage/x.js
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
/* eslint-disable */
|
||||||
|
/* tslint:disable */
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import React from 'react';
|
||||||
|
const x = ({size, ...props}) => (
|
||||||
|
<svg viewBox="0 0 15 15" fill="currentColor" width={ size || "15" } height={ size || "15" } {...props}>
|
||||||
|
<path d="M15 0.6L14.4 0 7.5 6.9 0.6 0 0 0.6 6.9 7.5 0 14.4 0.6 15 7.5 8.1 14.4 15 15 14.4 8.1 7.5z" fillRule="evenodd" clipRule="evenodd" />
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
x.displayName = 'x';
|
||||||
|
x.propTypes = {
|
||||||
|
size: PropTypes.string
|
||||||
|
}
|
||||||
|
export default x;
|
||||||
|
/* tslint:enable */
|
||||||
|
/* eslint-enable */
|
@ -2,14 +2,12 @@ import {shallow} from 'enzyme';
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import {Player} from './Player';
|
import {Player} from './Player';
|
||||||
import {callAPI} from '../../utils/Api';
|
import {callAPI} from '../../utils/Api';
|
||||||
import GlobalInfos from "../../utils/GlobalInfos";
|
|
||||||
import {LoginContext} from '../../utils/context/LoginContext';
|
|
||||||
|
|
||||||
describe('<Player/>', function () {
|
describe('<Player/>', function () {
|
||||||
|
|
||||||
// help simulating id passed by url
|
// help simulating id passed by url
|
||||||
function instance() {
|
function instance() {
|
||||||
return shallow(<Player match={{params: {id: 10}}}/>, {context: LoginContext});
|
return shallow(<Player match={{params: {id: 10}}}/>);
|
||||||
}
|
}
|
||||||
|
|
||||||
it('renders without crashing ', function () {
|
it('renders without crashing ', function () {
|
||||||
@ -38,7 +36,7 @@ describe('<Player/>', function () {
|
|||||||
|
|
||||||
// initial fetch for getting movie data
|
// initial fetch for getting movie data
|
||||||
expect(global.fetch).toHaveBeenCalledTimes(1);
|
expect(global.fetch).toHaveBeenCalledTimes(1);
|
||||||
wrapper.find('.videoactions').find('IconButton').first().simulate('click');
|
wrapper.find('.videoactions').find('Button').first().simulate('click');
|
||||||
// fetch for liking
|
// fetch for liking
|
||||||
expect(global.fetch).toHaveBeenCalledTimes(2);
|
expect(global.fetch).toHaveBeenCalledTimes(2);
|
||||||
|
|
||||||
@ -81,49 +79,28 @@ describe('<Player/>', function () {
|
|||||||
const wrapper = instance();
|
const wrapper = instance();
|
||||||
expect(wrapper.find('AddTagPopup')).toHaveLength(0);
|
expect(wrapper.find('AddTagPopup')).toHaveLength(0);
|
||||||
// todo dynamic button find without index
|
// todo dynamic button find without index
|
||||||
wrapper.find('.videoactions').find('IconButton').at(1).simulate('click');
|
wrapper.find('.videoactions').find('Button').at(1).simulate('click');
|
||||||
// addtagpopup should be showing now
|
// addtagpopup should be showing now
|
||||||
expect(wrapper.find('AddTagPopup')).toHaveLength(1);
|
expect(wrapper.find('AddTagPopup')).toHaveLength(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('test fully delete popup rendering', function () {
|
it('test delete button', done => {
|
||||||
const wrapper = instance();
|
const wrapper = instance();
|
||||||
|
|
||||||
wrapper.setContext({VideosFullyDeleteable: true})
|
|
||||||
|
|
||||||
wrapper.setState({deletepopupvisible: true});
|
wrapper.setProps({history: {goBack: jest.fn()}});
|
||||||
|
|
||||||
expect(wrapper.find('ButtonPopup')).toHaveLength(1)
|
global.fetch = prepareFetchApi({result: 'success'});
|
||||||
});
|
|
||||||
|
|
||||||
it('test delete button', () => {
|
wrapper.find('.videoactions').find('Button').at(2).simulate('click');
|
||||||
const wrapper = instance();
|
|
||||||
const callback = jest.fn();
|
|
||||||
|
|
||||||
wrapper.setProps({history: {goBack: callback}});
|
|
||||||
|
|
||||||
callAPIMock({result: 'success'})
|
|
||||||
wrapper.setContext({VideosFullyDeleteable: false})
|
|
||||||
|
|
||||||
// request the popup to pop
|
|
||||||
wrapper.find('.videoactions').find('IconButton').at(2).simulate('click');
|
|
||||||
|
|
||||||
// click the first submit button
|
|
||||||
wrapper.find('ButtonPopup').dive().find('Button').at(0).simulate('click')
|
|
||||||
|
|
||||||
|
process.nextTick(() => {
|
||||||
// refetch is called so fetch called 3 times
|
// refetch is called so fetch called 3 times
|
||||||
expect(callAPI).toHaveBeenCalledTimes(1);
|
expect(global.fetch).toHaveBeenCalledTimes(1);
|
||||||
expect(callback).toHaveBeenCalledTimes(1);
|
expect(wrapper.instance().props.history.goBack).toHaveBeenCalledTimes(1);
|
||||||
|
|
||||||
// now lets test if this works also with the fullydeletepopup
|
global.fetch.mockClear();
|
||||||
wrapper.setContext({VideosFullyDeleteable: true})
|
done();
|
||||||
// request the popup to pop
|
|
||||||
wrapper.setState({deletepopupvisible: true}, () => {
|
|
||||||
// click the first submit button
|
|
||||||
wrapper.find('ButtonPopup').dive().find('Button').at(0).simulate('click')
|
|
||||||
|
|
||||||
expect(callAPI).toHaveBeenCalledTimes(2);
|
|
||||||
expect(callback).toHaveBeenCalledTimes(2);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -132,20 +109,7 @@ describe('<Player/>', function () {
|
|||||||
|
|
||||||
const func = jest.fn();
|
const func = jest.fn();
|
||||||
|
|
||||||
wrapper.setProps({history: {push: func}});
|
wrapper.setProps({history: {goBack: func}});
|
||||||
|
|
||||||
expect(func).toHaveBeenCalledTimes(0);
|
|
||||||
wrapper.find('.closebutton').simulate('click');
|
|
||||||
// there shouldn't be a backstack available
|
|
||||||
expect(func).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('hide click with stack available', function () {
|
|
||||||
const wrapper = instance();
|
|
||||||
|
|
||||||
const func = jest.fn();
|
|
||||||
|
|
||||||
wrapper.setProps({history: {goBack: func, length: 5}});
|
|
||||||
|
|
||||||
expect(func).toHaveBeenCalledTimes(0);
|
expect(func).toHaveBeenCalledTimes(0);
|
||||||
wrapper.find('.closebutton').simulate('click');
|
wrapper.find('.closebutton').simulate('click');
|
||||||
@ -175,14 +139,16 @@ describe('<Player/>', function () {
|
|||||||
it('test click of quickadd tag btn', done => {
|
it('test click of quickadd tag btn', done => {
|
||||||
const wrapper = generatetag();
|
const wrapper = generatetag();
|
||||||
|
|
||||||
callAPIMock({result: 'success'})
|
global.fetch = prepareFetchApi({result: 'success'});
|
||||||
|
|
||||||
// render tag subcomponent
|
// render tag subcomponent
|
||||||
const tag = wrapper.find('Tag').first().dive();
|
const tag = wrapper.find('Tag').first().dive();
|
||||||
tag.simulate('click');
|
tag.simulate('click');
|
||||||
|
|
||||||
process.nextTick(() => {
|
process.nextTick(() => {
|
||||||
expect(callAPI).toHaveBeenCalledTimes(1);
|
expect(global.fetch).toHaveBeenCalledTimes(1);
|
||||||
|
|
||||||
|
global.fetch.mockClear();
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@ -190,7 +156,7 @@ describe('<Player/>', function () {
|
|||||||
it('test failing quickadd', done => {
|
it('test failing quickadd', done => {
|
||||||
const wrapper = generatetag();
|
const wrapper = generatetag();
|
||||||
|
|
||||||
callAPIMock({result: 'nonsuccess'});
|
global.fetch = prepareFetchApi({result: 'nonsuccess'});
|
||||||
global.console.error = jest.fn();
|
global.console.error = jest.fn();
|
||||||
|
|
||||||
// render tag subcomponent
|
// render tag subcomponent
|
||||||
@ -199,6 +165,8 @@ describe('<Player/>', function () {
|
|||||||
|
|
||||||
process.nextTick(() => {
|
process.nextTick(() => {
|
||||||
expect(global.console.error).toHaveBeenCalledTimes(2);
|
expect(global.console.error).toHaveBeenCalledTimes(2);
|
||||||
|
|
||||||
|
global.fetch.mockClear();
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -9,7 +9,7 @@ import Tag from '../../elements/Tag/Tag';
|
|||||||
import AddTagPopup from '../../elements/Popups/AddTagPopup/AddTagPopup';
|
import AddTagPopup from '../../elements/Popups/AddTagPopup/AddTagPopup';
|
||||||
import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
|
import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
|
||||||
import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
|
import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
|
||||||
import {faPlusCircle, faTag, faThumbsUp, faTrash} from '@fortawesome/free-solid-svg-icons';
|
import {faPlusCircle} from '@fortawesome/free-solid-svg-icons';
|
||||||
import AddActorPopup from '../../elements/Popups/AddActorPopup/AddActorPopup';
|
import AddActorPopup from '../../elements/Popups/AddActorPopup/AddActorPopup';
|
||||||
import ActorTile from '../../elements/ActorTile/ActorTile';
|
import ActorTile from '../../elements/ActorTile/ActorTile';
|
||||||
import {withRouter} from 'react-router-dom';
|
import {withRouter} from 'react-router-dom';
|
||||||
@ -18,11 +18,9 @@ import {RouteComponentProps} from 'react-router';
|
|||||||
import {DefaultPlyrOptions, GeneralSuccess} from '../../types/GeneralTypes';
|
import {DefaultPlyrOptions, GeneralSuccess} from '../../types/GeneralTypes';
|
||||||
import {ActorType, TagType} from '../../types/VideoTypes';
|
import {ActorType, TagType} from '../../types/VideoTypes';
|
||||||
import PlyrJS from 'plyr';
|
import PlyrJS from 'plyr';
|
||||||
import {IconButton} from '../../elements/GPElements/Button';
|
import {Button} from '../../elements/GPElements/Button';
|
||||||
import {VideoTypes} from '../../types/ApiTypes';
|
import {VideoTypes} from '../../types/ApiTypes';
|
||||||
import GlobalInfos from '../../utils/GlobalInfos';
|
import GlobalInfos from '../../utils/GlobalInfos';
|
||||||
import {ButtonPopup} from '../../elements/Popups/ButtonPopup/ButtonPopup';
|
|
||||||
import {FeatureContext} from '../../utils/context/FeatureContext';
|
|
||||||
|
|
||||||
interface Props extends RouteComponentProps<{id: string}> {}
|
interface Props extends RouteComponentProps<{id: string}> {}
|
||||||
|
|
||||||
@ -32,13 +30,11 @@ interface mystate {
|
|||||||
movieName: string;
|
movieName: string;
|
||||||
likes: number;
|
likes: number;
|
||||||
quality: number;
|
quality: number;
|
||||||
releaseDate: string | null;
|
|
||||||
length: number;
|
length: number;
|
||||||
tags: TagType[];
|
tags: TagType[];
|
||||||
suggesttag: TagType[];
|
suggesttag: TagType[];
|
||||||
popupvisible: boolean;
|
popupvisible: boolean;
|
||||||
actorpopupvisible: boolean;
|
actorpopupvisible: boolean;
|
||||||
deletepopupvisible: boolean;
|
|
||||||
actors: ActorType[];
|
actors: ActorType[];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -55,21 +51,17 @@ export class Player extends React.Component<Props, mystate> {
|
|||||||
movieName: '',
|
movieName: '',
|
||||||
likes: 0,
|
likes: 0,
|
||||||
quality: 0,
|
quality: 0,
|
||||||
releaseDate: null,
|
|
||||||
length: 0,
|
length: 0,
|
||||||
tags: [],
|
tags: [],
|
||||||
suggesttag: [],
|
suggesttag: [],
|
||||||
popupvisible: false,
|
popupvisible: false,
|
||||||
actorpopupvisible: false,
|
actorpopupvisible: false,
|
||||||
deletepopupvisible: false,
|
|
||||||
actors: []
|
actors: []
|
||||||
};
|
};
|
||||||
|
|
||||||
this.quickAddTag = this.quickAddTag.bind(this);
|
this.quickAddTag = this.quickAddTag.bind(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
static contextType = FeatureContext;
|
|
||||||
|
|
||||||
componentDidMount(): void {
|
componentDidMount(): void {
|
||||||
// initial fetch of current movie data
|
// initial fetch of current movie data
|
||||||
this.fetchMovieData();
|
this.fetchMovieData();
|
||||||
@ -90,12 +82,18 @@ export class Player extends React.Component<Props, mystate> {
|
|||||||
<div>not loaded yet</div>
|
<div>not loaded yet</div>
|
||||||
)}
|
)}
|
||||||
<div className={style.videoactions}>
|
<div className={style.videoactions}>
|
||||||
<IconButton icon={faThumbsUp} onClick={(): void => this.likebtn()} title='Like!' />
|
<Button onClick={(): void => this.likebtn()} title='Like this Video!' color={{backgroundColor: 'green'}} />
|
||||||
<IconButton icon={faTag} onClick={(): void => this.setState({popupvisible: true})} title='Add Tag!' />
|
<Button
|
||||||
<IconButton
|
onClick={(): void => this.setState({popupvisible: true})}
|
||||||
icon={faTrash}
|
title='Give this Video a Tag'
|
||||||
onClick={(): void => this.setState({deletepopupvisible: true})}
|
color={{backgroundColor: '#3574fe'}}
|
||||||
title='Delete Video!'
|
/>
|
||||||
|
<Button
|
||||||
|
title='Delete Video'
|
||||||
|
onClick={(): void => {
|
||||||
|
this.deleteVideo();
|
||||||
|
}}
|
||||||
|
color={{backgroundColor: 'red'}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{this.assembleActorTiles()}
|
{this.assembleActorTiles()}
|
||||||
@ -127,11 +125,6 @@ export class Player extends React.Component<Props, mystate> {
|
|||||||
<b>{this.state.quality}p</b> Quality!
|
<b>{this.state.quality}p</b> Quality!
|
||||||
</SideBarItem>
|
</SideBarItem>
|
||||||
) : null}
|
) : null}
|
||||||
{this.state.releaseDate !== null ? (
|
|
||||||
<SideBarItem>
|
|
||||||
<b>{this.state.releaseDate}</b> released!
|
|
||||||
</SideBarItem>
|
|
||||||
) : null}
|
|
||||||
{this.state.length !== 0 ? (
|
{this.state.length !== 0 ? (
|
||||||
<SideBarItem>
|
<SideBarItem>
|
||||||
<b>{Math.round(this.state.length / 60)}</b> Minutes of length!
|
<b>{Math.round(this.state.length / 60)}</b> Minutes of length!
|
||||||
@ -203,46 +196,10 @@ export class Player extends React.Component<Props, mystate> {
|
|||||||
movieId={this.state.movieId}
|
movieId={this.state.movieId}
|
||||||
/>
|
/>
|
||||||
) : null}
|
) : null}
|
||||||
{this.state.deletepopupvisible ? this.renderDeletePopup() : null}
|
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
renderDeletePopup(): JSX.Element {
|
|
||||||
if (this.context.VideosFullyDeleteable) {
|
|
||||||
return (
|
|
||||||
<ButtonPopup
|
|
||||||
onDeny={(): void => this.setState({deletepopupvisible: false})}
|
|
||||||
onSubmit={(): void => {
|
|
||||||
this.setState({deletepopupvisible: false});
|
|
||||||
this.deleteVideo(true);
|
|
||||||
}}
|
|
||||||
onAlternativeButton={(): void => {
|
|
||||||
this.setState({deletepopupvisible: false});
|
|
||||||
this.deleteVideo(false);
|
|
||||||
}}
|
|
||||||
DenyButtonTitle='Cancel'
|
|
||||||
SubmitButtonTitle='Fully Delete!'
|
|
||||||
Title='Fully Delete Video?'
|
|
||||||
AlternativeButtonTitle='Reference Only'
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
return (
|
|
||||||
<ButtonPopup
|
|
||||||
onDeny={(): void => this.setState({deletepopupvisible: false})}
|
|
||||||
onSubmit={(): void => {
|
|
||||||
this.setState({deletepopupvisible: false});
|
|
||||||
this.deleteVideo(false);
|
|
||||||
}}
|
|
||||||
DenyButtonTitle='Cancel'
|
|
||||||
SubmitButtonTitle='Delete Video Reference!'
|
|
||||||
Title='Delete Video?'
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* quick add callback to add tag to db and change gui correctly
|
* quick add callback to add tag to db and change gui correctly
|
||||||
* @param tagId id of tag to add
|
* @param tagId id of tag to add
|
||||||
@ -324,7 +281,6 @@ export class Player extends React.Component<Props, mystate> {
|
|||||||
movieName: result.MovieName,
|
movieName: result.MovieName,
|
||||||
likes: result.Likes,
|
likes: result.Likes,
|
||||||
quality: result.Quality,
|
quality: result.Quality,
|
||||||
releaseDate: result.ReleaseDate,
|
|
||||||
length: result.Length,
|
length: result.Length,
|
||||||
tags: result.Tags,
|
tags: result.Tags,
|
||||||
suggesttag: result.SuggestedTag,
|
suggesttag: result.SuggestedTag,
|
||||||
@ -358,27 +314,23 @@ export class Player extends React.Component<Props, mystate> {
|
|||||||
* calls callback to viewbinding to show previous page agains
|
* calls callback to viewbinding to show previous page agains
|
||||||
*/
|
*/
|
||||||
closebtn(): void {
|
closebtn(): void {
|
||||||
const hist = this.props.history;
|
this.props.history.goBack();
|
||||||
if (hist.length > 1) {
|
|
||||||
hist.goBack();
|
|
||||||
} else {
|
|
||||||
hist.push('/');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* delete the current video and return to last page
|
* delete the current video and return to last page
|
||||||
*/
|
*/
|
||||||
deleteVideo(fullyDelete: boolean): void {
|
deleteVideo(): void {
|
||||||
callAPI(
|
callAPI(
|
||||||
APINode.Video,
|
APINode.Video,
|
||||||
{action: 'deleteVideo', MovieId: parseInt(this.props.match.params.id, 10), FullyDelete: fullyDelete},
|
{action: 'deleteVideo', MovieId: parseInt(this.props.match.params.id, 10)},
|
||||||
(result: GeneralSuccess) => {
|
(result: GeneralSuccess) => {
|
||||||
if (result.result === 'success') {
|
if (result.result === 'success') {
|
||||||
// return to last element if successful
|
// return to last element if successful
|
||||||
this.props.history.goBack();
|
this.props.history.goBack();
|
||||||
} else {
|
} else {
|
||||||
console.error('an error occured while deleting the video: ' + JSON.stringify(result));
|
console.error('an error occured while liking');
|
||||||
|
console.error(result);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
@ -2,21 +2,16 @@ import React from 'react';
|
|||||||
import style from './RandomPage.module.css';
|
import style from './RandomPage.module.css';
|
||||||
import SideBar, {SideBarTitle} from '../../elements/SideBar/SideBar';
|
import SideBar, {SideBarTitle} from '../../elements/SideBar/SideBar';
|
||||||
import Tag from '../../elements/Tag/Tag';
|
import Tag from '../../elements/Tag/Tag';
|
||||||
import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
|
import PageTitle from '../../elements/PageTitle/PageTitle';
|
||||||
import VideoContainer from '../../elements/VideoContainer/VideoContainer';
|
import VideoContainer from '../../elements/VideoContainer/VideoContainer';
|
||||||
import {APINode, callAPI} from '../../utils/Api';
|
import {APINode, callAPI} from '../../utils/Api';
|
||||||
import {TagType} from '../../types/VideoTypes';
|
import {TagType} from '../../types/VideoTypes';
|
||||||
import {VideoTypes} from '../../types/ApiTypes';
|
import {VideoTypes} from '../../types/ApiTypes';
|
||||||
import {addKeyHandler, removeKeyHandler} from '../../utils/ShortkeyHandler';
|
import {addKeyHandler, removeKeyHandler} from '../../utils/ShortkeyHandler';
|
||||||
import {IconButton} from '../../elements/GPElements/Button';
|
|
||||||
import {faMinusCircle, faPlusCircle} from '@fortawesome/free-solid-svg-icons';
|
|
||||||
import AddTagPopup from '../../elements/Popups/AddTagPopup/AddTagPopup';
|
|
||||||
|
|
||||||
interface state {
|
interface state {
|
||||||
videos: VideoTypes.VideoUnloadedType[];
|
videos: VideoTypes.VideoUnloadedType[];
|
||||||
tags: TagType[];
|
tags: TagType[];
|
||||||
filterTags: TagType[];
|
|
||||||
addTagPopup: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
interface GetRandomMoviesType {
|
interface GetRandomMoviesType {
|
||||||
@ -34,10 +29,8 @@ class RandomPage extends React.Component<{}, state> {
|
|||||||
super(props);
|
super(props);
|
||||||
|
|
||||||
this.state = {
|
this.state = {
|
||||||
addTagPopup: false,
|
|
||||||
videos: [],
|
videos: [],
|
||||||
tags: [],
|
tags: []
|
||||||
filterTags: []
|
|
||||||
};
|
};
|
||||||
|
|
||||||
this.keypress = this.keypress.bind(this);
|
this.keypress = this.keypress.bind(this);
|
||||||
@ -56,76 +49,49 @@ class RandomPage extends React.Component<{}, state> {
|
|||||||
render(): JSX.Element {
|
render(): JSX.Element {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<PageTitle title='Random Videos' subtitle='3pc' />
|
<PageTitle title='Random Videos' subtitle='4pc' />
|
||||||
|
|
||||||
<SideBar>
|
<SideBar>
|
||||||
<SideBarTitle>Visible Tags:</SideBarTitle>
|
<SideBarTitle>Visible Tags:</SideBarTitle>
|
||||||
{this.state.tags.map((m) => (
|
{this.state.tags.map((m) => (
|
||||||
<Tag key={m.TagId} tagInfo={m} />
|
<Tag key={m.TagId} tagInfo={m} />
|
||||||
))}
|
))}
|
||||||
<Line />
|
|
||||||
<SideBarTitle>Filter Tags:</SideBarTitle>
|
|
||||||
{this.state.filterTags.map((m) => (
|
|
||||||
<Tag key={m.TagId} tagInfo={m} />
|
|
||||||
))}
|
|
||||||
<IconButton
|
|
||||||
title='Add'
|
|
||||||
icon={faPlusCircle}
|
|
||||||
onClick={(): void => {
|
|
||||||
this.setState({addTagPopup: true});
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
{this.state.filterTags.length > 0 ? (
|
|
||||||
<IconButton
|
|
||||||
title='Remove All'
|
|
||||||
icon={faMinusCircle}
|
|
||||||
onClick={(): void => {
|
|
||||||
this.setState({filterTags: []}, (): void => {
|
|
||||||
this.loadShuffledvideos(this.LoadNR);
|
|
||||||
});
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
) : (
|
|
||||||
<></>
|
|
||||||
)}
|
|
||||||
</SideBar>
|
</SideBar>
|
||||||
|
|
||||||
{this.state.videos.length !== 0 ? <VideoContainer data={this.state.videos} /> : <div>No Data found!</div>}
|
{this.state.videos.length !== 0 ? (
|
||||||
|
<VideoContainer data={this.state.videos}>
|
||||||
<div className={style.Shufflebutton}>
|
<div className={style.Shufflebutton}>
|
||||||
<button onClick={(): void => this.loadShuffledvideos(this.LoadNR)} className={style.btnshuffle}>
|
<button onClick={(): void => this.shuffleclick()} className={style.btnshuffle}>
|
||||||
Shuffle
|
Shuffle
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
{this.state.addTagPopup ? (
|
</VideoContainer>
|
||||||
<AddTagPopup
|
) : (
|
||||||
onHide={(): void => this.setState({addTagPopup: false})}
|
<div>No Data found!</div>
|
||||||
submit={(tagId: number, tagName: string): void => {
|
)}
|
||||||
this.setState({filterTags: [...this.state.filterTags, {TagId: tagId, TagName: tagName}]}, (): void => {
|
|
||||||
this.loadShuffledvideos(this.LoadNR);
|
|
||||||
});
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* click handler for shuffle btn
|
||||||
|
*/
|
||||||
|
shuffleclick(): void {
|
||||||
|
this.loadShuffledvideos(this.LoadNR);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* load random videos from backend
|
* load random videos from backend
|
||||||
* @param nr number of videos to load
|
* @param nr number of videos to load
|
||||||
*/
|
*/
|
||||||
loadShuffledvideos(nr: number): void {
|
loadShuffledvideos(nr: number): void {
|
||||||
callAPI<GetRandomMoviesType>(
|
callAPI<GetRandomMoviesType>(APINode.Video, {action: 'getRandomMovies', Number: nr}, (result) => {
|
||||||
APINode.Video,
|
|
||||||
{action: 'getRandomMovies', Number: nr, TagFilter: this.state.filterTags.map((t) => t.TagId)},
|
|
||||||
(result) => {
|
|
||||||
this.setState({videos: []}); // needed to trigger rerender of main videoview
|
this.setState({videos: []}); // needed to trigger rerender of main videoview
|
||||||
this.setState({
|
this.setState({
|
||||||
videos: result.Videos,
|
videos: result.Videos,
|
||||||
tags: result.Tags
|
tags: result.Tags
|
||||||
});
|
});
|
||||||
}
|
});
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -135,7 +101,7 @@ class RandomPage extends React.Component<{}, state> {
|
|||||||
private keypress(event: KeyboardEvent): void {
|
private keypress(event: KeyboardEvent): void {
|
||||||
// bind s to shuffle
|
// bind s to shuffle
|
||||||
if (event.key === 's') {
|
if (event.key === 's') {
|
||||||
this.loadShuffledvideos(3);
|
this.loadShuffledvideos(4);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -11,9 +11,3 @@
|
|||||||
padding: 10px;
|
padding: 10px;
|
||||||
width: 40%;
|
width: 40%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.uploadtext {
|
|
||||||
font-size: x-large;
|
|
||||||
margin-top: 30px;
|
|
||||||
margin-bottom: 10px;
|
|
||||||
}
|
|
||||||
|
@ -2,8 +2,6 @@ import React from 'react';
|
|||||||
import style from './MovieSettings.module.css';
|
import style from './MovieSettings.module.css';
|
||||||
import {APINode, callAPI} from '../../utils/Api';
|
import {APINode, callAPI} from '../../utils/Api';
|
||||||
import {GeneralSuccess} from '../../types/GeneralTypes';
|
import {GeneralSuccess} from '../../types/GeneralTypes';
|
||||||
import {DropZone} from '../../elements/DropZone/DropZone';
|
|
||||||
import GlobalInfos from '../../utils/GlobalInfos';
|
|
||||||
|
|
||||||
interface state {
|
interface state {
|
||||||
text: string[];
|
text: string[];
|
||||||
@ -101,8 +99,6 @@ class MovieSettings extends React.Component<Props, state> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render(): JSX.Element {
|
render(): JSX.Element {
|
||||||
const theme = GlobalInfos.getThemeStyle();
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<button
|
<button
|
||||||
@ -121,16 +117,12 @@ class MovieSettings extends React.Component<Props, state> {
|
|||||||
TVShow Reindex
|
TVShow Reindex
|
||||||
</button>
|
</button>
|
||||||
<div className={style.indextextarea}>
|
<div className={style.indextextarea}>
|
||||||
{this.state.text.map((m, i) => (
|
{this.state.text.map((m) => (
|
||||||
<div key={i} className='textarea-element'>
|
<div key={m} className='textarea-element'>
|
||||||
{m}
|
{m}
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
<div className={theme.textcolor}>
|
|
||||||
<div className={style.uploadtext}>Video Upload:</div>
|
|
||||||
<DropZone />
|
|
||||||
</div>
|
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
10
src/pages/SettingsPage/SettingsPage.test.js
Normal file
10
src/pages/SettingsPage/SettingsPage.test.js
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
import {shallow} from 'enzyme';
|
||||||
|
import React from 'react';
|
||||||
|
import SettingsPage from './SettingsPage';
|
||||||
|
|
||||||
|
describe('<RandomPage/>', function () {
|
||||||
|
it('renders without crashing ', function () {
|
||||||
|
const wrapper = shallow(<SettingsPage/>);
|
||||||
|
wrapper.unmount();
|
||||||
|
});
|
||||||
|
});
|
@ -1,56 +1,54 @@
|
|||||||
import React, {useContext} from 'react';
|
import React from 'react';
|
||||||
import MovieSettings from './MovieSettings';
|
import MovieSettings from './MovieSettings';
|
||||||
import GeneralSettings from './GeneralSettings';
|
import GeneralSettings from './GeneralSettings';
|
||||||
import style from './SettingsPage.module.css';
|
import style from './SettingsPage.module.css';
|
||||||
import GlobalInfos from '../../utils/GlobalInfos';
|
import GlobalInfos from '../../utils/GlobalInfos';
|
||||||
import {NavLink, Redirect, Route, Switch, useRouteMatch} from 'react-router-dom';
|
import {NavLink, Redirect, Route, Switch} from 'react-router-dom';
|
||||||
import {FeatureContext} from '../../utils/context/FeatureContext';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Settingspage handles all kinds of settings for the mediacenter
|
* The Settingspage handles all kinds of settings for the mediacenter
|
||||||
* and is basically a wrapper for child-tabs
|
* and is basically a wrapper for child-tabs
|
||||||
*/
|
*/
|
||||||
const SettingsPage = (): JSX.Element => {
|
class SettingsPage extends React.Component {
|
||||||
|
render(): JSX.Element {
|
||||||
const themestyle = GlobalInfos.getThemeStyle();
|
const themestyle = GlobalInfos.getThemeStyle();
|
||||||
const match = useRouteMatch();
|
|
||||||
const features = useContext(FeatureContext);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<div className={style.SettingsSidebar + ' ' + themestyle.secbackground}>
|
<div className={style.SettingsSidebar + ' ' + themestyle.secbackground}>
|
||||||
<div className={style.SettingsSidebarTitle + ' ' + themestyle.lighttextcolor}>Settings</div>
|
<div className={style.SettingsSidebarTitle + ' ' + themestyle.lighttextcolor}>Settings</div>
|
||||||
<NavLink to='/media/settings/general'>
|
<NavLink to='/settings/general'>
|
||||||
<div className={style.SettingSidebarElement}>General</div>
|
<div className={style.SettingSidebarElement}>General</div>
|
||||||
</NavLink>
|
</NavLink>
|
||||||
<NavLink to='/media/settings/movies'>
|
<NavLink to='/settings/movies'>
|
||||||
<div className={style.SettingSidebarElement}>Movies</div>
|
<div className={style.SettingSidebarElement}>Movies</div>
|
||||||
</NavLink>
|
</NavLink>
|
||||||
{features.TVShowEnabled ? (
|
{GlobalInfos.isTVShowEnabled() ? (
|
||||||
<NavLink to='/media/settings/tv'>
|
<NavLink to='/settings/tv'>
|
||||||
<div className={style.SettingSidebarElement}>TV Shows</div>
|
<div className={style.SettingSidebarElement}>TV Shows</div>
|
||||||
</NavLink>
|
</NavLink>
|
||||||
) : null}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
<div className={style.SettingsContent}>
|
<div className={style.SettingsContent}>
|
||||||
<Switch>
|
<Switch>
|
||||||
<Route path={`${match.url}/general`}>
|
<Route path='/settings/general'>
|
||||||
<GeneralSettings />
|
<GeneralSettings />
|
||||||
</Route>
|
</Route>
|
||||||
<Route path={`${match.url}/movies`}>
|
<Route path='/settings/movies'>
|
||||||
<MovieSettings />
|
<MovieSettings />
|
||||||
</Route>
|
</Route>
|
||||||
{features.TVShowEnabled ? (
|
{GlobalInfos.isTVShowEnabled() ? (
|
||||||
<Route path={`${match.url}/tv`}>
|
<Route path='/settings/tv'>
|
||||||
<span />
|
<span />
|
||||||
</Route>
|
</Route>
|
||||||
) : null}
|
) : null}
|
||||||
<Route path={`${match.url}/`}>
|
<Route path='/settings'>
|
||||||
<Redirect to='/media/settings/general' />
|
<Redirect to='/settings/general' />
|
||||||
</Route>
|
</Route>
|
||||||
</Switch>
|
</Switch>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export default SettingsPage;
|
export default SettingsPage;
|
||||||
|
@ -66,7 +66,7 @@ export class EpisodePage extends React.Component<Props, State> {
|
|||||||
export const EpisodeTile = (props: {episode: Episode}): JSX.Element => {
|
export const EpisodeTile = (props: {episode: Episode}): JSX.Element => {
|
||||||
const themestyle = GlobalInfos.getThemeStyle();
|
const themestyle = GlobalInfos.getThemeStyle();
|
||||||
return (
|
return (
|
||||||
<Link to={'/media/tvplayer/' + props.episode.ID}>
|
<Link to={'/tvplayer/' + props.episode.ID}>
|
||||||
<div className={tileStyle.tile + ' ' + themestyle.secbackground + ' ' + themestyle.textcolor}>
|
<div className={tileStyle.tile + ' ' + themestyle.secbackground + ' ' + themestyle.textcolor}>
|
||||||
<FontAwesomeIcon
|
<FontAwesomeIcon
|
||||||
style={{
|
style={{
|
||||||
|
@ -55,7 +55,7 @@ export class TVShowPage extends React.Component<Props, State> {
|
|||||||
(result) => callback(result)
|
(result) => callback(result)
|
||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
linkPath={'/media/tvshows/' + elem.Id}
|
linkPath={'/tvshows/' + elem.Id}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
data={this.state.loading ? [] : this.data}
|
data={this.state.loading ? [] : this.data}
|
||||||
@ -72,7 +72,7 @@ export default function (): JSX.Element {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Switch>
|
<Switch>
|
||||||
<Route exact path={`${match.path}/:id`}>
|
<Route path={`${match.path}/:id`}>
|
||||||
<EpisodePage />
|
<EpisodePage />
|
||||||
</Route>
|
</Route>
|
||||||
<Route path={match.path}>
|
<Route path={match.path}>
|
||||||
|
@ -6,6 +6,8 @@ import '@testing-library/jest-dom/extend-expect';
|
|||||||
|
|
||||||
import {configure} from 'enzyme';
|
import {configure} from 'enzyme';
|
||||||
import Adapter from 'enzyme-adapter-react-16';
|
import Adapter from 'enzyme-adapter-react-16';
|
||||||
|
import {CookieTokenStore} from "./utils/TokenStore/CookieTokenStore";
|
||||||
|
import {token} from "./utils/TokenHandler";
|
||||||
|
|
||||||
configure({adapter: new Adapter()});
|
configure({adapter: new Adapter()});
|
||||||
|
|
||||||
@ -43,6 +45,7 @@ global.callAPIMock = (resonse) => {
|
|||||||
global.beforeEach(() => {
|
global.beforeEach(() => {
|
||||||
// empty fetch response implementation for each test
|
// empty fetch response implementation for each test
|
||||||
global.fetch = prepareFetchApi({});
|
global.fetch = prepareFetchApi({});
|
||||||
|
token.init(new CookieTokenStore());
|
||||||
// todo with callAPIMock
|
// todo with callAPIMock
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -8,7 +8,6 @@ export namespace VideoTypes {
|
|||||||
MovieName: string;
|
MovieName: string;
|
||||||
Likes: number;
|
Likes: number;
|
||||||
Quality: number;
|
Quality: number;
|
||||||
ReleaseDate: string | null;
|
|
||||||
Length: number;
|
Length: number;
|
||||||
Tags: TagType[];
|
Tags: TagType[];
|
||||||
SuggestedTag: TagType[];
|
SuggestedTag: TagType[];
|
||||||
@ -27,7 +26,6 @@ export namespace VideoTypes {
|
|||||||
export interface VideoUnloadedType {
|
export interface VideoUnloadedType {
|
||||||
MovieId: number;
|
MovieId: number;
|
||||||
MovieName: string;
|
MovieName: string;
|
||||||
Ratio: number;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -39,7 +37,6 @@ export namespace SettingsTypes {
|
|||||||
VideoPath: string;
|
VideoPath: string;
|
||||||
TVShowPath: string;
|
TVShowPath: string;
|
||||||
TVShowEnabled: boolean;
|
TVShowEnabled: boolean;
|
||||||
FullDeleteEnabled: boolean;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SettingsType {
|
export interface SettingsType {
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
import {cookie} from './context/Cookie';
|
import GlobalInfos from './GlobalInfos';
|
||||||
|
import {token} from './TokenHandler';
|
||||||
|
|
||||||
const APIPREFIX: string = '/api/';
|
const APIPREFIX: string = '/api/';
|
||||||
|
|
||||||
@ -24,7 +25,9 @@ export function callAPI<T>(
|
|||||||
callback: (_: T) => void,
|
callback: (_: T) => void,
|
||||||
errorcallback: (_: string) => void = (_: string): void => {}
|
errorcallback: (_: string) => void = (_: string): void => {}
|
||||||
): void {
|
): void {
|
||||||
generalAPICall<T>(apinode, fd, callback, errorcallback, false, true);
|
token.checkAPITokenValid((mytoken) => {
|
||||||
|
generalAPICall<T>(apinode, fd, callback, errorcallback, false, true, mytoken);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -40,7 +43,7 @@ export function callApiUnsafe<T>(
|
|||||||
callback: (_: T) => void,
|
callback: (_: T) => void,
|
||||||
errorcallback?: (_: string) => void
|
errorcallback?: (_: string) => void
|
||||||
): void {
|
): void {
|
||||||
generalAPICall(apinode, fd, callback, errorcallback, true, true);
|
generalAPICall(apinode, fd, callback, errorcallback, true, true, '');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -50,7 +53,9 @@ export function callApiUnsafe<T>(
|
|||||||
* @param callback the callback with PLAIN text reply from backend
|
* @param callback the callback with PLAIN text reply from backend
|
||||||
*/
|
*/
|
||||||
export function callAPIPlain(apinode: APINode, fd: ApiBaseRequest, callback: (_: string) => void): void {
|
export function callAPIPlain(apinode: APINode, fd: ApiBaseRequest, callback: (_: string) => void): void {
|
||||||
generalAPICall(apinode, fd, callback, () => {}, false, false);
|
token.checkAPITokenValid((mytoken) => {
|
||||||
|
generalAPICall(apinode, fd, callback, () => {}, false, false, mytoken);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function generalAPICall<T>(
|
function generalAPICall<T>(
|
||||||
@ -59,16 +64,16 @@ function generalAPICall<T>(
|
|||||||
callback: (_: T) => void,
|
callback: (_: T) => void,
|
||||||
errorcallback: (_: string) => void = (_: string): void => {},
|
errorcallback: (_: string) => void = (_: string): void => {},
|
||||||
unsafe: boolean,
|
unsafe: boolean,
|
||||||
json: boolean
|
json: boolean,
|
||||||
|
mytoken: string
|
||||||
): void {
|
): void {
|
||||||
(async function (): Promise<void> {
|
(async function (): Promise<void> {
|
||||||
const tkn = cookie.Load();
|
const response = await fetch(APIPREFIX + apinode, {
|
||||||
const response = await fetch(APIPREFIX + apinode + '/' + fd.action, {
|
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: JSON.stringify(fd),
|
body: JSON.stringify(fd),
|
||||||
headers: new Headers({
|
headers: new Headers({
|
||||||
'Content-Type': json ? 'application/json' : 'text/plain',
|
'Content-Type': json ? 'application/json' : 'text/plain',
|
||||||
...(!unsafe && tkn !== null && {Token: tkn.Token})
|
...(!unsafe && {Authorization: 'Bearer ' + mytoken})
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -83,7 +88,13 @@ function generalAPICall<T>(
|
|||||||
}
|
}
|
||||||
} else if (response.status === 400) {
|
} else if (response.status === 400) {
|
||||||
// Bad Request --> invalid token
|
// Bad Request --> invalid token
|
||||||
console.log('bad request todo sth here');
|
console.log('loading Password page.');
|
||||||
|
// load password page
|
||||||
|
if (GlobalInfos.loadPasswordPage) {
|
||||||
|
GlobalInfos.loadPasswordPage(() => {
|
||||||
|
callAPI(apinode, fd, callback, errorcallback);
|
||||||
|
});
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
console.log('Error: ' + response.statusText);
|
console.log('Error: ' + response.statusText);
|
||||||
if (errorcallback) {
|
if (errorcallback) {
|
||||||
@ -97,11 +108,11 @@ function generalAPICall<T>(
|
|||||||
* API nodes definitions
|
* API nodes definitions
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
// eslint-disable-next-line no-shadow
|
||||||
export enum APINode {
|
export enum APINode {
|
||||||
Login = 'login',
|
|
||||||
Settings = 'settings',
|
Settings = 'settings',
|
||||||
Tags = 'tags',
|
Tags = 'tags',
|
||||||
Actor = 'actor',
|
Actor = 'actor',
|
||||||
Video = 'video',
|
Video = 'video',
|
||||||
TVShow = 'tv'
|
TVShow = 'tvshow'
|
||||||
}
|
}
|
||||||
|
@ -10,7 +10,6 @@ class StaticInfos {
|
|||||||
private videopath: string = '';
|
private videopath: string = '';
|
||||||
private tvshowpath: string = '';
|
private tvshowpath: string = '';
|
||||||
private TVShowsEnabled: boolean = false;
|
private TVShowsEnabled: boolean = false;
|
||||||
private fullDeleteable: boolean = false;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* check if the current theme is the dark theme
|
* check if the current theme is the dark theme
|
||||||
@ -25,7 +24,6 @@ class StaticInfos {
|
|||||||
* @param enable enable the dark theme?
|
* @param enable enable the dark theme?
|
||||||
*/
|
*/
|
||||||
enableDarkTheme(enable = true): void {
|
enableDarkTheme(enable = true): void {
|
||||||
if (this.darktheme !== enable) {
|
|
||||||
this.darktheme = enable;
|
this.darktheme = enable;
|
||||||
|
|
||||||
// trigger onThemeChange handlers
|
// trigger onThemeChange handlers
|
||||||
@ -33,7 +31,6 @@ class StaticInfos {
|
|||||||
func();
|
func();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get the currently selected theme stylesheet
|
* get the currently selected theme stylesheet
|
||||||
@ -51,7 +48,6 @@ class StaticInfos {
|
|||||||
/**
|
/**
|
||||||
* set the current videopath
|
* set the current videopath
|
||||||
* @param vidpath videopath with beginning and ending slash
|
* @param vidpath videopath with beginning and ending slash
|
||||||
* @param tvshowpath
|
|
||||||
*/
|
*/
|
||||||
setVideoPaths(vidpath: string, tvshowpath: string): void {
|
setVideoPaths(vidpath: string, tvshowpath: string): void {
|
||||||
this.videopath = vidpath;
|
this.videopath = vidpath;
|
||||||
@ -71,6 +67,19 @@ class StaticInfos {
|
|||||||
getTVShowPath(): string {
|
getTVShowPath(): string {
|
||||||
return this.tvshowpath;
|
return this.tvshowpath;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* load the Password page manually
|
||||||
|
*/
|
||||||
|
loadPasswordPage: ((callback?: () => void) => void) | undefined = undefined;
|
||||||
|
|
||||||
|
setTVShowsEnabled(TVShowEnabled: boolean): void {
|
||||||
|
this.TVShowsEnabled = TVShowEnabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
isTVShowEnabled(): boolean {
|
||||||
|
return this.TVShowsEnabled;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default new StaticInfos();
|
export default new StaticInfos();
|
||||||
|
135
src/utils/TokenHandler.ts
Normal file
135
src/utils/TokenHandler.ts
Normal file
@ -0,0 +1,135 @@
|
|||||||
|
import {TokenStore} from './TokenStore/TokenStore';
|
||||||
|
|
||||||
|
export namespace token {
|
||||||
|
// store api token - empty if not set
|
||||||
|
let apiToken = '';
|
||||||
|
|
||||||
|
// a callback que to be called after api token refresh
|
||||||
|
let callQue: ((error: string) => void)[] = [];
|
||||||
|
// flag to check wheter a api refresh is currently pending
|
||||||
|
let refreshInProcess = false;
|
||||||
|
// store the expire seconds of token
|
||||||
|
let expireSeconds = -1;
|
||||||
|
|
||||||
|
let tokenStore: TokenStore;
|
||||||
|
let APiHost: string = '/';
|
||||||
|
|
||||||
|
export function init(ts: TokenStore, apiHost?: string): void {
|
||||||
|
tokenStore = ts;
|
||||||
|
if (apiHost) {
|
||||||
|
APiHost = apiHost;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* refresh the api token or use that one in cookie if still valid
|
||||||
|
* @param callback to be called after successful refresh
|
||||||
|
* @param password
|
||||||
|
* @param force
|
||||||
|
*/
|
||||||
|
export function refreshAPIToken(callback: (error: string) => void, force?: boolean, password?: string): void {
|
||||||
|
callQue.push(callback);
|
||||||
|
|
||||||
|
// check if already is a token refresh is in process
|
||||||
|
if (refreshInProcess) {
|
||||||
|
// if yes return
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
// if not set flat
|
||||||
|
refreshInProcess = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (apiTokenValid() && !force) {
|
||||||
|
console.log('token still valid...');
|
||||||
|
callFuncQue('');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const formData = new FormData();
|
||||||
|
formData.append('grant_type', 'client_credentials');
|
||||||
|
formData.append('client_id', 'openmediacenter');
|
||||||
|
formData.append('client_secret', password ? password : 'openmediacenter');
|
||||||
|
formData.append('scope', 'all');
|
||||||
|
|
||||||
|
interface APIToken {
|
||||||
|
error?: string;
|
||||||
|
// eslint-disable-next-line camelcase
|
||||||
|
access_token: string; // no camel case allowed because of backendlib
|
||||||
|
// eslint-disable-next-line camelcase
|
||||||
|
expires_in: number; // no camel case allowed because of backendlib
|
||||||
|
scope: string;
|
||||||
|
// eslint-disable-next-line camelcase
|
||||||
|
token_type: string; // no camel case allowed because of backendlib
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(APiHost);
|
||||||
|
|
||||||
|
fetch(APiHost + 'token', {method: 'POST', body: formData})
|
||||||
|
.then((response) =>
|
||||||
|
response.json().then((result: APIToken) => {
|
||||||
|
if (result.error) {
|
||||||
|
callFuncQue(result.error);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// set api token
|
||||||
|
apiToken = result.access_token;
|
||||||
|
// set expire time
|
||||||
|
expireSeconds = new Date().getTime() / 1000 + result.expires_in;
|
||||||
|
// setTokenCookie(apiToken, expireSeconds);
|
||||||
|
tokenStore.setToken({accessToken: apiToken, expireTime: expireSeconds, tokenType: '', scope: ''});
|
||||||
|
// call all handlers and release flag
|
||||||
|
callFuncQue('');
|
||||||
|
})
|
||||||
|
)
|
||||||
|
.catch((e) => {
|
||||||
|
callback(e);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function apiTokenValid(): boolean {
|
||||||
|
// check if a cookie with token is available
|
||||||
|
// const token = getTokenCookie();
|
||||||
|
const tmptoken = tokenStore.loadToken();
|
||||||
|
if (tmptoken !== null) {
|
||||||
|
// check if token is at least valid for the next minute
|
||||||
|
if (tmptoken.expireTime > new Date().getTime() / 1000 + 60) {
|
||||||
|
apiToken = tmptoken.accessToken;
|
||||||
|
expireSeconds = tmptoken.expireTime;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* call all qued callbacks
|
||||||
|
*/
|
||||||
|
function callFuncQue(error: string): void {
|
||||||
|
// call all pending handlers
|
||||||
|
callQue.map((func) => {
|
||||||
|
return func(error);
|
||||||
|
});
|
||||||
|
// reset pending que
|
||||||
|
callQue = [];
|
||||||
|
// release flag to be able to start new refresh
|
||||||
|
refreshInProcess = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* check if api token is valid -- if not request new one
|
||||||
|
* when finished call callback
|
||||||
|
* @param callback function to be called afterwards
|
||||||
|
*/
|
||||||
|
export function checkAPITokenValid(callback: (mytoken: string) => void): void {
|
||||||
|
// check if token is valid and set
|
||||||
|
if (apiToken === '' || expireSeconds <= new Date().getTime() / 1000) {
|
||||||
|
console.log('token not valid...');
|
||||||
|
refreshAPIToken(() => {
|
||||||
|
callback(apiToken);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
callback(apiToken);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
48
src/utils/TokenStore/CookieTokenStore.ts
Normal file
48
src/utils/TokenStore/CookieTokenStore.ts
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
import {Token, TokenStore} from './TokenStore';
|
||||||
|
|
||||||
|
export class CookieTokenStore extends TokenStore {
|
||||||
|
loadToken(): Token | null {
|
||||||
|
const token = this.decodeCookie('token');
|
||||||
|
const expireInString = this.decodeCookie('token_expire');
|
||||||
|
const expireIn = parseInt(expireInString, 10);
|
||||||
|
|
||||||
|
if (expireIn !== 0 && token !== '') {
|
||||||
|
return {accessToken: token, expireTime: expireIn, scope: '', tokenType: ''};
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set the cookie for the currently gotten token
|
||||||
|
* @param token the token to set
|
||||||
|
*/
|
||||||
|
setToken(token: Token): void {
|
||||||
|
let d = new Date();
|
||||||
|
d.setTime(token.expireTime * 1000);
|
||||||
|
console.log('token set' + d.toUTCString());
|
||||||
|
let expires = 'expires=' + d.toUTCString();
|
||||||
|
document.cookie = 'token=' + token.accessToken + ';' + expires + ';path=/';
|
||||||
|
document.cookie = 'token_expire=' + token.expireTime + ';' + expires + ';path=/';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* decode a simple cookie with key specified
|
||||||
|
* @param key cookie key
|
||||||
|
*/
|
||||||
|
decodeCookie(key: string): string {
|
||||||
|
let name = key + '=';
|
||||||
|
let decodedCookie = decodeURIComponent(document.cookie);
|
||||||
|
let ca = decodedCookie.split(';');
|
||||||
|
for (let i = 0; i < ca.length; i++) {
|
||||||
|
let c = ca[i];
|
||||||
|
while (c.charAt(0) === ' ') {
|
||||||
|
c = c.substring(1);
|
||||||
|
}
|
||||||
|
if (c.indexOf(name) === 0) {
|
||||||
|
return c.substring(name.length, c.length);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
}
|
11
src/utils/TokenStore/TokenStore.ts
Normal file
11
src/utils/TokenStore/TokenStore.ts
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
export interface Token {
|
||||||
|
accessToken: string;
|
||||||
|
expireTime: number; // second time when token will be invalidated
|
||||||
|
scope: string;
|
||||||
|
tokenType: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export abstract class TokenStore {
|
||||||
|
abstract loadToken(): Token | null;
|
||||||
|
abstract setToken(token: Token): void;
|
||||||
|
}
|
@ -1,55 +0,0 @@
|
|||||||
export interface Token {
|
|
||||||
Token: string;
|
|
||||||
ExpiresAt: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export namespace cookie {
|
|
||||||
const jwtcookiename = 'jwt';
|
|
||||||
|
|
||||||
export function Store(data: Token): void {
|
|
||||||
const d = new Date();
|
|
||||||
d.setTime(data.ExpiresAt * 1000);
|
|
||||||
const expires = 'expires=' + d.toUTCString();
|
|
||||||
|
|
||||||
document.cookie = jwtcookiename + '=' + JSON.stringify(data) + ';' + expires + ';path=/';
|
|
||||||
}
|
|
||||||
|
|
||||||
export function Load(): Token | null {
|
|
||||||
const datastr = decodeCookie(jwtcookiename);
|
|
||||||
if (datastr === '') {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
return JSON.parse(datastr);
|
|
||||||
} catch (e) {
|
|
||||||
// if cookie not decodeable delete it and return null
|
|
||||||
Delete();
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function Delete(): void {
|
|
||||||
document.cookie = `${jwtcookiename}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;`;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* decode a simple cookie with key specified
|
|
||||||
* @param key cookie key
|
|
||||||
*/
|
|
||||||
function decodeCookie(key: string): string {
|
|
||||||
let name = key + '=';
|
|
||||||
let decodedCookie = decodeURIComponent(document.cookie);
|
|
||||||
let ca = decodedCookie.split(';');
|
|
||||||
for (let i = 0; i < ca.length; i++) {
|
|
||||||
let c = ca[i];
|
|
||||||
while (c.charAt(0) === ' ') {
|
|
||||||
c = c.substring(1);
|
|
||||||
}
|
|
||||||
if (c.indexOf(name) === 0) {
|
|
||||||
return c.substring(name.length, c.length);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,32 +0,0 @@
|
|||||||
import React, {FunctionComponent, useState} from 'react';
|
|
||||||
|
|
||||||
export interface FeatureContextType {
|
|
||||||
setTVShowEnabled: (enabled: boolean) => void;
|
|
||||||
TVShowEnabled: boolean;
|
|
||||||
setVideosFullyDeleteable: (fullyDeletable: boolean) => void;
|
|
||||||
VideosFullyDeleteable: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A global context providing a way to interact with user login states
|
|
||||||
*/
|
|
||||||
export const FeatureContext = React.createContext<FeatureContextType>({
|
|
||||||
setTVShowEnabled: (_) => {},
|
|
||||||
TVShowEnabled: false,
|
|
||||||
setVideosFullyDeleteable: (_) => {},
|
|
||||||
VideosFullyDeleteable: false
|
|
||||||
});
|
|
||||||
|
|
||||||
export const FeatureContextProvider: FunctionComponent = (props): JSX.Element => {
|
|
||||||
const [tvshowenabled, settvshowenabled] = useState(false);
|
|
||||||
const [fullydeletablevids, setfullydeleteable] = useState(false);
|
|
||||||
|
|
||||||
const value: FeatureContextType = {
|
|
||||||
VideosFullyDeleteable: fullydeletablevids,
|
|
||||||
TVShowEnabled: tvshowenabled,
|
|
||||||
setTVShowEnabled: (e) => settvshowenabled(e),
|
|
||||||
setVideosFullyDeleteable: (e) => setfullydeleteable(e)
|
|
||||||
};
|
|
||||||
|
|
||||||
return <FeatureContext.Provider value={value}>{props.children}</FeatureContext.Provider>;
|
|
||||||
};
|
|
@ -1,34 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* global context definitions
|
|
||||||
*/
|
|
||||||
|
|
||||||
export enum LoginState {
|
|
||||||
LoggedIn,
|
|
||||||
LoggedOut
|
|
||||||
}
|
|
||||||
|
|
||||||
export enum LoginPerm {
|
|
||||||
Admin,
|
|
||||||
User
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface LoginContextType {
|
|
||||||
logout: () => void;
|
|
||||||
setPerm: (permission: LoginPerm) => void;
|
|
||||||
loginstate: LoginState;
|
|
||||||
setLoginState: (state: LoginState) => void;
|
|
||||||
permission: LoginPerm;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A global context providing a way to interact with user login states
|
|
||||||
*/
|
|
||||||
export const LoginContext = React.createContext<LoginContextType>({
|
|
||||||
setLoginState(): void {},
|
|
||||||
setPerm(): void {},
|
|
||||||
logout: () => {},
|
|
||||||
loginstate: LoginState.LoggedOut,
|
|
||||||
permission: LoginPerm.User
|
|
||||||
});
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user