Compare commits
1 Commits
gallery
...
thumbnail_
| Author | SHA1 | Date | |
|---|---|---|---|
| ef5bc2f597 |
@ -12,83 +12,32 @@ func AddActorsHandlers() {
|
||||
}
|
||||
|
||||
func getActorsFromDB() {
|
||||
/**
|
||||
* @api {post} /api/actor [getAllActors]
|
||||
* @apiDescription Get all available Actors
|
||||
* @apiName getAllActors
|
||||
* @apiGroup Actor
|
||||
*
|
||||
* @apiSuccess {Object[]} . Array of Actors available
|
||||
* @apiSuccess {uint32} .ActorId Actor Id
|
||||
* @apiSuccess {string} .Name Actor Name
|
||||
* @apiSuccess {string} .Thumbnail Portrait Thumbnail
|
||||
*/
|
||||
AddHandler("getAllActors", ActorNode, func(info *HandlerInfo) []byte {
|
||||
AddHandler("getAllActors", ActorNode, nil, func() []byte {
|
||||
query := "SELECT actor_id, name, thumbnail FROM actors"
|
||||
return jsonify(readActorsFromResultset(database.Query(query)))
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/actor [getActorsOfVideo]
|
||||
* @apiDescription Get all actors playing in one video
|
||||
* @apiName getActorsOfVideo
|
||||
* @apiGroup Actor
|
||||
*
|
||||
* @apiParam {int} MovieId ID of video
|
||||
*
|
||||
* @apiSuccess {Object[]} . Array of Actors available
|
||||
* @apiSuccess {uint32} .ActorId Actor Id
|
||||
* @apiSuccess {string} .Name Actor Name
|
||||
* @apiSuccess {string} .Thumbnail Portrait Thumbnail
|
||||
*/
|
||||
AddHandler("getActorsOfVideo", ActorNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var gaov struct {
|
||||
MovieId int
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
AddHandler("getActorsOfVideo", ActorNode, &gaov, func() []byte {
|
||||
query := fmt.Sprintf(`SELECT a.actor_id, name, thumbnail FROM actors_videos
|
||||
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`, gaov.MovieId)
|
||||
|
||||
return jsonify(readActorsFromResultset(database.Query(query)))
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/actor [getActorInfo]
|
||||
* @apiDescription Get all infos for an actor
|
||||
* @apiName getActorInfo
|
||||
* @apiGroup Actor
|
||||
*
|
||||
* @apiParam {int} ActorId ID of Actor
|
||||
*
|
||||
* @apiSuccess {VideoUnloadedType[]} Videos Array of Videos this actor plays in
|
||||
* @apiSuccess {uint32} Videos.MovieId Video Id
|
||||
* @apiSuccess {string} Videos.MovieName Video Name
|
||||
*
|
||||
* @apiSuccess {Info} Info Infos about the actor
|
||||
* @apiSuccess {uint32} Info.ActorId Actor Id
|
||||
* @apiSuccess {string} Info.Name Actor Name
|
||||
* @apiSuccess {string} Info.Thumbnail Actor Thumbnail
|
||||
*/
|
||||
AddHandler("getActorInfo", ActorNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var gai struct {
|
||||
ActorId int
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
AddHandler("getActorInfo", ActorNode, &gai, func() []byte {
|
||||
query := fmt.Sprintf(`SELECT movie_id, movie_name FROM actors_videos
|
||||
JOIN videos v on v.movie_id = actors_videos.video_id
|
||||
WHERE actors_videos.actor_id=%d`, args.ActorId)
|
||||
WHERE actors_videos.actor_id=%d`, gai.ActorId)
|
||||
videos := readVideosFromResultset(database.Query(query))
|
||||
|
||||
query = fmt.Sprintf("SELECT actor_id, name, thumbnail FROM actors WHERE actor_id=%d", args.ActorId)
|
||||
query = fmt.Sprintf("SELECT actor_id, name, thumbnail FROM actors WHERE actor_id=%d", gai.ActorId)
|
||||
actor := readActorsFromResultset(database.Query(query))[0]
|
||||
|
||||
var result = struct {
|
||||
@ -104,51 +53,20 @@ func getActorsFromDB() {
|
||||
}
|
||||
|
||||
func saveActorsToDB() {
|
||||
/**
|
||||
* @api {post} /api/video [createActor]
|
||||
* @apiDescription Create a new Actor
|
||||
* @apiName createActor
|
||||
* @apiGroup Actor
|
||||
*
|
||||
* @apiParam {string} ActorName Name of new Actor
|
||||
*
|
||||
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||
*/
|
||||
AddHandler("createActor", ActorNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var ca struct {
|
||||
ActorName string
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
AddHandler("createActor", ActorNode, &ca, func() []byte {
|
||||
query := "INSERT IGNORE INTO actors (name) VALUES (?)"
|
||||
return database.SuccessQuery(query, args.ActorName)
|
||||
return database.SuccessQuery(query, ca.ActorName)
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/video [addActorToVideo]
|
||||
* @apiDescription Add Actor to Video
|
||||
* @apiName addActorToVideo
|
||||
* @apiGroup Actor
|
||||
*
|
||||
* @apiParam {int} ActorId Id of Actor
|
||||
* @apiParam {int} MovieId Id of Movie to add to
|
||||
*
|
||||
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||
*/
|
||||
AddHandler("addActorToVideo", ActorNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var aatv struct {
|
||||
ActorId int
|
||||
MovieId int
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
query := fmt.Sprintf("INSERT IGNORE INTO actors_videos (actor_id, video_id) VALUES (%d,%d)", args.ActorId, args.MovieId)
|
||||
AddHandler("addActorToVideo", ActorNode, &aatv, func() []byte {
|
||||
query := fmt.Sprintf("INSERT IGNORE INTO actors_videos (actor_id, video_id) VALUES (%d,%d)", aatv.ActorId, aatv.MovieId)
|
||||
return database.SuccessQuery(query)
|
||||
})
|
||||
}
|
||||
|
||||
@ -4,10 +4,8 @@ import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"gopkg.in/oauth2.v3"
|
||||
"net/http"
|
||||
"openmediacenter/apiGo/api/oauth"
|
||||
"openmediacenter/apiGo/database/settings"
|
||||
)
|
||||
|
||||
const APIPREFIX = "/api"
|
||||
@ -18,30 +16,24 @@ const (
|
||||
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
|
||||
handler func() []byte
|
||||
arguments interface{}
|
||||
apiNode int
|
||||
}
|
||||
|
||||
var handlers = make(map[string]Handler)
|
||||
var handlers []Handler
|
||||
|
||||
func AddHandler(action string, apiNode int, h func(info *HandlerInfo) []byte) {
|
||||
func AddHandler(action string, apiNode int, n interface{}, h func() []byte) {
|
||||
// append new handler to the handlers
|
||||
handlers[fmt.Sprintf("%s/%d", action, apiNode)] = Handler{action, h, apiNode}
|
||||
handlers = append(handlers, Handler{action, h, n, apiNode})
|
||||
}
|
||||
|
||||
func ServerInit() {
|
||||
@ -49,51 +41,33 @@ func ServerInit() {
|
||||
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!
|
||||
func handleAPICall(action string, requestBody string, apiNode int) []byte {
|
||||
for i := range handlers {
|
||||
if handlers[i].action == action && handlers[i].apiNode == apiNode {
|
||||
// call the handler and return
|
||||
|
||||
if handlers[i].arguments != nil {
|
||||
// decode the arguments to the corresponding arguments object
|
||||
err := json.Unmarshal([]byte(requestBody), &handlers[i].arguments)
|
||||
if err != nil {
|
||||
fmt.Printf("failed to decode arguments of action %s :: %s\n", action, requestBody)
|
||||
}
|
||||
}
|
||||
|
||||
return handlers[i].handler()
|
||||
}
|
||||
}
|
||||
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) {
|
||||
func handlefunc(rw http.ResponseWriter, req *http.Request, node int) {
|
||||
// only allow post requests
|
||||
if req.Method != "POST" {
|
||||
return
|
||||
@ -109,13 +83,5 @@ func handlefunc(rw http.ResponseWriter, req *http.Request, node int, tokenInfo *
|
||||
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))
|
||||
rw.Write(handleAPICall(t.Action, body, node))
|
||||
}
|
||||
|
||||
@ -5,13 +5,13 @@ import (
|
||||
)
|
||||
|
||||
func cleanUp() {
|
||||
handlers = make(map[string]Handler)
|
||||
handlers = nil
|
||||
}
|
||||
|
||||
func TestAddHandler(t *testing.T) {
|
||||
cleanUp()
|
||||
|
||||
AddHandler("test", ActorNode, func(info *HandlerInfo) []byte {
|
||||
AddHandler("test", ActorNode, nil, func() []byte {
|
||||
return nil
|
||||
})
|
||||
if len(handlers) != 1 {
|
||||
@ -23,13 +23,13 @@ func TestCallOfHandler(t *testing.T) {
|
||||
cleanUp()
|
||||
|
||||
i := 0
|
||||
AddHandler("test", ActorNode, func(info *HandlerInfo) []byte {
|
||||
AddHandler("test", ActorNode, nil, func() []byte {
|
||||
i++
|
||||
return nil
|
||||
})
|
||||
|
||||
// simulate the call of the api
|
||||
handleAPICall("test", "", ActorNode, nil)
|
||||
handleAPICall("test", "", ActorNode)
|
||||
|
||||
if i != 1 {
|
||||
t.Errorf("Unexpected number of Lambda calls : %d/1", i)
|
||||
@ -39,32 +39,26 @@ func TestCallOfHandler(t *testing.T) {
|
||||
func TestDecodingOfArguments(t *testing.T) {
|
||||
cleanUp()
|
||||
|
||||
AddHandler("test", ActorNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var myvar 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)
|
||||
}
|
||||
|
||||
AddHandler("test", ActorNode, &myvar, func() []byte {
|
||||
return nil
|
||||
})
|
||||
|
||||
// simulate the call of the api
|
||||
handleAPICall("test", `{"Test":"myString","TestInt":42}`, ActorNode, nil)
|
||||
handleAPICall("test", `{"Test":"myString","TestInt":42}`, ActorNode)
|
||||
|
||||
if myvar.TestInt != 42 || myvar.Test != "myString" {
|
||||
t.Errorf("Wrong parsing of argument parameters : %d/42 - %s/myString", myvar.TestInt, myvar.Test)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNoHandlerCovers(t *testing.T) {
|
||||
cleanUp()
|
||||
|
||||
ret := handleAPICall("test", "", ActorNode, nil)
|
||||
ret := handleAPICall("test", "", ActorNode)
|
||||
|
||||
if ret != nil {
|
||||
t.Error("Expect nil return within unhandled api action")
|
||||
|
||||
@ -5,7 +5,6 @@ import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"openmediacenter/apiGo/api/types"
|
||||
"reflect"
|
||||
)
|
||||
|
||||
// MovieId - MovieName : pay attention to the order!
|
||||
@ -86,45 +85,3 @@ func jsonify(v interface{}) []byte {
|
||||
}
|
||||
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
|
||||
}
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
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
|
||||
})
|
||||
}
|
||||
@ -2,7 +2,6 @@ package api
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"openmediacenter/apiGo/api/types"
|
||||
"openmediacenter/apiGo/database"
|
||||
"openmediacenter/apiGo/database/settings"
|
||||
@ -18,52 +17,11 @@ func AddSettingsHandlers() {
|
||||
}
|
||||
|
||||
func getSettingsFromDB() {
|
||||
/**
|
||||
* @api {post} /api/settings [loadGeneralSettings]
|
||||
* @apiDescription Get the settings object
|
||||
* @apiName loadGeneralSettings
|
||||
* @apiGroup Settings
|
||||
*
|
||||
* @apiSuccess {Object} Settings Settings object
|
||||
* @apiSuccess {string} Settings.VideoPath webserver path to the videos
|
||||
* @apiSuccess {string} Settings.EpisodePath webserver path to the tvshows
|
||||
* @apiSuccess {string} Settings.MediacenterName overall name of the mediacenter
|
||||
* @apiSuccess {string} Settings.Password new server password (-1 if no password set)
|
||||
* @apiSuccess {bool} Settings.TMDBGrabbing TMDB grabbing support to grab tag info and thumbnails
|
||||
* @apiSuccess {bool} Settings.DarkMode Darkmode enabled?
|
||||
* @apiSuccess {Object} Sizes Sizes object
|
||||
* @apiSuccess {uint32} Sizes.VideoNr total number of videos
|
||||
* @apiSuccess {float32} Sizes.DBSize total size of database
|
||||
* @apiSuccess {uint32} Sizes.DifferentTags number of different tags available
|
||||
* @apiSuccess {uint32} Sizes.TagsAdded number of different tags added to videos
|
||||
*/
|
||||
AddHandler("loadGeneralSettings", SettingsNode, func(info *HandlerInfo) []byte {
|
||||
result, _, sizes := database.GetSettings()
|
||||
|
||||
var ret = struct {
|
||||
Settings *types.SettingsType
|
||||
Sizes *types.SettingsSizeType
|
||||
}{
|
||||
Settings: &result,
|
||||
Sizes: &sizes,
|
||||
}
|
||||
return jsonify(ret)
|
||||
AddHandler("loadGeneralSettings", SettingsNode, nil, func() []byte {
|
||||
result := database.GetSettings()
|
||||
return jsonify(result)
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/settings [loadInitialData]
|
||||
* @apiDescription load startdata to display on homepage
|
||||
* @apiName loadInitialData
|
||||
* @apiGroup Settings
|
||||
*
|
||||
* @apiSuccess {string} VideoPath webserver path to the videos
|
||||
* @apiSuccess {string} EpisodePath webserver path to the tvshows
|
||||
* @apiSuccess {string} MediacenterName overall name of the mediacenter
|
||||
* @apiSuccess {string} Pasword new server password (-1 if no password set)
|
||||
* @apiSuccess {bool} DarkMode Darkmode enabled?
|
||||
* @apiSuccess {bool} TVShowEnabled is are TVShows enabled
|
||||
*/
|
||||
AddHandler("loadInitialData", SettingsNode, func(info *HandlerInfo) []byte {
|
||||
AddHandler("loadInitialData", SettingsNode, nil, func() []byte {
|
||||
sett := settings.LoadSettings()
|
||||
|
||||
type InitialDataTypeResponse struct {
|
||||
@ -72,7 +30,6 @@ func getSettingsFromDB() {
|
||||
MediacenterName string
|
||||
VideoPath string
|
||||
TVShowPath string
|
||||
TVShowEnabled 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}")
|
||||
@ -87,7 +44,6 @@ func getSettingsFromDB() {
|
||||
MediacenterName: sett.MediacenterName,
|
||||
VideoPath: serverVideoPath,
|
||||
TVShowPath: serverTVShowPath,
|
||||
TVShowEnabled: settings.TVShowsEnabled(),
|
||||
}
|
||||
|
||||
str, _ := json.Marshal(res)
|
||||
@ -96,28 +52,10 @@ func getSettingsFromDB() {
|
||||
}
|
||||
|
||||
func saveSettingsToDB() {
|
||||
/**
|
||||
* @api {post} /api/settings [saveGeneralSettings]
|
||||
* @apiDescription Save the global settings provided
|
||||
* @apiName saveGeneralSettings
|
||||
* @apiGroup Settings
|
||||
*
|
||||
* @apiParam {string} VideoPath webserver path to the videos
|
||||
* @apiParam {string} EpisodePath webserver path to the tvshows
|
||||
* @apiParam {string} MediacenterName overall name of the mediacenter
|
||||
* @apiParam {string} Password new server password (-1 if no password set)
|
||||
* @apiParam {bool} TMDBGrabbing TMDB grabbing support to grab tag info and thumbnails
|
||||
* @apiParam {bool} DarkMode Darkmode enabled?
|
||||
*
|
||||
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||
*/
|
||||
AddHandler("saveGeneralSettings", SettingsNode, func(info *HandlerInfo) []byte {
|
||||
var args types.SettingsType
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
var sgs struct {
|
||||
Settings types.SettingsType
|
||||
}
|
||||
|
||||
AddHandler("saveGeneralSettings", SettingsNode, &sgs, func() []byte {
|
||||
query := `
|
||||
UPDATE settings SET
|
||||
video_path=?,
|
||||
@ -128,46 +66,24 @@ func saveSettingsToDB() {
|
||||
DarkMode=?
|
||||
WHERE 1`
|
||||
return database.SuccessQuery(query,
|
||||
args.VideoPath, args.EpisodePath, args.Password,
|
||||
args.MediacenterName, args.TMDBGrabbing, args.DarkMode)
|
||||
sgs.Settings.VideoPath, sgs.Settings.EpisodePath, sgs.Settings.Password,
|
||||
sgs.Settings.MediacenterName, sgs.Settings.TMDBGrabbing, sgs.Settings.DarkMode)
|
||||
})
|
||||
}
|
||||
|
||||
// methods for handling reindexing and cleanup of db gravity
|
||||
func reIndexHandling() {
|
||||
/**
|
||||
* @api {post} /api/settings [startReindex]
|
||||
* @apiDescription Start Database video reindex Job
|
||||
* @apiName startReindex
|
||||
* @apiGroup Settings
|
||||
*
|
||||
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||
*/
|
||||
AddHandler("startReindex", SettingsNode, func(info *HandlerInfo) []byte {
|
||||
AddHandler("startReindex", SettingsNode, nil, func() []byte {
|
||||
videoparser.StartReindex()
|
||||
return database.ManualSuccessResponse(nil)
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/settings [startTVShowReindex]
|
||||
* @apiDescription Start Database TVShow reindex job
|
||||
* @apiName startTVShowReindex
|
||||
* @apiGroup Settings
|
||||
*
|
||||
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||
*/
|
||||
AddHandler("startTVShowReindex", SettingsNode, func(info *HandlerInfo) []byte {
|
||||
AddHandler("startTVShowReindex", SettingsNode, nil, func() []byte {
|
||||
videoparser.StartTVShowReindex()
|
||||
return database.ManualSuccessResponse(nil)
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/settings [cleanupGravity]
|
||||
* @apiDescription Start Database cleanup job
|
||||
* @apiName cleanupGravity
|
||||
* @apiGroup Settings
|
||||
*/
|
||||
AddHandler("cleanupGravity", SettingsNode, func(info *HandlerInfo) []byte {
|
||||
AddHandler("cleanupGravity", SettingsNode, nil, func() []byte {
|
||||
videoparser.StartCleanup()
|
||||
return nil
|
||||
})
|
||||
|
||||
@ -3,55 +3,20 @@ package api
|
||||
import (
|
||||
"fmt"
|
||||
"openmediacenter/apiGo/database"
|
||||
"openmediacenter/apiGo/database/settings"
|
||||
)
|
||||
|
||||
func AddTvshowHandlers() {
|
||||
// do not add handlers if tvshows not enabled
|
||||
if !settings.TVShowsEnabled() {
|
||||
return
|
||||
}
|
||||
|
||||
/**
|
||||
* @api {post} /api/tvshow [getTVShows]
|
||||
* @apiDescription get all available tv shows
|
||||
* @apiName getTVShows
|
||||
* @apiGroup TVshow
|
||||
*
|
||||
* @apiSuccess {Object[]} .
|
||||
* @apiSuccess {uint32} .Id tvshow id
|
||||
* @apiSuccess {string} .Name tvshow name
|
||||
*/
|
||||
AddHandler("getTVShows", TVShowNode, func(info *HandlerInfo) []byte {
|
||||
AddHandler("getTVShows", TVShowNode, nil, func() []byte {
|
||||
query := "SELECT id, name FROM tvshow"
|
||||
rows := database.Query(query)
|
||||
return jsonify(readTVshowsFromResultset(rows))
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/tvshow [getEpisodes]
|
||||
* @apiDescription get all Episodes of a TVShow
|
||||
* @apiName getEpisodes
|
||||
* @apiGroup TVshow
|
||||
*
|
||||
* @apiParam {uint32} ShowID id of tvshow to get episodes from
|
||||
*
|
||||
* @apiSuccess {Object[]} .
|
||||
* @apiSuccess {uint32} .ID episode id
|
||||
* @apiSuccess {string} .Name episode name
|
||||
* @apiSuccess {uint8} .Season Season number
|
||||
* @apiSuccess {uint8} .Episode Episode number
|
||||
*/
|
||||
AddHandler("getEpisodes", TVShowNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var ge struct {
|
||||
ShowID uint32
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
query := fmt.Sprintf("SELECT id, name, season, episode FROM tvshow_episodes WHERE tvshow_id=%d", args.ShowID)
|
||||
AddHandler("getEpisodes", TVShowNode, &ge, func() []byte {
|
||||
query := fmt.Sprintf("SELECT id, name, season, episode FROM tvshow_episodes WHERE tvshow_id=%d", ge.ShowID)
|
||||
rows := database.Query(query)
|
||||
|
||||
type Episode struct {
|
||||
@ -76,34 +41,15 @@ func AddTvshowHandlers() {
|
||||
return jsonify(episodes)
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/tvshow [loadEpisode]
|
||||
* @apiDescription load all info of episode
|
||||
* @apiName loadEpisode
|
||||
* @apiGroup TVshow
|
||||
*
|
||||
* @apiParam {uint32} ID id of episode
|
||||
*
|
||||
* @apiSuccess {uint32} TVShowID episode id
|
||||
* @apiSuccess {string} Name episode name
|
||||
* @apiSuccess {uint8} Season Season number
|
||||
* @apiSuccess {uint8} Episode Episode number
|
||||
* @apiSuccess {string} Path webserver path of video file
|
||||
*/
|
||||
AddHandler("loadEpisode", TVShowNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var le struct {
|
||||
ID uint32
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
AddHandler("loadEpisode", TVShowNode, &le, func() []byte {
|
||||
query := fmt.Sprintf(`
|
||||
SELECT tvshow_episodes.name, season, tvshow_id, episode, filename, t.foldername
|
||||
FROM tvshow_episodes
|
||||
JOIN tvshow t on t.id = tvshow_episodes.tvshow_id
|
||||
WHERE tvshow_episodes.id=%d`, args.ID)
|
||||
WHERE tvshow_episodes.id=%d`, le.ID)
|
||||
row := database.QueryRow(query)
|
||||
|
||||
var ret struct {
|
||||
@ -127,32 +73,17 @@ WHERE tvshow_episodes.id=%d`, args.ID)
|
||||
return jsonify(ret)
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/tvshow [readThumbnail]
|
||||
* @apiDescription Load Thubnail of specific episode
|
||||
* @apiName readThumbnail
|
||||
* @apiGroup TVshow
|
||||
*
|
||||
* @apiParam {int} Id id of episode to load thumbnail
|
||||
*
|
||||
* @apiSuccess {string} . Base64 encoded Thubnail
|
||||
*/
|
||||
AddHandler("readThumbnail", TVShowNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var rtn struct {
|
||||
Id int
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
AddHandler("readThumbnail", TVShowNode, &rtn, func() []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", rtn.Id)
|
||||
|
||||
err := database.QueryRow(query).Scan(&pic)
|
||||
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", rtn.Id)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@ -13,30 +13,14 @@ func AddTagHandlers() {
|
||||
}
|
||||
|
||||
func deleteFromDB() {
|
||||
/**
|
||||
* @api {post} /api/tags [deleteTag]
|
||||
* @apiDescription Start Database video reindex Job
|
||||
* @apiName deleteTag
|
||||
* @apiGroup Tags
|
||||
*
|
||||
* @apiParam {bool} [Force] force delete tag with its constraints
|
||||
* @apiParam {int} TagId id of tag to delete
|
||||
*
|
||||
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||
*/
|
||||
AddHandler("deleteTag", TagNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var dT struct {
|
||||
TagId int
|
||||
Force bool
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
AddHandler("deleteTag", TagNode, &dT, func() []byte {
|
||||
// delete key constraints first
|
||||
if args.Force {
|
||||
query := fmt.Sprintf("DELETE FROM video_tags WHERE tag_id=%d", args.TagId)
|
||||
if dT.Force {
|
||||
query := fmt.Sprintf("DELETE FROM video_tags WHERE tag_id=%d", dT.TagId)
|
||||
err := database.Edit(query)
|
||||
|
||||
// respond only if result not successful
|
||||
@ -45,7 +29,7 @@ func deleteFromDB() {
|
||||
}
|
||||
}
|
||||
|
||||
query := fmt.Sprintf("DELETE FROM tags WHERE tag_id=%d", args.TagId)
|
||||
query := fmt.Sprintf("DELETE FROM tags WHERE tag_id=%d", dT.TagId)
|
||||
err := database.Edit(query)
|
||||
|
||||
if err == nil {
|
||||
@ -55,7 +39,7 @@ func deleteFromDB() {
|
||||
// check with regex if its the key constraint error
|
||||
r := regexp.MustCompile("^.*a foreign key constraint fails.*$")
|
||||
if r.MatchString(err.Error()) {
|
||||
return database.ManualSuccessResponse(fmt.Errorf("not empty tag"))
|
||||
return []byte(`{"result":"not empty tag"}`)
|
||||
} else {
|
||||
return database.ManualSuccessResponse(err)
|
||||
}
|
||||
@ -64,68 +48,27 @@ func deleteFromDB() {
|
||||
}
|
||||
|
||||
func getFromDB() {
|
||||
/**
|
||||
* @api {post} /api/tags [getAllTags]
|
||||
* @apiDescription get all available Tags
|
||||
* @apiName getAllTags
|
||||
* @apiGroup Tags
|
||||
*
|
||||
* @apiSuccess {Object[]} array of tag objects
|
||||
* @apiSuccess {uint32} TagId
|
||||
* @apiSuccess {string} TagName name of the Tag
|
||||
*/
|
||||
AddHandler("getAllTags", TagNode, func(info *HandlerInfo) []byte {
|
||||
AddHandler("getAllTags", TagNode, nil, func() []byte {
|
||||
query := "SELECT tag_id,tag_name from tags"
|
||||
return jsonify(readTagsFromResultset(database.Query(query)))
|
||||
})
|
||||
}
|
||||
|
||||
func addToDB() {
|
||||
/**
|
||||
* @api {post} /api/tags [createTag]
|
||||
* @apiDescription create a new tag
|
||||
* @apiName createTag
|
||||
* @apiGroup Tags
|
||||
*
|
||||
* @apiParam {string} TagName name of the tag
|
||||
*
|
||||
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||
*/
|
||||
AddHandler("createTag", TagNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var ct struct {
|
||||
TagName string
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
AddHandler("createTag", TagNode, &ct, func() []byte {
|
||||
query := "INSERT IGNORE INTO tags (tag_name) VALUES (?)"
|
||||
return database.SuccessQuery(query, args.TagName)
|
||||
return database.SuccessQuery(query, ct.TagName)
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/tags [addTag]
|
||||
* @apiDescription Add new tag to video
|
||||
* @apiName addTag
|
||||
* @apiGroup Tags
|
||||
*
|
||||
* @apiParam {int} TagId Tag id to add to video
|
||||
* @apiParam {int} MovieId Video Id of video to add tag to
|
||||
*
|
||||
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||
*/
|
||||
AddHandler("addTag", TagNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var at struct {
|
||||
MovieId int
|
||||
TagId int
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
AddHandler("addTag", TagNode, &at, func() []byte {
|
||||
query := "INSERT IGNORE INTO video_tags(tag_id, video_id) VALUES (?,?)"
|
||||
return database.SuccessQuery(query, args.TagId, args.MovieId)
|
||||
return database.SuccessQuery(query, at.TagId, at.MovieId)
|
||||
})
|
||||
}
|
||||
|
||||
@ -16,158 +16,55 @@ func AddVideoHandlers() {
|
||||
}
|
||||
|
||||
func getVideoHandlers() {
|
||||
/**
|
||||
* @api {post} /api/video [getMovies]
|
||||
* @apiDescription Request available Videos
|
||||
* @apiName GetMovies
|
||||
* @apiGroup video
|
||||
*
|
||||
* @apiParam {int} [Tag=1] id of VideoTag to get videos (1=all)
|
||||
*
|
||||
* @apiSuccess {Object[]} Videos List of Videos
|
||||
* @apiSuccess {number} Videos.MovieId Id of Video
|
||||
* @apiSuccess {String} Videos.MovieName Name of video
|
||||
* @apiSuccess {String} TagName Name of the Tag returned
|
||||
*/
|
||||
AddHandler("getMovies", VideoNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
Tag uint32
|
||||
Sort uint8
|
||||
var mrq struct {
|
||||
Tag int
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
const (
|
||||
date = iota
|
||||
likes = iota
|
||||
random = iota
|
||||
names = iota
|
||||
)
|
||||
|
||||
var SortClause string
|
||||
switch args.Sort {
|
||||
case date:
|
||||
SortClause = "ORDER BY create_date DESC, movie_name"
|
||||
break
|
||||
case likes:
|
||||
SortClause = "ORDER BY likes DESC"
|
||||
break
|
||||
case random:
|
||||
SortClause = "ORDER BY RAND()"
|
||||
break
|
||||
case names:
|
||||
SortClause = "ORDER BY movie_name"
|
||||
break
|
||||
}
|
||||
|
||||
AddHandler("getMovies", VideoNode, &mrq, func() []byte {
|
||||
var query string
|
||||
// 1 is the id of the ALL tag
|
||||
if args.Tag != 1 {
|
||||
query = fmt.Sprintf(`SELECT movie_id,movie_name,t.tag_name FROM videos
|
||||
if mrq.Tag != 1 {
|
||||
query = fmt.Sprintf(`SELECT movie_id,movie_name FROM videos
|
||||
INNER JOIN video_tags vt on videos.movie_id = vt.video_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'
|
||||
ORDER BY likes DESC, create_date, movie_name`, mrq.Tag)
|
||||
} else {
|
||||
query = fmt.Sprintf("SELECT movie_id,movie_name, (SELECT 'All' as tag_name) FROM videos %s", SortClause)
|
||||
query = "SELECT movie_id,movie_name FROM videos ORDER BY create_date DESC, movie_name"
|
||||
}
|
||||
|
||||
var result struct {
|
||||
Videos []types.VideoUnloadedType
|
||||
TagName string
|
||||
}
|
||||
|
||||
rows := database.Query(query)
|
||||
vids := []types.VideoUnloadedType{}
|
||||
var name string
|
||||
for rows.Next() {
|
||||
var vid types.VideoUnloadedType
|
||||
err := rows.Scan(&vid.MovieId, &vid.MovieName, &name)
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
vids = append(vids, vid)
|
||||
}
|
||||
if rows.Close() != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
// if the tag id doesn't exist the query won't return a name
|
||||
if name == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
result.Videos = vids
|
||||
result.TagName = name
|
||||
result := readVideosFromResultset(database.Query(query))
|
||||
// jsonify results
|
||||
str, _ := json.Marshal(result)
|
||||
return str
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/video [readThumbnail]
|
||||
* @apiDescription Load Thubnail of specific Video
|
||||
* @apiName readThumbnail
|
||||
* @apiGroup video
|
||||
*
|
||||
* @apiParam {int} Movieid id of video to load thumbnail
|
||||
*
|
||||
* @apiSuccess {string} . Base64 encoded Thubnail
|
||||
*/
|
||||
AddHandler("readThumbnail", VideoNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var rtn struct {
|
||||
Movieid int
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
AddHandler("readThumbnail", VideoNode, &rtn, func() []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", rtn.Movieid)
|
||||
|
||||
err := database.QueryRow(query).Scan(&pic)
|
||||
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", rtn.Movieid)
|
||||
return nil
|
||||
}
|
||||
|
||||
return pic
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/video [getRandomMovies]
|
||||
* @apiDescription Load random videos
|
||||
* @apiName getRandomMovies
|
||||
* @apiGroup video
|
||||
*
|
||||
* @apiParam {int} Number number of random videos to load
|
||||
*
|
||||
* @apiSuccess {Object[]} Tags Array of tags occuring in selection
|
||||
* @apiSuccess {string} Tags.TagName Tagname
|
||||
* @apiSuccess {uint32} Tags.TagId Tag ID
|
||||
*
|
||||
* @apiSuccess {Object[]} Videos Array of the videos
|
||||
* @apiSuccess {string} Videos.MovieName Video Name
|
||||
* @apiSuccess {int} Videos.MovieId Video ID
|
||||
*/
|
||||
AddHandler("getRandomMovies", VideoNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var grm struct {
|
||||
Number int
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
AddHandler("getRandomMovies", VideoNode, &grm, func() []byte {
|
||||
var result struct {
|
||||
Tags []types.Tag
|
||||
Videos []types.VideoUnloadedType
|
||||
}
|
||||
|
||||
query := fmt.Sprintf("SELECT movie_id,movie_name FROM videos ORDER BY RAND() LIMIT %d", args.Number)
|
||||
query := fmt.Sprintf("SELECT movie_id,movie_name FROM videos ORDER BY RAND() LIMIT %d", grm.Number)
|
||||
result.Videos = readVideosFromResultset(database.Query(query))
|
||||
|
||||
var ids string
|
||||
@ -202,30 +99,13 @@ func getVideoHandlers() {
|
||||
return str
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/video [getSearchKeyWord]
|
||||
* @apiDescription Get videos for search keyword
|
||||
* @apiName getSearchKeyWord
|
||||
* @apiGroup video
|
||||
*
|
||||
* @apiParam {string} KeyWord Keyword to search for
|
||||
*
|
||||
* @apiSuccess {Object[]} . List of Videos
|
||||
* @apiSuccess {number} .MovieId Id of Video
|
||||
* @apiSuccess {String} .MovieName Name of video
|
||||
*/
|
||||
AddHandler("getSearchKeyWord", VideoNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var gsk struct {
|
||||
KeyWord string
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
AddHandler("getSearchKeyWord", VideoNode, &gsk, func() []byte {
|
||||
query := fmt.Sprintf(`SELECT movie_id,movie_name FROM videos
|
||||
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`, gsk.KeyWord)
|
||||
|
||||
result := readVideosFromResultset(database.Query(query))
|
||||
// jsonify results
|
||||
@ -236,47 +116,12 @@ func getVideoHandlers() {
|
||||
|
||||
// function to handle stuff for loading specific videos and startdata
|
||||
func loadVideosHandlers() {
|
||||
/**
|
||||
* @api {post} /api/video [loadVideo]
|
||||
* @apiDescription Load all data for a specific video
|
||||
* @apiName loadVideo
|
||||
* @apiGroup video
|
||||
*
|
||||
* @apiParam {int} MovieId ID of video
|
||||
*
|
||||
* @apiSuccess {string} MovieName Videoname
|
||||
* @apiSuccess {uint32} MovieId Video ID
|
||||
* @apiSuccess {string} MovieUrl Url to video file
|
||||
* @apiSuccess {string} Poster Base64 encoded Poster
|
||||
* @apiSuccess {uint64} Likes Number of likes
|
||||
* @apiSuccess {uint16} Quality Video FrameWidth
|
||||
* @apiSuccess {uint16} Length Video Length in seconds
|
||||
*
|
||||
*
|
||||
* @apiSuccess {Object[]} Tags Array of tags of video
|
||||
* @apiSuccess {string} Tags.TagName Tagname
|
||||
* @apiSuccess {uint32} Tags.TagId Tag ID
|
||||
*
|
||||
* @apiSuccess {Object[]} SuggestedTag Array of tags for quick add suggestions
|
||||
* @apiSuccess {string} SuggestedTag.TagName Tagname
|
||||
* @apiSuccess {uint32} SuggestedTag.TagId Tag ID
|
||||
*
|
||||
* @apiSuccess {Object[]} Actors Array of Actors playing in this video
|
||||
* @apiSuccess {uint32} Actors.ActorId Actor Id
|
||||
* @apiSuccess {string} Actors.Name Actor Name
|
||||
* @apiSuccess {string} Actors.Thumbnail Portrait Thumbnail
|
||||
*/
|
||||
AddHandler("loadVideo", VideoNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var lv struct {
|
||||
MovieId int
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
AddHandler("loadVideo", VideoNode, &lv, func() []byte {
|
||||
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`, lv.MovieId)
|
||||
|
||||
var res types.FullVideoType
|
||||
var poster []byte
|
||||
@ -284,7 +129,7 @@ func loadVideosHandlers() {
|
||||
|
||||
err := database.QueryRow(query).Scan(&res.MovieName, &res.MovieUrl, &res.MovieId, &thumbnail, &poster, &res.Likes, &res.Quality, &res.Length)
|
||||
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", lv.MovieId)
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
@ -304,7 +149,7 @@ func loadVideosHandlers() {
|
||||
query = fmt.Sprintf(`SELECT t.tag_id, t.tag_name FROM video_tags
|
||||
INNER JOIN tags t on video_tags.tag_id = t.tag_id
|
||||
WHERE video_tags.video_id=%d
|
||||
GROUP BY t.tag_id`, args.MovieId)
|
||||
GROUP BY t.tag_id`, lv.MovieId)
|
||||
|
||||
res.Tags = readTagsFromResultset(database.Query(query))
|
||||
|
||||
@ -313,14 +158,14 @@ func loadVideosHandlers() {
|
||||
SELECT video_tags.tag_id FROM video_tags
|
||||
WHERE video_id=%d)
|
||||
ORDER BY rand()
|
||||
LIMIT 5`, args.MovieId)
|
||||
LIMIT 5`, lv.MovieId)
|
||||
|
||||
res.SuggestedTag = readTagsFromResultset(database.Query(query))
|
||||
|
||||
// query the actors corresponding to video
|
||||
query = fmt.Sprintf(`SELECT a.actor_id, name, thumbnail FROM actors_videos
|
||||
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`, lv.MovieId)
|
||||
|
||||
res.Actors = readActorsFromResultset(database.Query(query))
|
||||
|
||||
@ -329,20 +174,7 @@ func loadVideosHandlers() {
|
||||
return str
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/video [getStartData]
|
||||
* @apiDescription Get general video informations at start
|
||||
* @apiName getStartData
|
||||
* @apiGroup video
|
||||
*
|
||||
* @apiSuccess {uint32} VideoNr Total nr of videos
|
||||
* @apiSuccess {uint32} FullHdNr number of FullHD videos
|
||||
* @apiSuccess {uint32} HDNr number of HD videos
|
||||
* @apiSuccess {uint32} SDNr number of SD videos
|
||||
* @apiSuccess {uint32} DifferentTags number of different Tags available
|
||||
* @apiSuccess {uint32} Tagged number of different Tags assigned
|
||||
*/
|
||||
AddHandler("getStartData", VideoNode, func(info *HandlerInfo) []byte {
|
||||
AddHandler("getStartData", VideoNode, nil, func() []byte {
|
||||
var result types.StartData
|
||||
// query settings and infotile values
|
||||
query := `
|
||||
@ -383,54 +215,24 @@ func loadVideosHandlers() {
|
||||
}
|
||||
|
||||
func addToVideoHandlers() {
|
||||
/**
|
||||
* @api {post} /api/video [addLike]
|
||||
* @apiDescription Add a like to a video
|
||||
* @apiName addLike
|
||||
* @apiGroup video
|
||||
*
|
||||
* @apiParam {int} MovieId ID of video
|
||||
*
|
||||
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||
*/
|
||||
AddHandler("addLike", VideoNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var al struct {
|
||||
MovieId int
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
query := fmt.Sprintf("update videos set likes = likes + 1 where movie_id = %d", args.MovieId)
|
||||
AddHandler("addLike", VideoNode, &al, func() []byte {
|
||||
query := fmt.Sprintf("update videos set likes = likes + 1 where movie_id = %d", al.MovieId)
|
||||
return database.SuccessQuery(query)
|
||||
})
|
||||
|
||||
/**
|
||||
* @api {post} /api/video [deleteVideo]
|
||||
* @apiDescription Delete a specific video from database
|
||||
* @apiName deleteVideo
|
||||
* @apiGroup video
|
||||
*
|
||||
* @apiParam {int} MovieId ID of video
|
||||
*
|
||||
* @apiSuccess {string} result 'success' if successfully or error message if not
|
||||
*/
|
||||
AddHandler("deleteVideo", VideoNode, func(info *HandlerInfo) []byte {
|
||||
var args struct {
|
||||
var dv struct {
|
||||
MovieId int
|
||||
}
|
||||
if err := FillStruct(&args, info.Data); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
return nil
|
||||
}
|
||||
|
||||
AddHandler("deleteVideo", VideoNode, &dv, func() []byte {
|
||||
// delete tag constraints
|
||||
query := fmt.Sprintf("DELETE FROM video_tags WHERE video_id=%d", args.MovieId)
|
||||
query := fmt.Sprintf("DELETE FROM video_tags WHERE video_id=%d", dv.MovieId)
|
||||
err := database.Edit(query)
|
||||
|
||||
// delete actor constraints
|
||||
query = fmt.Sprintf("DELETE FROM actors_videos WHERE video_id=%d", args.MovieId)
|
||||
query = fmt.Sprintf("DELETE FROM actors_videos WHERE video_id=%d", dv.MovieId)
|
||||
err = database.Edit(query)
|
||||
|
||||
// respond only if result not successful
|
||||
@ -438,7 +240,7 @@ func addToVideoHandlers() {
|
||||
return database.ManualSuccessResponse(err)
|
||||
}
|
||||
|
||||
query = fmt.Sprintf("DELETE FROM videos WHERE movie_id=%d", args.MovieId)
|
||||
query = fmt.Sprintf("DELETE FROM videos WHERE movie_id=%d", dv.MovieId)
|
||||
return database.SuccessQuery(query)
|
||||
})
|
||||
}
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
package oauth
|
||||
|
||||
import (
|
||||
"gopkg.in/oauth2.v3"
|
||||
"gopkg.in/oauth2.v3/errors"
|
||||
"gopkg.in/oauth2.v3/manage"
|
||||
"gopkg.in/oauth2.v3/server"
|
||||
@ -49,14 +48,14 @@ func InitOAuth() {
|
||||
})
|
||||
}
|
||||
|
||||
func ValidateToken(f func(rw http.ResponseWriter, req *http.Request, node int, tokenInfo *oauth2.TokenInfo), node int) http.HandlerFunc {
|
||||
func ValidateToken(f func(rw http.ResponseWriter, req *http.Request, node int), node int) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
tokeninfo, err := srv.ValidationBearerToken(r)
|
||||
_, err := srv.ValidationBearerToken(r)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
f(w, r, node, &tokeninfo)
|
||||
f(w, r, node)
|
||||
}
|
||||
}
|
||||
|
||||
@ -46,13 +46,13 @@ type SettingsType struct {
|
||||
PasswordEnabled bool
|
||||
TMDBGrabbing bool
|
||||
DarkMode bool
|
||||
}
|
||||
|
||||
type SettingsSizeType struct {
|
||||
VideoNr uint32
|
||||
DBSize float32
|
||||
DifferentTags uint32
|
||||
TagsAdded uint32
|
||||
|
||||
PathPrefix string
|
||||
}
|
||||
|
||||
type TVShow struct {
|
||||
|
||||
@ -90,7 +90,9 @@ func Close() {
|
||||
db.Close()
|
||||
}
|
||||
|
||||
func GetSettings() (result types.SettingsType, PathPrefix string, sizes types.SettingsSizeType) {
|
||||
func GetSettings() types.SettingsType {
|
||||
var result types.SettingsType
|
||||
|
||||
// query settings and infotile values
|
||||
query := fmt.Sprintf(`
|
||||
SELECT (
|
||||
@ -118,7 +120,7 @@ func GetSettings() (result types.SettingsType, PathPrefix string, sizes types.Se
|
||||
var DarkMode int
|
||||
var TMDBGrabbing int
|
||||
|
||||
err := QueryRow(query).Scan(&sizes.VideoNr, &sizes.DBSize, &sizes.DifferentTags, &sizes.TagsAdded,
|
||||
err := QueryRow(query).Scan(&result.VideoNr, &result.DBSize, &result.DifferentTags, &result.TagsAdded,
|
||||
&result.VideoPath, &result.EpisodePath, &result.Password, &result.MediacenterName, &TMDBGrabbing, &DarkMode)
|
||||
|
||||
if err != nil {
|
||||
@ -128,6 +130,7 @@ func GetSettings() (result types.SettingsType, PathPrefix string, sizes types.Se
|
||||
result.TMDBGrabbing = TMDBGrabbing != 0
|
||||
result.PasswordEnabled = result.Password != "-1"
|
||||
result.DarkMode = DarkMode != 0
|
||||
PathPrefix = SettingsVideoPrefix
|
||||
return
|
||||
result.PathPrefix = SettingsVideoPrefix
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
package settings
|
||||
|
||||
var tvShowEnabled bool
|
||||
|
||||
func TVShowsEnabled() bool {
|
||||
return tvShowEnabled
|
||||
}
|
||||
|
||||
func SetTVShowEnabled(enabled bool) {
|
||||
tvShowEnabled = enabled
|
||||
}
|
||||
@ -7,7 +7,6 @@ import (
|
||||
"net/http"
|
||||
"openmediacenter/apiGo/api"
|
||||
"openmediacenter/apiGo/database"
|
||||
settings2 "openmediacenter/apiGo/database/settings"
|
||||
"openmediacenter/apiGo/static"
|
||||
"openmediacenter/apiGo/videoparser"
|
||||
)
|
||||
@ -33,7 +32,6 @@ func main() {
|
||||
api.AddTagHandlers()
|
||||
api.AddActorsHandlers()
|
||||
api.AddTvshowHandlers()
|
||||
api.AddPhotoHandlers()
|
||||
|
||||
videoparser.SetupSettingsWebsocket()
|
||||
|
||||
@ -57,12 +55,8 @@ func handleCommandLineArguments() (*database.DatabaseConfig, bool, *string) {
|
||||
|
||||
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,
|
||||
|
||||
@ -1,9 +1,12 @@
|
||||
package videoparser
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/base64"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"image/jpeg"
|
||||
"log"
|
||||
"os/exec"
|
||||
"strconv"
|
||||
)
|
||||
@ -76,6 +79,16 @@ func parseFFmpegPic(path string) (*string, error) {
|
||||
if strEncPic == "" {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
// extract dimensions of picture
|
||||
reader := bytes.NewReader(stdout)
|
||||
im, err := jpeg.DecodeConfig(reader)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
fmt.Printf("%d %d\n", im.Width, im.Height)
|
||||
// todo use this information somewhere...
|
||||
|
||||
backpic64 := fmt.Sprintf("data:image/jpeg;base64,%s", strEncPic)
|
||||
|
||||
return &backpic64, nil
|
||||
@ -106,6 +119,11 @@ func getVideoAttributes(path string) *VideoAttributes {
|
||||
return nil
|
||||
}
|
||||
|
||||
// nil slice check of track array
|
||||
if len(t.Media.Track) == 0 {
|
||||
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)
|
||||
|
||||
@ -19,9 +19,9 @@ func StartReindex() bool {
|
||||
SendEvent("start")
|
||||
AppendMessage("starting reindex..")
|
||||
|
||||
mSettings, PathPrefix, _ := database.GetSettings()
|
||||
mSettings := database.GetSettings()
|
||||
// add the path prefix to videopath
|
||||
mSettings.VideoPath = PathPrefix + mSettings.VideoPath
|
||||
mSettings.VideoPath = mSettings.PathPrefix + mSettings.VideoPath
|
||||
|
||||
// check if path even exists
|
||||
if _, err := os.Stat(mSettings.VideoPath); os.IsNotExist(err) {
|
||||
@ -64,9 +64,9 @@ func StartTVShowReindex() {
|
||||
SendEvent("start")
|
||||
AppendMessage("starting tvshow reindex...")
|
||||
|
||||
mSettings, PathPrefix, _ := database.GetSettings()
|
||||
mSettings := database.GetSettings()
|
||||
// add the path prefix to videopath
|
||||
mSettings.EpisodePath = PathPrefix + mSettings.EpisodePath
|
||||
mSettings.EpisodePath = mSettings.PathPrefix + mSettings.EpisodePath
|
||||
|
||||
// add slash suffix if not existing
|
||||
if !strings.HasSuffix(mSettings.EpisodePath, "/") {
|
||||
|
||||
@ -28,7 +28,7 @@ type TVShowTMDB struct {
|
||||
}
|
||||
|
||||
type tmdbVidResult struct {
|
||||
PosterPath *string `json:"poster_path"`
|
||||
PosterPath string `json:"poster_path"`
|
||||
Adult bool `json:"adult"`
|
||||
Overview string `json:"overview"`
|
||||
ReleaseDate string `json:"release_date"`
|
||||
@ -37,7 +37,7 @@ type tmdbVidResult struct {
|
||||
OriginalTitle string `json:"original_title"`
|
||||
OriginalLanguage string `json:"original_language"`
|
||||
Title string `json:"title"`
|
||||
BackdropPath *string `json:"backdrop_path"`
|
||||
BackdropPath string `json:"backdrop_path"`
|
||||
Popularity int `json:"popularity"`
|
||||
VoteCount int `json:"vote_count"`
|
||||
Video bool `json:"video"`
|
||||
@ -45,10 +45,10 @@ type tmdbVidResult struct {
|
||||
}
|
||||
|
||||
type tmdbTvResult struct {
|
||||
PosterPath *string `json:"poster_path"`
|
||||
PosterPath string `json:"poster_path"`
|
||||
Popularity int `json:"popularity"`
|
||||
Id int `json:"id"`
|
||||
BackdropPath *string `json:"backdrop_path"`
|
||||
BackdropPath string `json:"backdrop_path"`
|
||||
VoteAverage int `json:"vote_average"`
|
||||
Overview string `json:"overview"`
|
||||
FirstAirDate string `json:"first_air_date"`
|
||||
@ -111,16 +111,10 @@ func SearchVideo(MovieName string, year int) *VideoTMDB {
|
||||
// continue label
|
||||
cont:
|
||||
|
||||
var thumbnail = ""
|
||||
if tmdbVid.PosterPath != nil {
|
||||
pic := fetchPoster(*tmdbVid.PosterPath)
|
||||
if pic != nil {
|
||||
thumbnail = *pic
|
||||
}
|
||||
}
|
||||
thumbnail := fetchPoster(tmdbVid.PosterPath)
|
||||
|
||||
result := VideoTMDB{
|
||||
Thumbnail: thumbnail,
|
||||
Thumbnail: *thumbnail,
|
||||
Overview: tmdbVid.Overview,
|
||||
Title: tmdbVid.Title,
|
||||
GenreIds: tmdbVid.GenreIds,
|
||||
@ -161,11 +155,9 @@ func SearchTVShow(Name string) *TVShowTMDB {
|
||||
GenreIds: t.Results[0].GenreIds,
|
||||
}
|
||||
|
||||
if t.Results[0].PosterPath != nil {
|
||||
pic := fetchPoster(*t.Results[0].PosterPath)
|
||||
if pic != nil {
|
||||
res.Thumbnail = *pic
|
||||
}
|
||||
thumbnail := fetchPoster(t.Results[0].PosterPath)
|
||||
if thumbnail != nil {
|
||||
res.Thumbnail = *thumbnail
|
||||
}
|
||||
|
||||
return &res
|
||||
|
||||
1
declaration.d.ts
vendored
1
declaration.d.ts
vendored
@ -1,2 +1 @@
|
||||
declare module '*.css';
|
||||
declare module 'pro-gallery';
|
||||
|
||||
19
package.json
19
package.json
@ -12,9 +12,8 @@
|
||||
"@fortawesome/free-regular-svg-icons": "^5.15.1",
|
||||
"@fortawesome/free-solid-svg-icons": "^5.15.1",
|
||||
"@fortawesome/react-fontawesome": "^0.1.13",
|
||||
"bootstrap": "^5.0.1",
|
||||
"bootstrap": "^4.5.3",
|
||||
"plyr-react": "^3.0.7",
|
||||
"pro-gallery": "^4.0.4",
|
||||
"react": "^17.0.1",
|
||||
"react-bootstrap": "^1.4.0",
|
||||
"react-dom": "^17.0.1",
|
||||
@ -26,8 +25,7 @@
|
||||
"start": "react-scripts start",
|
||||
"build": "CI=false react-scripts build",
|
||||
"test": "CI=true react-scripts test --reporters=jest-junit --verbose --silent --coverage --reporters=default",
|
||||
"lint": "eslint --format gitlab src/",
|
||||
"apidoc": "apidoc -i apiGo/ -o doc/"
|
||||
"lint": "eslint --format gitlab src/"
|
||||
},
|
||||
"jest": {
|
||||
"collectCoverageFrom": [
|
||||
@ -56,16 +54,15 @@
|
||||
"devDependencies": {
|
||||
"@testing-library/jest-dom": "^5.11.6",
|
||||
"@testing-library/react": "^11.2.2",
|
||||
"@testing-library/user-event": "^13.1.9",
|
||||
"@testing-library/user-event": "^12.6.0",
|
||||
"@types/jest": "^26.0.19",
|
||||
"@types/node": "^15.12.2",
|
||||
"@types/node": "^14.14.31",
|
||||
"@types/react": "^17.0.2",
|
||||
"@types/react-dom": "^17.0.1",
|
||||
"@types/react-router": "5.1.15",
|
||||
"@types/react-router": "5.1.12",
|
||||
"@types/react-router-dom": "^5.1.6",
|
||||
"@typescript-eslint/eslint-plugin": "^4.17.0",
|
||||
"@typescript-eslint/parser": "^4.17.0",
|
||||
"apidoc": "^0.28.1",
|
||||
"enzyme": "^3.11.0",
|
||||
"enzyme-adapter-react-16": "^1.15.5",
|
||||
"eslint": "^7.22.0",
|
||||
@ -80,11 +77,5 @@
|
||||
"prettier": "^2.2.1",
|
||||
"prettier-config": "^1.0.0",
|
||||
"react-scripts": "4.0.3"
|
||||
},
|
||||
"apidoc": {
|
||||
"name": "OpenMediaCenter",
|
||||
"description": "API Documentation of OpenMediaCenter",
|
||||
"title": "OpenMediaCenter Doc",
|
||||
"sampleUrl": null
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
margin-left: 20px;
|
||||
opacity: 0.6;
|
||||
text-transform: capitalize;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.navitem:hover {
|
||||
|
||||
@ -18,11 +18,6 @@ describe('<App/>', function () {
|
||||
it('are navlinks correct', function () {
|
||||
const wrapper = shallow(<App/>);
|
||||
wrapper.setState({password: false});
|
||||
expect(wrapper.find('.navitem')).toHaveLength(4);
|
||||
|
||||
GlobalInfos.setTVShowsEnabled(true);
|
||||
|
||||
wrapper.instance().forceUpdate();
|
||||
expect(wrapper.find('.navitem')).toHaveLength(5);
|
||||
});
|
||||
|
||||
|
||||
34
src/App.tsx
34
src/App.tsx
@ -21,7 +21,6 @@ import TVShowPage from './pages/TVShowPage/TVShowPage';
|
||||
import TVPlayer from './pages/TVShowPage/TVPlayer';
|
||||
import {CookieTokenStore} from './utils/TokenStore/CookieTokenStore';
|
||||
import {token} from './utils/TokenHandler';
|
||||
import {PhotoPage} from './pages/PhotoPage/PhotoPage';
|
||||
|
||||
interface state {
|
||||
password: boolean | null; // null if uninitialized - true if pwd needed false if not needed
|
||||
@ -87,8 +86,6 @@ class App extends React.Component<{}, state> {
|
||||
|
||||
GlobalInfos.setVideoPaths(result.VideoPath, result.TVShowPath);
|
||||
|
||||
GlobalInfos.setTVShowsEnabled(result.TVShowEnabled);
|
||||
|
||||
this.setState({
|
||||
mediacentername: result.MediacenterName
|
||||
});
|
||||
@ -149,17 +146,9 @@ class App extends React.Component<{}, state> {
|
||||
<NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/categories'} activeStyle={{opacity: '0.85'}}>
|
||||
Categories
|
||||
</NavLink>
|
||||
|
||||
{GlobalInfos.isTVShowEnabled() ? (
|
||||
<NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/tvshows'} activeStyle={{opacity: '0.85'}}>
|
||||
TV Shows
|
||||
</NavLink>
|
||||
) : null}
|
||||
|
||||
<NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/photos'} activeStyle={{opacity: '0.85'}}>
|
||||
Photos
|
||||
</NavLink>
|
||||
|
||||
<NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/settings'} activeStyle={{opacity: '0.85'}}>
|
||||
Settings
|
||||
</NavLink>
|
||||
@ -179,35 +168,24 @@ class App extends React.Component<{}, state> {
|
||||
<Route path='/categories'>
|
||||
<CategoryPage />
|
||||
</Route>
|
||||
<Route path='/tvshows'>
|
||||
<TVShowPage />
|
||||
</Route>
|
||||
<Route path='/settings'>
|
||||
<SettingsPage />
|
||||
</Route>
|
||||
<Route exact path='/player/:id'>
|
||||
<Player />
|
||||
</Route>
|
||||
<Route exact path='/tvplayer/:id'>
|
||||
<TVPlayer />
|
||||
</Route>
|
||||
<Route exact path='/actors'>
|
||||
<ActorOverviewPage />
|
||||
</Route>
|
||||
<Route path='/actors/:id'>
|
||||
<ActorPage />
|
||||
</Route>
|
||||
|
||||
{GlobalInfos.isTVShowEnabled() ? (
|
||||
<Route path='/tvshows'>
|
||||
<TVShowPage />
|
||||
</Route>
|
||||
) : null}
|
||||
|
||||
{GlobalInfos.isTVShowEnabled() ? (
|
||||
<Route exact path='/tvplayer/:id'>
|
||||
<TVPlayer />
|
||||
</Route>
|
||||
) : null}
|
||||
|
||||
<Route exact path='/photos'>
|
||||
<PhotoPage />
|
||||
</Route>
|
||||
|
||||
<Route path='/'>
|
||||
<HomePage />
|
||||
</Route>
|
||||
|
||||
@ -41,24 +41,18 @@ class DynamicContentContainer<T> extends React.Component<Props<T>, state<T>> {
|
||||
|
||||
componentDidUpdate(prevProps: Props<T>): void {
|
||||
// when source props change force update!
|
||||
if (
|
||||
// diff the two arrays
|
||||
this.props.data
|
||||
.filter((x) => !prevProps.data.includes(x))
|
||||
.concat(prevProps.data.filter((x) => !this.props.data.includes(x))).length !== 0
|
||||
) {
|
||||
this.clean((): void => {
|
||||
if (prevProps.data.length !== this.props.data.length) {
|
||||
this.clean();
|
||||
this.loadPreviewBlock(this.InitialLoadNR);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* clear all elements rendered...
|
||||
*/
|
||||
clean(callback: () => void): void {
|
||||
clean(): void {
|
||||
this.loadindex = 0;
|
||||
this.setState({loadeditems: []}, callback);
|
||||
this.setState({loadeditems: []});
|
||||
}
|
||||
|
||||
render(): JSX.Element {
|
||||
|
||||
@ -20,7 +20,7 @@ const VideoContainer = (props: Props): JSX.Element => {
|
||||
APINode.Video,
|
||||
{
|
||||
action: 'readThumbnail',
|
||||
Movieid: el.MovieId
|
||||
movieid: el.MovieId
|
||||
},
|
||||
(result) => callback(result)
|
||||
);
|
||||
|
||||
@ -72,10 +72,6 @@ export class ActorPage extends React.Component<Props, state> {
|
||||
data: result.Videos ? result.Videos : [],
|
||||
actor: result.Info
|
||||
});
|
||||
},
|
||||
(_) => {
|
||||
// if there is an load error redirect to home page
|
||||
this.props.history.push('/');
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@ -4,9 +4,7 @@ import {CategoryView} from './CategoryView';
|
||||
|
||||
describe('<CategoryView/>', function () {
|
||||
function instance() {
|
||||
const inst = shallow(<CategoryView match={{params: {id: 10}}} history={{push: jest.fn()}}/>);
|
||||
inst.setState({loaded: true});
|
||||
return inst;
|
||||
return shallow(<CategoryView match={{params: {id: 10}}} history={{push: jest.fn()}}/>);
|
||||
}
|
||||
|
||||
it('renders without crashing ', function () {
|
||||
|
||||
@ -10,14 +10,12 @@ import Tag from '../../elements/Tag/Tag';
|
||||
import {DefaultTags, GeneralSuccess} from '../../types/GeneralTypes';
|
||||
import {Button} from '../../elements/GPElements/Button';
|
||||
import SubmitPopup from '../../elements/Popups/SubmitPopup/SubmitPopup';
|
||||
import {Spinner} from 'react-bootstrap';
|
||||
|
||||
interface CategoryViewProps extends RouteComponentProps<{id: string}> {}
|
||||
|
||||
interface CategoryViewState {
|
||||
loaded: boolean;
|
||||
submitForceDelete: boolean;
|
||||
TagName: string;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -31,8 +29,7 @@ export class CategoryView extends React.Component<CategoryViewProps, CategoryVie
|
||||
|
||||
this.state = {
|
||||
loaded: false,
|
||||
submitForceDelete: false,
|
||||
TagName: ''
|
||||
submitForceDelete: false
|
||||
};
|
||||
}
|
||||
|
||||
@ -53,13 +50,9 @@ export class CategoryView extends React.Component<CategoryViewProps, CategoryVie
|
||||
}
|
||||
|
||||
render(): JSX.Element {
|
||||
if (!this.state.loaded) {
|
||||
return <Spinner animation='border' />;
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<PageTitle title={this.state.TagName} subtitle={this.videodata.length + ' Videos'} />
|
||||
<PageTitle title='Categories' subtitle={this.videodata.length + ' Videos'} />
|
||||
|
||||
<SideBar>
|
||||
<SideBarTitle>Default Tags:</SideBarTitle>
|
||||
@ -112,18 +105,10 @@ export class CategoryView extends React.Component<CategoryViewProps, CategoryVie
|
||||
* @param id tagid
|
||||
*/
|
||||
private fetchVideoData(id: number): void {
|
||||
callAPI(
|
||||
APINode.Video,
|
||||
{action: 'getMovies', Tag: id},
|
||||
(result: {Videos: VideoTypes.VideoUnloadedType[]; TagName: string}) => {
|
||||
this.videodata = result.Videos;
|
||||
this.setState({loaded: true, TagName: result.TagName});
|
||||
},
|
||||
(_) => {
|
||||
// if there is an load error redirect to home page
|
||||
this.props.history.push('/');
|
||||
}
|
||||
);
|
||||
callAPI<VideoTypes.VideoUnloadedType[]>(APINode.Video, {action: 'getMovies', tag: id}, (result) => {
|
||||
this.videodata = result;
|
||||
this.setState({loaded: true});
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -7,61 +7,3 @@
|
||||
float: right;
|
||||
margin-top: 25px;
|
||||
}
|
||||
|
||||
.sortbyLabel {
|
||||
color: grey;
|
||||
margin-right: 5px;
|
||||
margin-left: 25px;
|
||||
}
|
||||
|
||||
/* Style The Dropdown Button */
|
||||
.dropbtn {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: row;
|
||||
height: 100%;
|
||||
cursor: pointer;
|
||||
color: white;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
/* The container <div> - needed to position the dropdown content */
|
||||
.dropdown {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
/* Dropdown Content (Hidden by Default) */
|
||||
.dropdownContent {
|
||||
display: none;
|
||||
position: absolute;
|
||||
background-color: #f9f9f9;
|
||||
min-width: 160px;
|
||||
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
/* Links inside the dropdown */
|
||||
.dropdownContent span {
|
||||
color: black;
|
||||
padding: 12px 16px;
|
||||
text-decoration: none;
|
||||
display: block;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
/* Change color of dropdown links on hover */
|
||||
.dropdownContent span:hover {
|
||||
background-color: #f1f1f1;
|
||||
}
|
||||
|
||||
/* Show the dropdown menu on hover */
|
||||
.dropdown:hover .dropdownContent {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/* Change the background color of the dropdown button when the dropdown content is shown */
|
||||
.dropdown:hover .dropbtn {
|
||||
background-color: #3574fe;
|
||||
}
|
||||
|
||||
@ -1,10 +1,8 @@
|
||||
import {shallow} from 'enzyme';
|
||||
import React from 'react';
|
||||
import {HomePage, SortBy} from './HomePage';
|
||||
import {HomePage} from './HomePage';
|
||||
import VideoContainer from '../../elements/VideoContainer/VideoContainer';
|
||||
import {SearchHandling} from './SearchHandling';
|
||||
import exp from "constants";
|
||||
import {DefaultTags} from "../../types/GeneralTypes";
|
||||
|
||||
describe('<HomePage/>', function () {
|
||||
it('renders without crashing ', function () {
|
||||
@ -25,6 +23,23 @@ describe('<HomePage/>', function () {
|
||||
expect(wrapper.find('PageTitle').props().subtitle).toBe('testsubtitle - 42');
|
||||
});
|
||||
|
||||
it('test search field', done => {
|
||||
global.fetch = global.prepareFetchApi([{}, {}]);
|
||||
|
||||
const wrapper = shallow(<HomePage/>);
|
||||
|
||||
wrapper.find('[data-testid="searchtextfield"]').simulate('change', {target: {value: 'testvalue'}});
|
||||
wrapper.find('[data-testid="searchbtnsubmit"]').simulate('click');
|
||||
|
||||
process.nextTick(() => {
|
||||
// state to be set correctly with response
|
||||
expect(wrapper.state().selectionnr).toBe(2);
|
||||
|
||||
global.fetch.mockClear();
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('test form submit', () => {
|
||||
const func = jest.fn();
|
||||
const wrapper = shallow(<HomePage/>);
|
||||
@ -57,7 +72,7 @@ describe('<HomePage/>', function () {
|
||||
});
|
||||
|
||||
it('test tag click', done => {
|
||||
global.fetch = prepareFetchApi({Videos: ['test1', 'test2'], TagName: 'all'});
|
||||
global.fetch = prepareFetchApi(['test1', 'test2']);
|
||||
|
||||
const wrapper = shallow(<HomePage/>);
|
||||
|
||||
@ -85,20 +100,6 @@ describe('<HomePage/>', function () {
|
||||
|
||||
testBtn(tags.first());
|
||||
});
|
||||
|
||||
it('test sortby type change', function () {
|
||||
const wrapper = shallow(<HomePage/>);
|
||||
|
||||
// expect those default values
|
||||
expect(wrapper.state().sortby).toBe('Date Added');
|
||||
expect(wrapper.instance().sortState).toBe(SortBy.date);
|
||||
expect(wrapper.instance().tagState).toBe(DefaultTags.all);
|
||||
|
||||
wrapper.instance().onDropDownItemClick(SortBy.name, 'namesort');
|
||||
|
||||
expect(wrapper.state().sortby).toBe('namesort');
|
||||
expect(wrapper.instance().sortState).toBe(SortBy.name);
|
||||
});
|
||||
});
|
||||
|
||||
describe('<SearchHandling/>', () => {
|
||||
|
||||
@ -11,16 +11,6 @@ import {RouteComponentProps} from 'react-router';
|
||||
import SearchHandling from './SearchHandling';
|
||||
import {VideoTypes} from '../../types/ApiTypes';
|
||||
import {DefaultTags} from '../../types/GeneralTypes';
|
||||
import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
|
||||
import {faSortDown} from '@fortawesome/free-solid-svg-icons';
|
||||
|
||||
// eslint-disable-next-line no-shadow
|
||||
export enum SortBy {
|
||||
date,
|
||||
likes,
|
||||
random,
|
||||
name
|
||||
}
|
||||
|
||||
interface Props extends RouteComponentProps {}
|
||||
|
||||
@ -29,7 +19,6 @@ interface state {
|
||||
subtitle: string;
|
||||
data: VideoTypes.VideoUnloadedType[];
|
||||
selectionnr: number;
|
||||
sortby: string;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -53,17 +42,13 @@ export class HomePage extends React.Component<Props, state> {
|
||||
},
|
||||
subtitle: 'All Videos',
|
||||
data: [],
|
||||
selectionnr: 0,
|
||||
sortby: 'Date Added'
|
||||
selectionnr: 0
|
||||
};
|
||||
}
|
||||
|
||||
sortState = SortBy.date;
|
||||
tagState = DefaultTags.all;
|
||||
|
||||
componentDidMount(): void {
|
||||
// initial get of all videos
|
||||
this.fetchVideoData();
|
||||
this.fetchVideoData(DefaultTags.all.TagId);
|
||||
this.fetchStartData();
|
||||
}
|
||||
|
||||
@ -73,17 +58,16 @@ export class HomePage extends React.Component<Props, state> {
|
||||
*
|
||||
* @param tag tag to fetch videos
|
||||
*/
|
||||
fetchVideoData(): void {
|
||||
callAPI(
|
||||
APINode.Video,
|
||||
{action: 'getMovies', Tag: this.tagState.TagId, Sort: this.sortState},
|
||||
(result: {Videos: VideoTypes.VideoUnloadedType[]; TagName: string}) => {
|
||||
fetchVideoData(tag: number): void {
|
||||
callAPI(APINode.Video, {action: 'getMovies', tag: tag}, (result: VideoTypes.VideoUnloadedType[]) => {
|
||||
this.setState({
|
||||
data: result.Videos,
|
||||
selectionnr: result.Videos.length
|
||||
data: []
|
||||
});
|
||||
this.setState({
|
||||
data: result,
|
||||
selectionnr: result.length
|
||||
});
|
||||
});
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -147,52 +131,32 @@ export class HomePage extends React.Component<Props, state> {
|
||||
<Tag
|
||||
tagInfo={{TagName: 'All', TagId: DefaultTags.all.TagId}}
|
||||
onclick={(): void => {
|
||||
this.tagState = DefaultTags.all;
|
||||
this.fetchVideoData();
|
||||
this.fetchVideoData(DefaultTags.all.TagId);
|
||||
this.setState({subtitle: 'All Videos'});
|
||||
}}
|
||||
/>
|
||||
<Tag
|
||||
tagInfo={{TagName: 'Full Hd', TagId: DefaultTags.fullhd.TagId}}
|
||||
onclick={(): void => {
|
||||
this.tagState = DefaultTags.fullhd;
|
||||
this.fetchVideoData();
|
||||
this.fetchVideoData(DefaultTags.fullhd.TagId);
|
||||
this.setState({subtitle: 'Full Hd Videos'});
|
||||
}}
|
||||
/>
|
||||
<Tag
|
||||
tagInfo={{TagName: 'Low Quality', TagId: DefaultTags.lowq.TagId}}
|
||||
onclick={(): void => {
|
||||
this.tagState = DefaultTags.lowq;
|
||||
this.fetchVideoData();
|
||||
this.fetchVideoData(DefaultTags.lowq.TagId);
|
||||
this.setState({subtitle: 'Low Quality Videos'});
|
||||
}}
|
||||
/>
|
||||
<Tag
|
||||
tagInfo={{TagName: 'HD', TagId: DefaultTags.hd.TagId}}
|
||||
onclick={(): void => {
|
||||
this.tagState = DefaultTags.hd;
|
||||
this.fetchVideoData();
|
||||
this.fetchVideoData(DefaultTags.hd.TagId);
|
||||
this.setState({subtitle: 'HD Videos'});
|
||||
}}
|
||||
/>
|
||||
</SideBar>
|
||||
<div>
|
||||
<span className={style.sortbyLabel}>Sort By: </span>
|
||||
<div className={style.dropdown}>
|
||||
<span className={style.dropbtn}>
|
||||
<span>{this.state.sortby}</span>
|
||||
<FontAwesomeIcon style={{marginLeft: 3, paddingBottom: 3}} icon={faSortDown} size='1x' />
|
||||
</span>
|
||||
<div className={style.dropdownContent}>
|
||||
<span onClick={(): void => this.onDropDownItemClick(SortBy.date, 'Date Added')}>Date Added</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.name, 'Name')}>Name</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<VideoContainer data={this.state.data} />
|
||||
<div className={style.rightinfo} />
|
||||
</Route>
|
||||
@ -200,17 +164,6 @@ export class HomePage extends React.Component<Props, state> {
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* click handler for sortby dropdown item click
|
||||
* @param type type of sort action
|
||||
* @param name new header title
|
||||
*/
|
||||
onDropDownItemClick(type: SortBy, name: string): void {
|
||||
this.sortState = type;
|
||||
this.setState({sortby: name});
|
||||
this.fetchVideoData();
|
||||
}
|
||||
}
|
||||
|
||||
export default withRouter(HomePage);
|
||||
|
||||
@ -57,7 +57,7 @@ export class SearchHandling extends React.Component<Props, state> {
|
||||
* @param keyword The keyword to search for
|
||||
*/
|
||||
searchVideos(keyword: string): void {
|
||||
callAPI(APINode.Video, {action: 'getSearchKeyWord', KeyWord: keyword}, (result: VideoTypes.VideoUnloadedType[]) => {
|
||||
callAPI(APINode.Video, {action: 'getSearchKeyWord', keyword: keyword}, (result: VideoTypes.VideoUnloadedType[]) => {
|
||||
this.setState({
|
||||
data: result
|
||||
});
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
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
|
||||
@ -1,106 +0,0 @@
|
||||
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>}
|
||||
</>
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
/* 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 */
|
||||
@ -286,10 +286,6 @@ export class Player extends React.Component<Props, mystate> {
|
||||
suggesttag: result.SuggestedTag,
|
||||
actors: result.Actors
|
||||
});
|
||||
},
|
||||
(_) => {
|
||||
// if there is an load error redirect to home page
|
||||
this.props.history.push('/');
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@ -85,7 +85,8 @@ class RandomPage extends React.Component<{}, state> {
|
||||
* @param nr number of videos to load
|
||||
*/
|
||||
loadShuffledvideos(nr: number): void {
|
||||
callAPI<GetRandomMoviesType>(APINode.Video, {action: 'getRandomMovies', Number: nr}, (result) => {
|
||||
callAPI<GetRandomMoviesType>(APINode.Video, {action: 'getRandomMovies', number: nr}, (result) => {
|
||||
console.log(result);
|
||||
this.setState({videos: []}); // needed to trigger rerender of main videoview
|
||||
this.setState({
|
||||
videos: result.Videos,
|
||||
|
||||
@ -11,8 +11,7 @@ import {SettingsTypes} from '../../types/ApiTypes';
|
||||
import {GeneralSuccess} from '../../types/GeneralTypes';
|
||||
|
||||
interface state {
|
||||
generalSettings: SettingsTypes.SettingsType;
|
||||
sizes: SettingsTypes.SizesType;
|
||||
generalSettings: SettingsTypes.loadGeneralSettingsType;
|
||||
}
|
||||
|
||||
interface Props {}
|
||||
@ -28,18 +27,16 @@ class GeneralSettings extends React.Component<Props, state> {
|
||||
this.state = {
|
||||
generalSettings: {
|
||||
DarkMode: true,
|
||||
DBSize: 0,
|
||||
DifferentTags: 0,
|
||||
EpisodePath: '',
|
||||
MediacenterName: '',
|
||||
Password: '',
|
||||
PasswordEnabled: false,
|
||||
TMDBGrabbing: false,
|
||||
VideoPath: ''
|
||||
},
|
||||
sizes: {
|
||||
DBSize: 0,
|
||||
DifferentTags: 0,
|
||||
TagsAdded: 0,
|
||||
VideoNr: 0
|
||||
TMDBGrabbing: false,
|
||||
VideoNr: 0,
|
||||
VideoPath: ''
|
||||
}
|
||||
};
|
||||
}
|
||||
@ -55,25 +52,25 @@ class GeneralSettings extends React.Component<Props, state> {
|
||||
<div className={style.infoheader}>
|
||||
<InfoHeaderItem
|
||||
backColor='lightblue'
|
||||
text={this.state.sizes.VideoNr}
|
||||
text={this.state.generalSettings.VideoNr}
|
||||
subtext='Videos in Gravity'
|
||||
icon={faArchive}
|
||||
/>
|
||||
<InfoHeaderItem
|
||||
backColor='yellow'
|
||||
text={this.state.sizes.DBSize + ' MB'}
|
||||
text={this.state.generalSettings.DBSize + ' MB'}
|
||||
subtext='Database size'
|
||||
icon={faRulerVertical}
|
||||
/>
|
||||
<InfoHeaderItem
|
||||
backColor='green'
|
||||
text={this.state.sizes.DifferentTags}
|
||||
text={this.state.generalSettings.DifferentTags}
|
||||
subtext='different Tags'
|
||||
icon={faAddressCard}
|
||||
/>
|
||||
<InfoHeaderItem
|
||||
backColor='orange'
|
||||
text={this.state.sizes.TagsAdded}
|
||||
text={this.state.generalSettings.TagsAdded}
|
||||
subtext='tags added'
|
||||
icon={faBalanceScaleLeft}
|
||||
/>
|
||||
@ -213,16 +210,8 @@ class GeneralSettings extends React.Component<Props, state> {
|
||||
* inital load of already specified settings from backend
|
||||
*/
|
||||
loadSettings(): void {
|
||||
interface SettingsResponseType {
|
||||
Settings: SettingsTypes.SettingsType;
|
||||
Sizes: SettingsTypes.SizesType;
|
||||
}
|
||||
|
||||
callAPI(APINode.Settings, {action: 'loadGeneralSettings'}, (result: SettingsResponseType) => {
|
||||
this.setState({
|
||||
generalSettings: result.Settings,
|
||||
sizes: result.Sizes
|
||||
});
|
||||
callAPI(APINode.Settings, {action: 'loadGeneralSettings'}, (result: SettingsTypes.loadGeneralSettingsType) => {
|
||||
this.setState({generalSettings: result});
|
||||
});
|
||||
}
|
||||
|
||||
@ -236,12 +225,11 @@ class GeneralSettings extends React.Component<Props, state> {
|
||||
}
|
||||
settings.DarkMode = GlobalInfos.isDarkTheme();
|
||||
|
||||
console.log(settings);
|
||||
callAPI(
|
||||
APINode.Settings,
|
||||
{
|
||||
action: 'saveGeneralSettings',
|
||||
...settings
|
||||
Settings: settings
|
||||
},
|
||||
(result: GeneralSuccess) => {
|
||||
if (result.result) {
|
||||
|
||||
@ -22,11 +22,9 @@ class SettingsPage extends React.Component {
|
||||
<NavLink to='/settings/movies'>
|
||||
<div className={style.SettingSidebarElement}>Movies</div>
|
||||
</NavLink>
|
||||
{GlobalInfos.isTVShowEnabled() ? (
|
||||
<NavLink to='/settings/tv'>
|
||||
<div className={style.SettingSidebarElement}>TV Shows</div>
|
||||
</NavLink>
|
||||
) : null}
|
||||
</div>
|
||||
<div className={style.SettingsContent}>
|
||||
<Switch>
|
||||
@ -36,11 +34,9 @@ class SettingsPage extends React.Component {
|
||||
<Route path='/settings/movies'>
|
||||
<MovieSettings />
|
||||
</Route>
|
||||
{GlobalInfos.isTVShowEnabled() ? (
|
||||
<Route path='/settings/tv'>
|
||||
<span />
|
||||
</Route>
|
||||
) : null}
|
||||
<Route path='/settings'>
|
||||
<Redirect to='/settings/general' />
|
||||
</Route>
|
||||
|
||||
@ -46,10 +46,6 @@ export class TVPlayer extends React.Component<Props, State> {
|
||||
console.log(data);
|
||||
this.data = data;
|
||||
this.setState({loaded: true});
|
||||
},
|
||||
(_) => {
|
||||
// if there is an load error redirect to home page
|
||||
this.props.history.push('/');
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@ -36,10 +36,9 @@ export namespace SettingsTypes {
|
||||
MediacenterName: string;
|
||||
VideoPath: string;
|
||||
TVShowPath: string;
|
||||
TVShowEnabled: boolean;
|
||||
}
|
||||
|
||||
export interface SettingsType {
|
||||
export interface loadGeneralSettingsType {
|
||||
VideoPath: string;
|
||||
EpisodePath: string;
|
||||
MediacenterName: string;
|
||||
@ -47,9 +46,7 @@ export namespace SettingsTypes {
|
||||
PasswordEnabled: boolean;
|
||||
TMDBGrabbing: boolean;
|
||||
DarkMode: boolean;
|
||||
}
|
||||
|
||||
export interface SizesType {
|
||||
VideoNr: number;
|
||||
DBSize: number;
|
||||
DifferentTags: number;
|
||||
|
||||
@ -26,7 +26,34 @@ export function callAPI<T>(
|
||||
errorcallback: (_: string) => void = (_: string): void => {}
|
||||
): void {
|
||||
token.checkAPITokenValid((mytoken) => {
|
||||
generalAPICall<T>(apinode, fd, callback, errorcallback, false, true, mytoken);
|
||||
fetch(APIPREFIX + apinode, {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(fd),
|
||||
headers: new Headers({
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: 'Bearer ' + mytoken
|
||||
})
|
||||
})
|
||||
.then((response) => {
|
||||
if (response.status === 200) {
|
||||
// success
|
||||
response.json().then((result: T) => {
|
||||
callback(result);
|
||||
});
|
||||
} else if (response.status === 400) {
|
||||
// Bad Request --> invalid token
|
||||
console.log('loading Password page.');
|
||||
// load password page
|
||||
if (GlobalInfos.loadPasswordPage) {
|
||||
GlobalInfos.loadPasswordPage(() => {
|
||||
callAPI(apinode, fd, callback, errorcallback);
|
||||
});
|
||||
}
|
||||
} else {
|
||||
console.log('Error: ' + response.statusText);
|
||||
}
|
||||
})
|
||||
.catch((reason) => errorcallback(reason));
|
||||
});
|
||||
}
|
||||
|
||||
@ -43,7 +70,18 @@ export function callApiUnsafe<T>(
|
||||
callback: (_: T) => void,
|
||||
errorcallback?: (_: string) => void
|
||||
): void {
|
||||
generalAPICall(apinode, fd, callback, errorcallback, true, true, '');
|
||||
fetch(APIPREFIX + apinode, {method: 'POST', body: JSON.stringify(fd)})
|
||||
.then((response) => {
|
||||
if (response.status !== 200) {
|
||||
console.log('Error: ' + response.statusText);
|
||||
// todo place error popup here
|
||||
} else {
|
||||
response.json().then((result: T) => {
|
||||
callback(result);
|
||||
});
|
||||
}
|
||||
})
|
||||
.catch((reason) => (errorcallback ? errorcallback(reason) : {}));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -54,54 +92,19 @@ export function callApiUnsafe<T>(
|
||||
*/
|
||||
export function callAPIPlain(apinode: APINode, fd: ApiBaseRequest, callback: (_: string) => void): void {
|
||||
token.checkAPITokenValid((mytoken) => {
|
||||
generalAPICall(apinode, fd, callback, () => {}, false, false, mytoken);
|
||||
});
|
||||
}
|
||||
|
||||
function generalAPICall<T>(
|
||||
apinode: APINode,
|
||||
fd: ApiBaseRequest,
|
||||
callback: (_: T) => void,
|
||||
errorcallback: (_: string) => void = (_: string): void => {},
|
||||
unsafe: boolean,
|
||||
json: boolean,
|
||||
mytoken: string
|
||||
): void {
|
||||
(async function (): Promise<void> {
|
||||
const response = await fetch(APIPREFIX + apinode, {
|
||||
fetch(APIPREFIX + apinode, {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(fd),
|
||||
headers: new Headers({
|
||||
'Content-Type': json ? 'application/json' : 'text/plain',
|
||||
...(!unsafe && {Authorization: 'Bearer ' + mytoken})
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: 'Bearer ' + mytoken
|
||||
})
|
||||
}).then((response) =>
|
||||
response.text().then((result) => {
|
||||
callback(result);
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
if (response.status === 200) {
|
||||
// success
|
||||
try {
|
||||
// decode json or text
|
||||
const data = json ? await response.json() : await response.text();
|
||||
callback(data);
|
||||
} catch (e) {
|
||||
errorcallback(e);
|
||||
}
|
||||
} else if (response.status === 400) {
|
||||
// Bad Request --> invalid token
|
||||
console.log('loading Password page.');
|
||||
// load password page
|
||||
if (GlobalInfos.loadPasswordPage) {
|
||||
GlobalInfos.loadPasswordPage(() => {
|
||||
callAPI(apinode, fd, callback, errorcallback);
|
||||
});
|
||||
}
|
||||
} else {
|
||||
console.log('Error: ' + response.statusText);
|
||||
if (errorcallback) {
|
||||
errorcallback(response.statusText);
|
||||
}
|
||||
}
|
||||
})();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -9,7 +9,6 @@ class StaticInfos {
|
||||
private darktheme: boolean = true;
|
||||
private videopath: string = '';
|
||||
private tvshowpath: string = '';
|
||||
private TVShowsEnabled: boolean = false;
|
||||
|
||||
/**
|
||||
* check if the current theme is the dark theme
|
||||
@ -72,14 +71,6 @@ class StaticInfos {
|
||||
* 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();
|
||||
|
||||
Reference in New Issue
Block a user