use correct filepath when checking if tv show episode already exits in databse

Libffmpeg for thumbnailparsing

See merge request lukas/openmediacenter!56

.eslintrc.js

@@ -45,6 +45,8 @@ module.exports = {
 
     // Map from global var to bool specifying if it can be redefined
     globals: {
+        File: true,
+        FileList: true,
         jest: true,
         __DEV__: true,
         __dirname: false,
@@ -97,6 +99,7 @@ module.exports = {
     rules: {
         "@typescript-eslint/no-explicit-any": "error",
         "@typescript-eslint/explicit-function-return-type": "error",
+        "@typescript-eslint/no-shadow": "warn",
 
         // General
         'comma-dangle': [1, 'never'], // allow or disallow trailing commas
@@ -182,7 +185,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-delete-var': 1, // disallow deletion of variables
         '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-undef': 2, // disallow use of undeclared variables unless mentioned in a /*global */ block
         'no-undefined': 0, // disallow use of undefined variable (off by default)

.gitlab-ci.yml

@@ -25,11 +25,11 @@ Minimize_Frontend:
       - node_modules/
 
 Build_Backend:
-  image: golang:latest
+  image: luki42/go-ffmpeg:latest
   stage: build_backend
   script:
     - cd apiGo
-    - go build -v -o openmediacenter
+    - go build -v -tags sharedffmpeg -o openmediacenter
     - cp -r ../build/ ./static/
     - go build -v -tags static -o openmediacenter_full
     - env GOOS=windows GOARCH=amd64 go build -v -tags static -o openmediacenter.exe
@@ -62,7 +62,7 @@ Backend_Tests:
   stage: test
   script:
     - cd apiGo
-    - go get -u github.com/jstemmer/go-junit-report
+    - go install github.com/jstemmer/go-junit-report@v0.9.1
     - go test -v ./... 2>&1 | go-junit-report -set-exit-code > report.xml
   needs: []
   artifacts:

apiGo/api/API.go

@@ -1,48 +1,10 @@
 package api
 
-import (
-	gws "github.com/gowebsecure/goWebSecure-go"
-	"github.com/gowebsecure/goWebSecure-go/oauth"
-	"openmediacenter/apiGo/database/settings"
-)
-
-const (
-	VideoNode    = iota
-	TagNode      = iota
-	SettingsNode = iota
-	ActorNode    = iota
-	TVShowNode   = iota
-)
-
-func Init() {
-	AddVideoHandlers()
-	AddSettingsHandlers()
-	AddTagHandlers()
-	AddActorsHandlers()
-	AddTvshowHandlers()
-
-	gws.AddAPINode("video", VideoNode, true)
-	gws.AddAPINode("tags", TagNode, true)
-	gws.AddAPINode("settings", SettingsNode, true)
-	gws.AddAPINode("actor", ActorNode, true)
-	gws.AddAPINode("tvshow", TVShowNode, true)
-
-	// serverinit is blocking
-	gws.ServerInit(func(id string) (oauth.CustomClientInfo, error) {
-		password := settings.GetPassword()
-		// if password not set assign default password
-		if password == nil {
-			defaultpassword := "openmediacenter"
-			password = &defaultpassword
-		}
-
-		clientinfo := oauth.CustomClientInfo{
-			ID:     "openmediacenter",
-			Secret: *password,
-			Domain: "http://localhost:8081",
-			UserID: "openmediacenter",
-		}
-
-		return clientinfo, nil
-	}, 8080)
+func AddHandlers() {
+	addVideoHandlers()
+	addSettingsHandlers()
+	addTagHandlers()
+	addActorsHandlers()
+	addTvshowHandlers()
+	addUploadHandler()
 }

apiGo/api/Actors.go

@@ -2,12 +2,12 @@ package api
 
 import (
 	"fmt"
-	gws "github.com/gowebsecure/goWebSecure-go"
+	"openmediacenter/apiGo/api/api"
 	"openmediacenter/apiGo/api/types"
 	"openmediacenter/apiGo/database"
 )
 
-func AddActorsHandlers() {
+func addActorsHandlers() {
 	saveActorsToDB()
 	getActorsFromDB()
 }
@@ -24,9 +24,9 @@ func getActorsFromDB() {
 	 * @apiSuccess {string} .Name Actor Name
 	 * @apiSuccess {string} .Thumbnail Portrait Thumbnail
 	 */
-	gws.AddHandler("getAllActors", ActorNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("getAllActors", api.ActorNode, api.PermUser, func(context api.Context) {
 		query := "SELECT actor_id, name, thumbnail FROM actors"
-		return jsonify(readActorsFromResultset(database.Query(query)))
+		context.Json(readActorsFromResultset(database.Query(query)))
 	})
 
 	/**
@@ -42,20 +42,21 @@ func getActorsFromDB() {
 	 * @apiSuccess {string} .Name Actor Name
 	 * @apiSuccess {string} .Thumbnail Portrait Thumbnail
 	 */
-	gws.AddHandler("getActorsOfVideo", ActorNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("getActorsOfVideo", api.ActorNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			MovieId int
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		err := api.DecodeRequest(context.GetRequest(), &args)
+		if err != nil {
+			context.Text("failed to decode request")
+			return
 		}
 
 		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)
 
-		return jsonify(readActorsFromResultset(database.Query(query)))
+		context.Json(readActorsFromResultset(database.Query(query)))
 	})
 
 	/**
@@ -75,13 +76,15 @@ func getActorsFromDB() {
 	 * @apiSuccess {string} Info.Name Actor Name
 	 * @apiSuccess {string} Info.Thumbnail Actor Thumbnail
 	 */
-	gws.AddHandler("getActorInfo", ActorNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("getActorInfo", api.ActorNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			ActorId int
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+
+		err := api.DecodeRequest(context.GetRequest(), &args)
+		if err != nil {
+			context.Error("unable to decode request")
+			return
 		}
 
 		query := fmt.Sprintf(`SELECT movie_id, movie_name FROM actors_videos
@@ -100,7 +103,7 @@ func getActorsFromDB() {
 			Info:   actor,
 		}
 
-		return jsonify(result)
+		context.Json(result)
 	})
 }
 
@@ -113,19 +116,17 @@ func saveActorsToDB() {
 	 *
 	 * @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
 	 */
-	gws.AddHandler("createActor", ActorNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("createActor", api.ActorNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			ActorName string
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
-		}
+		api.DecodeRequest(context.GetRequest(), &args)
 
 		query := "INSERT IGNORE INTO actors (name) VALUES (?)"
-		return database.SuccessQuery(query, args.ActorName)
+		// todo bit ugly
+		context.Text(string(database.SuccessQuery(query, args.ActorName)))
 	})
 
 	/**
@@ -137,19 +138,20 @@ func saveActorsToDB() {
 	 * @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
+	 * @apiSuccess {string} result 'success' if successfully or Error message if not
 	 */
-	gws.AddHandler("addActorToVideo", ActorNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("addActorToVideo", api.ActorNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			ActorId int
 			MovieId int
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		err := api.DecodeRequest(context.GetRequest(), &args)
+		if err != nil {
+			context.Error("unable to decode request")
+			return
 		}
 
 		query := fmt.Sprintf("INSERT IGNORE INTO actors_videos (actor_id, video_id) VALUES (%d,%d)", args.ActorId, args.MovieId)
-		return database.SuccessQuery(query)
+		context.Text(string(database.SuccessQuery(query)))
 	})
 }

apiGo/api/FileUpload.go

@@ -0,0 +1,69 @@
+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"})
+	})
+}

apiGo/api/Helpers.go

@@ -2,10 +2,8 @@ package api
 
 import (
 	"database/sql"
-	"encoding/json"
 	"fmt"
 	"openmediacenter/apiGo/api/types"
-	"reflect"
 )
 
 // MovieId - MovieName : pay attention to the order!
@@ -15,7 +13,8 @@ func readVideosFromResultset(rows *sql.Rows) []types.VideoUnloadedType {
 		var vid types.VideoUnloadedType
 		err := rows.Scan(&vid.MovieId, &vid.MovieName)
 		if err != nil {
-			panic(err.Error()) // proper error handling instead of panic in your app
+			fmt.Println(err.Error())
+			return nil
 		}
 		result = append(result, vid)
 	}
@@ -32,7 +31,7 @@ func readTagsFromResultset(rows *sql.Rows) []types.Tag {
 		var tag types.Tag
 		err := rows.Scan(&tag.TagId, &tag.TagName)
 		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)
 	}
@@ -53,7 +52,7 @@ func readActorsFromResultset(rows *sql.Rows) []types.Actor {
 			actor.Thumbnail = string(thumbnail)
 		}
 		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)
 	}
@@ -69,7 +68,7 @@ func readTVshowsFromResultset(rows *sql.Rows) []types.TVShow {
 		var vid types.TVShow
 		err := rows.Scan(&vid.Id, &vid.Name)
 		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)
 	}
@@ -77,54 +76,3 @@ func readTVshowsFromResultset(rows *sql.Rows) []types.TVShow {
 
 	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
-}

apiGo/api/Settings.go

@@ -1,10 +1,9 @@
 package api
 
 import (
-	"encoding/json"
-	"fmt"
-	gws "github.com/gowebsecure/goWebSecure-go"
+	"openmediacenter/apiGo/api/api"
 	"openmediacenter/apiGo/api/types"
+	"openmediacenter/apiGo/config"
 	"openmediacenter/apiGo/database"
 	"openmediacenter/apiGo/database/settings"
 	"openmediacenter/apiGo/videoparser"
@@ -12,7 +11,7 @@ import (
 	"strings"
 )
 
-func AddSettingsHandlers() {
+func addSettingsHandlers() {
 	saveSettingsToDB()
 	getSettingsFromDB()
 	reIndexHandling()
@@ -38,7 +37,7 @@ func getSettingsFromDB() {
 	 * @apiSuccess {uint32} Sizes.DifferentTags number of different tags available
 	 * @apiSuccess {uint32} Sizes.TagsAdded number of different tags added to videos
 	 */
-	gws.AddHandler("loadGeneralSettings", SettingsNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("loadGeneralSettings", api.SettingsNode, api.PermUser, func(context api.Context) {
 		result, _, sizes := database.GetSettings()
 
 		var ret = struct {
@@ -48,7 +47,7 @@ func getSettingsFromDB() {
 			Settings: &result,
 			Sizes:    &sizes,
 		}
-		return jsonify(ret)
+		context.Json(ret)
 	})
 
 	/**
@@ -64,16 +63,17 @@ func getSettingsFromDB() {
 	 * @apiSuccess {bool} DarkMode Darkmode enabled?
 	 * @apiSuccess {bool} TVShowEnabled is are TVShows enabled
 	 */
-	gws.AddHandler("loadInitialData", SettingsNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("loadInitialData", api.SettingsNode, api.PermUser, func(context api.Context) {
 		sett := settings.LoadSettings()
 
 		type InitialDataTypeResponse struct {
-			DarkMode        bool
-			Pasword         bool
-			MediacenterName string
-			VideoPath       string
-			TVShowPath      string
-			TVShowEnabled   bool
+			DarkMode          bool
+			Pasword           bool
+			MediacenterName   string
+			VideoPath         string
+			TVShowPath        string
+			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}")
@@ -83,16 +83,16 @@ func getSettingsFromDB() {
 		serverTVShowPath := strings.TrimPrefix(sett.TVShowPath, tvshowurl)
 
 		res := InitialDataTypeResponse{
-			DarkMode:        sett.DarkMode,
-			Pasword:         sett.Pasword != "-1",
-			MediacenterName: sett.MediacenterName,
-			VideoPath:       serverVideoPath,
-			TVShowPath:      serverTVShowPath,
-			TVShowEnabled:   settings.TVShowsEnabled(),
+			DarkMode:          sett.DarkMode,
+			Pasword:           sett.Pasword != "-1",
+			MediacenterName:   sett.MediacenterName,
+			VideoPath:         serverVideoPath,
+			TVShowPath:        serverTVShowPath,
+			TVShowEnabled:     !config.GetConfig().Features.DisableTVSupport,
+			FullDeleteEnabled: config.GetConfig().Features.FullyDeletableVideos,
 		}
 
-		str, _ := json.Marshal(res)
-		return str
+		context.Json(res)
 	})
 }
 
@@ -110,13 +110,14 @@ func saveSettingsToDB() {
 	 * @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
+	 * @apiSuccess {string} result 'success' if successfully or Error message if not
 	 */
-	gws.AddHandler("saveGeneralSettings", SettingsNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("saveGeneralSettings", api.SettingsNode, api.PermUser, func(context api.Context) {
 		var args types.SettingsType
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		err := api.DecodeRequest(context.GetRequest(), &args)
+		if err != nil {
+			context.Error("unable to decode arguments")
+			return
 		}
 
 		query := `
@@ -128,9 +129,10 @@ func saveSettingsToDB() {
                         TMDB_grabbing=?, 
                         DarkMode=?
                     WHERE 1`
-		return database.SuccessQuery(query,
+		// todo avoid conversion
+		context.Text(string(database.SuccessQuery(query,
 			args.VideoPath, args.EpisodePath, args.Password,
-			args.MediacenterName, args.TMDBGrabbing, args.DarkMode)
+			args.MediacenterName, args.TMDBGrabbing, args.DarkMode)))
 	})
 }
 
@@ -142,11 +144,11 @@ func reIndexHandling() {
 	 * @apiName startReindex
 	 * @apiGroup Settings
 	 *
-	 * @apiSuccess {string} result 'success' if successfully or error message if not
+	 * @apiSuccess {string} result 'success' if successfully or Error message if not
 	 */
-	gws.AddHandler("startReindex", SettingsNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("startReindex", api.SettingsNode, api.PermUser, func(context api.Context) {
 		videoparser.StartReindex()
-		return database.ManualSuccessResponse(nil)
+		context.Text(string(database.ManualSuccessResponse(nil)))
 	})
 
 	/**
@@ -155,11 +157,11 @@ func reIndexHandling() {
 	 * @apiName startTVShowReindex
 	 * @apiGroup Settings
 	 *
-	 * @apiSuccess {string} result 'success' if successfully or error message if not
+	 * @apiSuccess {string} result 'success' if successfully or Error message if not
 	 */
-	gws.AddHandler("startTVShowReindex", SettingsNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("startTVShowReindex", api.SettingsNode, api.PermUser, func(context api.Context) {
 		videoparser.StartTVShowReindex()
-		return database.ManualSuccessResponse(nil)
+		context.Text(string(database.ManualSuccessResponse(nil)))
 	})
 
 	/**
@@ -168,8 +170,7 @@ func reIndexHandling() {
 	 * @apiName cleanupGravity
 	 * @apiGroup Settings
 	 */
-	gws.AddHandler("cleanupGravity", SettingsNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("cleanupGravity", api.SettingsNode, api.PermUser, func(context api.Context) {
 		videoparser.StartCleanup()
-		return nil
 	})
 }

apiGo/api/TVShows.go

@@ -2,14 +2,14 @@ package api
 
 import (
 	"fmt"
-	gws "github.com/gowebsecure/goWebSecure-go"
+	"openmediacenter/apiGo/api/api"
+	"openmediacenter/apiGo/config"
 	"openmediacenter/apiGo/database"
-	"openmediacenter/apiGo/database/settings"
 )
 
-func AddTvshowHandlers() {
+func addTvshowHandlers() {
 	// do not add handlers if tvshows not enabled
-	if !settings.TVShowsEnabled() {
+	if config.GetConfig().Features.DisableTVSupport {
 		return
 	}
 
@@ -23,10 +23,10 @@ func AddTvshowHandlers() {
 	 * @apiSuccess {uint32} .Id tvshow id
 	 * @apiSuccess {string} .Name tvshow name
 	 */
-	gws.AddHandler("getTVShows", TVShowNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("getTVShows", api.TVShowNode, api.PermUser, func(context api.Context) {
 		query := "SELECT id, name FROM tvshow"
 		rows := database.Query(query)
-		return jsonify(readTVshowsFromResultset(rows))
+		context.Json(readTVshowsFromResultset(rows))
 	})
 
 	/**
@@ -43,13 +43,14 @@ func AddTvshowHandlers() {
 	 * @apiSuccess {uint8} .Season Season number
 	 * @apiSuccess {uint8} .Episode Episode number
 	 */
-	gws.AddHandler("getEpisodes", TVShowNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("getEpisodes", api.TVShowNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			ShowID uint32
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		err := api.DecodeRequest(context.GetRequest(), &args)
+		if err != nil {
+			context.Text("unable to decode request")
+			return
 		}
 
 		query := fmt.Sprintf("SELECT id, name, season, episode FROM tvshow_episodes WHERE tvshow_id=%d", args.ShowID)
@@ -74,7 +75,7 @@ func AddTvshowHandlers() {
 			episodes = append(episodes, ep)
 		}
 
-		return jsonify(episodes)
+		context.Json(episodes)
 	})
 
 	/**
@@ -91,13 +92,14 @@ func AddTvshowHandlers() {
 	 * @apiSuccess {uint8} Episode Episode number
 	 * @apiSuccess {string} Path webserver path of video file
 	 */
-	gws.AddHandler("loadEpisode", TVShowNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("loadEpisode", api.TVShowNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			ID uint32
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		err := api.DecodeRequest(context.GetRequest(), &args)
+		if err != nil {
+			context.Text("unable to decode argument")
+			return
 		}
 
 		query := fmt.Sprintf(`
@@ -117,15 +119,16 @@ WHERE tvshow_episodes.id=%d`, args.ID)
 		var filename 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 {
 			fmt.Println(err.Error())
-			return nil
+			context.Error(err.Error())
+			return
 		}
 
 		ret.Path = foldername + "/" + filename
 
-		return jsonify(ret)
+		context.Json(ret)
 	})
 
 	/**
@@ -138,25 +141,26 @@ WHERE tvshow_episodes.id=%d`, args.ID)
 	 *
 	 * @apiSuccess {string} . Base64 encoded Thubnail
 	 */
-	gws.AddHandler("readThumbnail", TVShowNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("readThumbnail", api.TVShowNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			Id int
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		err := api.DecodeRequest(context.GetRequest(), &args)
+		if err != nil {
+			context.Text("unable to decode request")
+			return
 		}
 
 		var pic []byte
 
 		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 {
 			fmt.Printf("the thumbnail of movie id %d couldn't be found", args.Id)
-			return nil
+			return
 		}
 
-		return pic
+		context.Text(string(pic))
 	})
 }

apiGo/api/Tags.go

@@ -2,12 +2,12 @@ package api
 
 import (
 	"fmt"
-	gws "github.com/gowebsecure/goWebSecure-go"
+	"openmediacenter/apiGo/api/api"
 	"openmediacenter/apiGo/database"
 	"regexp"
 )
 
-func AddTagHandlers() {
+func addTagHandlers() {
 	getFromDB()
 	addToDB()
 	deleteFromDB()
@@ -23,16 +23,17 @@ func deleteFromDB() {
 	 * @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
+	 * @apiSuccess {string} result 'success' if successfully or Error message if not
 	 */
-	gws.AddHandler("deleteTag", TagNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("deleteTag", api.TagNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			TagId int
 			Force bool
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		err := api.DecodeRequest(context.GetRequest(), &args)
+		if err != nil {
+			context.Text("unable to decode request")
+			return
 		}
 
 		// delete key constraints first
@@ -42,23 +43,24 @@ func deleteFromDB() {
 
 			// respond only if result not successful
 			if err != nil {
-				return database.ManualSuccessResponse(err)
+				context.Text(string(database.ManualSuccessResponse(err)))
+				return
 			}
 		}
 
 		query := fmt.Sprintf("DELETE FROM tags WHERE tag_id=%d", args.TagId)
-		err := database.Edit(query)
+		err = database.Edit(query)
 
 		if err == nil {
 			// return if successful
-			return database.ManualSuccessResponse(err)
+			context.Text(string(database.ManualSuccessResponse(err)))
 		} 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.*$")
 			if r.MatchString(err.Error()) {
-				return database.ManualSuccessResponse(fmt.Errorf("not empty tag"))
+				context.Text(string(database.ManualSuccessResponse(fmt.Errorf("not empty tag"))))
 			} else {
-				return database.ManualSuccessResponse(err)
+				context.Text(string(database.ManualSuccessResponse(err)))
 			}
 		}
 	})
@@ -75,9 +77,9 @@ func getFromDB() {
 	 * @apiSuccess {uint32} TagId
 	 * @apiSuccess {string} TagName name of the Tag
 	 */
-	gws.AddHandler("getAllTags", TagNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("getAllTags", api.TagNode, api.PermUser, func(context api.Context) {
 		query := "SELECT tag_id,tag_name from tags"
-		return jsonify(readTagsFromResultset(database.Query(query)))
+		context.Json(readTagsFromResultset(database.Query(query)))
 	})
 }
 
@@ -90,19 +92,20 @@ func addToDB() {
 	 *
 	 * @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
 	 */
-	gws.AddHandler("createTag", TagNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("createTag", api.TagNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			TagName string
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		err := api.DecodeRequest(context.GetRequest(), &args)
+		if err != nil {
+			context.Text("unable to decode request")
+			return
 		}
 
 		query := "INSERT IGNORE INTO tags (tag_name) VALUES (?)"
-		return database.SuccessQuery(query, args.TagName)
+		context.Text(string(database.SuccessQuery(query, args.TagName)))
 	})
 
 	/**
@@ -114,19 +117,20 @@ func addToDB() {
 	 * @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
+	 * @apiSuccess {string} result 'success' if successfully or Error message if not
 	 */
-	gws.AddHandler("addTag", TagNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("addTag", api.TagNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			MovieId int
 			TagId   int
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		err := api.DecodeRequest(context.GetRequest(), &args)
+		if err != nil {
+			context.Text("unable to decode request")
+			return
 		}
 
 		query := "INSERT IGNORE INTO video_tags(tag_id, video_id) VALUES (?,?)"
-		return database.SuccessQuery(query, args.TagId, args.MovieId)
+		context.Text(string(database.SuccessQuery(query, args.TagId, args.MovieId)))
 	})
 }

apiGo/api/Video.go

@@ -1,16 +1,17 @@
 package api
 
 import (
-	"encoding/json"
 	"fmt"
-	gws "github.com/gowebsecure/goWebSecure-go"
 	"net/url"
+	"openmediacenter/apiGo/api/api"
 	"openmediacenter/apiGo/api/types"
+	"openmediacenter/apiGo/config"
 	"openmediacenter/apiGo/database"
+	"os"
 	"strconv"
 )
 
-func AddVideoHandlers() {
+func addVideoHandlers() {
 	getVideoHandlers()
 	loadVideosHandlers()
 	addToVideoHandlers()
@@ -30,14 +31,15 @@ func getVideoHandlers() {
 	 * @apiSuccess {String} Videos.MovieName  Name of video
 	 * @apiSuccess {String} TagName Name of the Tag returned
 	 */
-	gws.AddHandler("getMovies", VideoNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("getMovies", api.VideoNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			Tag  uint32
 			Sort uint8
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		err := api.DecodeRequest(context.GetRequest(), &args)
+		if err != nil {
+			context.Text("unable to decode request")
+			return
 		}
 
 		const (
@@ -91,24 +93,22 @@ func getVideoHandlers() {
 			var vid types.VideoUnloadedType
 			err := rows.Scan(&vid.MovieId, &vid.MovieName, &name)
 			if err != nil {
-				return nil
+				return
 			}
 			vids = append(vids, vid)
 		}
 		if rows.Close() != nil {
-			return nil
+			return
 		}
 
 		// if the tag id doesn't exist the query won't return a name
 		if name == "" {
-			return nil
+			return
 		}
 
 		result.Videos = vids
 		result.TagName = name
-		// jsonify results
-		str, _ := json.Marshal(result)
-		return str
+		context.Json(result)
 	})
 
 	/**
@@ -121,26 +121,27 @@ func getVideoHandlers() {
 	 *
 	 * @apiSuccess {string} . Base64 encoded Thubnail
 	 */
-	gws.AddHandler("readThumbnail", VideoNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("readThumbnail", api.VideoNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			Movieid int
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		err := api.DecodeRequest(context.GetRequest(), &args)
+		if err != nil {
+			context.Text("unable to decode request")
+			return
 		}
 
 		var pic []byte
 
 		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 {
 			fmt.Printf("the thumbnail of movie id %d couldn't be found", args.Movieid)
-			return nil
+			return
 		}
 
-		return pic
+		context.Text(string(pic))
 	})
 
 	/**
@@ -159,13 +160,13 @@ func getVideoHandlers() {
 	 * @apiSuccess {string} Videos.MovieName Video Name
 	 * @apiSuccess {int} Videos.MovieId Video ID
 	 */
-	gws.AddHandler("getRandomMovies", VideoNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("getRandomMovies", api.VideoNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			Number int
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		if api.DecodeRequest(context.GetRequest(), &args) != nil {
+			context.Text("unable to decode request")
+			return
 		}
 
 		var result struct {
@@ -197,15 +198,13 @@ func getVideoHandlers() {
 			var tag types.Tag
 			err := rows.Scan(&tag.TagName, &tag.TagId)
 			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
 			result.Tags = append(result.Tags, tag)
 		}
 
-		// jsonify results
-		str, _ := json.Marshal(result)
-		return str
+		context.Json(result)
 	})
 
 	/**
@@ -220,23 +219,19 @@ func getVideoHandlers() {
 	 * @apiSuccess {number} .MovieId Id of Video
 	 * @apiSuccess {String} .MovieName  Name of video
 	 */
-	gws.AddHandler("getSearchKeyWord", VideoNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("getSearchKeyWord", api.VideoNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			KeyWord string
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		if api.DecodeRequest(context.GetRequest(), &args) != nil {
+			context.Text("unable to decode request")
+			return
 		}
 
 		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)
-
-		result := readVideosFromResultset(database.Query(query))
-		// jsonify results
-		str, _ := json.Marshal(result)
-		return str
+		context.Json(readVideosFromResultset(database.Query(query)))
 	})
 }
 
@@ -272,13 +267,13 @@ func loadVideosHandlers() {
 	 * @apiSuccess {string} Actors.Name Actor Name
 	 * @apiSuccess {string} Actors.Thumbnail Portrait Thumbnail
 	 */
-	gws.AddHandler("loadVideo", VideoNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("loadVideo", api.VideoNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			MovieId int
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		if api.DecodeRequest(context.GetRequest(), &args) != nil {
+			context.Text("unable to decode request")
+			return
 		}
 
 		query := fmt.Sprintf(`SELECT movie_name,movie_url,movie_id,thumbnail,poster,likes,quality,length 
@@ -290,9 +285,9 @@ 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", args.MovieId)
 			fmt.Println(err.Error())
-			return nil
+			return
 		}
 
 		// we ned to urlencode the movieurl
@@ -330,9 +325,7 @@ func loadVideosHandlers() {
 
 		res.Actors = readActorsFromResultset(database.Query(query))
 
-		// jsonify results
-		str, _ := json.Marshal(res)
-		return str
+		context.Json(res)
 	})
 
 	/**
@@ -348,7 +341,7 @@ func loadVideosHandlers() {
 	 * @apiSuccess {uint32} DifferentTags number of different Tags available
 	 * @apiSuccess {uint32} Tagged number of different Tags assigned
 	 */
-	gws.AddHandler("getStartData", VideoNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("getStartData", api.VideoNode, api.PermUser, func(context api.Context) {
 		var result types.StartData
 		// query settings and infotile values
 		query := `
@@ -382,9 +375,7 @@ func loadVideosHandlers() {
 
 		_ = database.QueryRow(query).Scan(&result.VideoNr, &result.Tagged, &result.HDNr, &result.FullHdNr, &result.SDNr, &result.DifferentTags)
 
-		// jsonify results
-		str, _ := json.Marshal(result)
-		return str
+		context.Json(result)
 	})
 }
 
@@ -397,19 +388,19 @@ func addToVideoHandlers() {
 	 *
 	 * @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
 	 */
-	gws.AddHandler("addLike", VideoNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("addLike", api.VideoNode, api.PermUser, func(context api.Context) {
 		var args struct {
 			MovieId int
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		if api.DecodeRequest(context.GetRequest(), &args) != nil {
+			context.Text("unable to decode request")
+			return
 		}
 
 		query := fmt.Sprintf("update videos set likes = likes + 1 where movie_id = %d", args.MovieId)
-		return database.SuccessQuery(query)
+		context.Text(string(database.SuccessQuery(query)))
 	})
 
 	/**
@@ -419,16 +410,18 @@ func addToVideoHandlers() {
 	 * @apiGroup 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
 	 */
-	gws.AddHandler("deleteVideo", VideoNode, func(info *gws.HandlerInfo) []byte {
+	api.AddHandler("deleteVideo", api.VideoNode, api.PermUser, func(context api.Context) {
 		var args struct {
-			MovieId int
+			MovieId     int
+			FullyDelete bool
 		}
-		if err := FillStruct(&args, info.Data); err != nil {
-			fmt.Println(err.Error())
-			return nil
+		if api.DecodeRequest(context.GetRequest(), &args) != nil {
+			context.Text("unable to decode request")
+			return
 		}
 
 		// delete tag constraints
@@ -441,10 +434,31 @@ func addToVideoHandlers() {
 
 		// respond only if result not successful
 		if err != nil {
-			return database.ManualSuccessResponse(err)
+			context.Text(string(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)
-		return database.SuccessQuery(query)
+		context.Text(string(database.SuccessQuery(query)))
 	})
 }

apiGo/api/api/ApiBase.go

@@ -0,0 +1,64 @@
+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)
+}

apiGo/api/api/Auth.go

@@ -0,0 +1,117 @@
+package api
+
+import (
+	"fmt"
+	"github.com/dgrijalva/jwt-go"
+	"gopkg.in/oauth2.v3"
+	"gopkg.in/oauth2.v3/server"
+	"net/http"
+	"openmediacenter/apiGo/database"
+	"strconv"
+	"time"
+)
+
+var srv *server.Server
+
+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 = 24
+
+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,
+		})
+	})
+}
+
+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)
+	}
+}

apiGo/api/api/Context.go

@@ -0,0 +1,65 @@
+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
+}

apiGo/api/api/Hash.go

@@ -0,0 +1,13 @@
+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
+}

apiGo/api/api/Hash_test.go

@@ -0,0 +1,11 @@
+package api
+
+import "testing"
+
+func TestHashlength(t *testing.T) {
+	h := HashPassword("test")
+
+	if len(*h) != 64 {
+		t.Errorf("Invalid hash length: %d", len(*h))
+	}
+}

apiGo/api/api/Helpers.go

@@ -0,0 +1,31 @@
+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
+}

apiGo/api/api/Helpers_test.go

@@ -0,0 +1,22 @@
+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)
+	}
+}

apiGo/config/Config.go

@@ -0,0 +1,206 @@
+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
+}

apiGo/config/Config_test.go

@@ -0,0 +1,9 @@
+package config
+
+import "testing"
+
+func TestSaveLoadConfig(t *testing.T) {
+	generateNewConfig("", "openmediacenter.cfg")
+
+	Init()
+}

apiGo/database/Database.go

@@ -5,23 +5,14 @@ import (
 	"fmt"
 	_ "github.com/go-sql-driver/mysql"
 	"openmediacenter/apiGo/api/types"
+	"openmediacenter/apiGo/config"
 )
 
 var db *sql.DB
 var DBName string
 
-// store the command line parameter for Videoprefix
-var SettingsVideoPrefix = ""
-
-type DatabaseConfig struct {
-	DBHost     string
-	DBPort     int
-	DBUser     string
-	DBPassword string
-	DBName     string
-}
-
-func InitDB(dbconf *DatabaseConfig) {
+func InitDB() {
+	dbconf := config.GetConfig().Database
 	DBName = dbconf.DBName
 
 	// Open up our database connection.
@@ -128,6 +119,6 @@ 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
+	PathPrefix = config.GetConfig().General.ReindexPrefix
 	return
 }

apiGo/database/settings/Settings.go

@@ -1,11 +0,0 @@
-package settings
-
-var tvShowEnabled bool
-
-func TVShowsEnabled() bool {
-	return tvShowEnabled
-}
-
-func SetTVShowEnabled(enabled bool) {
-	tvShowEnabled = enabled
-}

apiGo/go.mod

@@ -3,7 +3,11 @@ module openmediacenter/apiGo
 go 1.16
 
 require (
+	github.com/3d0c/gmf v0.0.0-20210925211039-e278e6e53b16
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-sql-driver/mysql v1.5.0
-	github.com/gowebsecure/goWebSecure-go v0.1.0-beta.1
+	github.com/pelletier/go-toml/v2 v2.0.0-beta.3
+	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
+	gopkg.in/oauth2.v3 v3.12.0
 	nhooyr.io/websocket v1.8.7
 )

apiGo/go.sum

@@ -1,4 +1,6 @@
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/3d0c/gmf v0.0.0-20210925211039-e278e6e53b16 h1:LX3XWmS88yKgWJcMXb8vusphpDBe9+6LTI9FyHeFFWQ=
+github.com/3d0c/gmf v0.0.0-20210925211039-e278e6e53b16/go.mod h1:0QMRcUq2JsDECeAq7bj4h79k7XbhtTsrPUQf6G7qfPs=
 github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -41,18 +43,14 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 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/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gowebsecure/goWebSecure-go v0.1.0-beta.1 h1:lMaNWyk5udtOAc8U+mUo2FTgNqRwT+Aj5mxDfP5qtx0=
-github.com/gowebsecure/goWebSecure-go v0.1.0-beta.1/go.mod h1:uEM+/1LS6hSBby7VKx2cHZ9btvQ/LC4K3HWKgqDRPs0=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/imkira/go-interpol v1.1.0 h1:KIiKr0VSG2CUW1hl1jpiyuzuJeKUUpC8iM1AIE7N1Vk=
 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 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 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=
@@ -74,18 +72,19 @@ github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOA
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/pelletier/go-toml/v2 v2.0.0-beta.3 h1:PNCTU4naEJ8mKal97P3A2qDU74QRQGlv4FXiL1XDqi4=
+github.com/pelletier/go-toml/v2 v2.0.0-beta.3/go.mod h1:aNseLYu/uKskg0zpr/kbr2z8yGuWtotWf/0BpGIAL2Y=
 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/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 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/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 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/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tidwall/btree v0.0.0-20170113224114-9876f1454cf0 h1:QnyrPZZvPmR0AtJCxxfCtI1qN+fYpKTKJ/5opWmZ34k=
 github.com/tidwall/btree v0.0.0-20170113224114-9876f1454cf0/go.mod h1:huei1BkDWJ3/sLXmO+bsCNELL+Bp2Kks9OLyQFkzvA8=
 github.com/tidwall/buntdb v1.1.0 h1:H6LzK59KiNjf1nHVPFrYj4Qnl8d8YLBsYamdL8N+Bao=
@@ -124,6 +123,7 @@ github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FB
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
 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 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 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=
@@ -156,5 +156,7 @@ 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.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 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/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=

apiGo/main.go

@@ -1,66 +1,49 @@
 package main
 
 import (
-	"flag"
 	"fmt"
-	"log"
-	"net/http"
 	"openmediacenter/apiGo/api"
+	api2 "openmediacenter/apiGo/api/api"
+	"openmediacenter/apiGo/config"
 	"openmediacenter/apiGo/database"
-	settings2 "openmediacenter/apiGo/database/settings"
 	"openmediacenter/apiGo/static"
 	"openmediacenter/apiGo/videoparser"
+	"os"
+	"os/signal"
 )
 
 func main() {
 	fmt.Println("init OpenMediaCenter server")
-	port := 8081
+	const port uint16 = 8081
+
+	config.Init()
 
-	db, verbose, pathPrefix := handleCommandLineArguments()
 	// 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)
 
-	fmt.Printf("Use verbose output: %t\n", verbose)
-	fmt.Printf("Videopath prefix: %s\n", *pathPrefix)
-
-	// set pathprefix in database settings object
-	database.SettingsVideoPrefix = *pathPrefix
-
-	database.InitDB(db)
+	database.InitDB()
 	defer database.Close()
 
+	api.AddHandlers()
+
 	videoparser.SetupSettingsWebsocket()
 
 	// add the static files
 	static.ServeStaticFiles()
 
-	api.Init()
+	// init api
+	errc := make(chan error, 1)
+	go func() {
+		errc <- api2.ServerInit(port)
+	}()
 
-	fmt.Printf("OpenMediacenter server up and running on port %d\n", port)
-	log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", port), nil))
-}
-
-func handleCommandLineArguments() (*database.DatabaseConfig, bool, *string) {
-	dbhostPtr := flag.String("DBHost", "127.0.0.1", "database host name")
-	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
+	sigs := make(chan os.Signal, 1)
+	signal.Notify(sigs, os.Interrupt)
+	select {
+	case err := <-errc:
+		fmt.Printf("failed to serve: %v\n", err)
+	case sig := <-sigs:
+		fmt.Printf("terminating server: %v\n", sig)
+	}
 }

apiGo/videoparser/Helpers.go

@@ -1,11 +1,7 @@
 package videoparser
 
 import (
-	"encoding/base64"
 	"encoding/json"
-	"fmt"
-	"os/exec"
-	"strconv"
 )
 
 func AppendMessage(message string) {
@@ -33,88 +29,3 @@ func SendEvent(message string) {
 
 	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
-}

apiGo/videoparser/ReIndexTVShows.go

@@ -25,20 +25,18 @@ func startTVShowReindex(files []Show) {
 }
 
 func insertEpisodesIfNotExisting(show Show) {
-	query := "SELECT tvshow_episodes.name, season, episode FROM tvshow_episodes JOIN tvshow t on t.id = tvshow_episodes.tvshow_id WHERE t.name=?"
+	query := "SELECT filename FROM tvshow_episodes JOIN tvshow t on t.id = tvshow_episodes.tvshow_id WHERE t.name=?"
 	rows := database.Query(query, show.Name)
 
 	var dbepisodes []string
 	for rows.Next() {
-		var epname string
-		var season int
-		var episode int
-		err := rows.Scan(&epname, &season, &episode)
+		var filename string
+		err := rows.Scan(&filename)
 		if err != nil {
 			fmt.Println(err.Error())
 		}
 
-		dbepisodes = append(dbepisodes, fmt.Sprintf("%s S%02dE%02d.mp4", epname, season, episode))
+		dbepisodes = append(dbepisodes, filename)
 	}
 
 	// get those episodes that are missing in db
@@ -83,6 +81,10 @@ VALUES (?, ?, ?, (SELECT tvshow.id FROM tvshow WHERE tvshow.name=?), ?, ?)`
 
 // difference returns the elements in `a` that aren't in `b`.
 func difference(a, b []string) []string {
+	if b == nil || len(b) == 0 {
+		return a
+	}
+
 	mb := make(map[string]struct{}, len(b))
 	for _, x := range b {
 		mb[x] = struct{}{}
@@ -129,7 +131,10 @@ func getAllTVShows() *[]string {
 	var res []string
 	for rows.Next() {
 		var show string
-		rows.Scan(&show)
+		err := rows.Scan(&show)
+		if err != nil {
+			continue
+		}
 
 		res = append(res, show)
 	}

apiGo/videoparser/ReIndexVideos.go

@@ -4,15 +4,16 @@ import (
 	"database/sql"
 	"fmt"
 	"openmediacenter/apiGo/api/types"
+	"openmediacenter/apiGo/config"
 	"openmediacenter/apiGo/database"
+	"openmediacenter/apiGo/videoparser/thumbnail"
 	"openmediacenter/apiGo/videoparser/tmdb"
 	"regexp"
 	"strconv"
 	"strings"
 )
 
-var mSettings types.SettingsType
-var mExtDepsAvailable *ExtDependencySupport
+var mSettings *types.SettingsType
 
 // default Tag ids
 const (
@@ -21,31 +22,24 @@ const (
 	LowQuality = 3
 )
 
-type ExtDependencySupport struct {
-	FFMpeg    bool
-	MediaInfo bool
-}
-
 type VideoAttributes struct {
 	Duration float32
 	FileSize uint
 	Width    uint
 }
 
-func ReIndexVideos(path []string, sett types.SettingsType) {
+func InitDeps(sett *types.SettingsType) {
 	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
 	nonExisting := filterExisting(path)
 
 	fmt.Printf("There are %d videos not existing in db.\n", len(*nonExisting))
 
 	for _, s := range *nonExisting {
-		processVideo(s)
+		ProcessVideo(s)
 	}
 
 	AppendMessage("reindex finished successfully!")
@@ -92,8 +86,8 @@ func filterExisting(paths []string) *[]string {
 	return &resultarr
 }
 
-func processVideo(fileNameOrig string) {
-	fmt.Printf("Processing %s video-", fileNameOrig)
+func ProcessVideo(fileNameOrig string) {
+	fmt.Printf("Processing %s video\n", fileNameOrig)
 
 	// match the file extension
 	r := regexp.MustCompile(`\.[a-zA-Z0-9]+$`)
@@ -112,56 +106,50 @@ func addVideo(videoName string, fileName string, year int) {
 	var poster *string
 	var tmdbData *tmdb.VideoTMDB
 	var err error
+	var insertid int64
 
-	// 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
-		}
-	}
+	vidFolder := config.GetConfig().General.ReindexPrefix + mSettings.VideoPath
 
 	// if TMDB grabbing is enabled serach in api for video...
 	if mSettings.TMDBGrabbing {
 		tmdbData = tmdb.SearchVideo(videoName, year)
 		if tmdbData != nil {
-			// reassign parsed pic as poster
-			poster = ppic
 			// and tmdb pic as thumbnail
-			ppic = &tmdbData.Thumbnail
+			poster = &tmdbData.Thumbnail
+		}
+	}
+
+	// parse pic from 4min frame
+	ppic, vinfo, err := thumbnail.Parse(vidFolder+fileName, 240)
+	// use parsed pic also for poster pic
+	if poster == nil {
+		poster = ppic
+	}
+
+	if err != nil {
+		fmt.Printf("FFmpeg error occured: %s\n", err.Error())
+
+		query := `INSERT INTO videos(movie_name,movie_url) VALUES (?,?)`
+		err, insertid = database.Insert(query, videoName, fileName)
+
+	} else {
+		query := `INSERT INTO videos(movie_name,movie_url,poster,thumbnail,quality,length) VALUES (?,?,?,?,?,?)`
+		err, insertid = database.Insert(query, videoName, fileName, ppic, poster, vinfo.Width, vinfo.Length)
+
+		// add default tags
+		if vinfo.Width != 0 && err == nil {
+			insertSizeTag(uint(vinfo.Width), uint(insertid))
 		}
 	}
 
-	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 {
 		fmt.Printf("Failed to insert video into db: %s\n", err.Error())
 		return
 	}
 
-	// add default tags
-	if vidAtr.Width != 0 {
-		insertSizeTag(vidAtr.Width, uint(insertId))
-	}
-
 	// add tmdb tags
 	if mSettings.TMDBGrabbing && tmdbData != nil {
-		insertTMDBTags(tmdbData.GenreIds, insertId)
+		insertTMDBTags(tmdbData.GenreIds, insertid)
 	}
 
 	AppendMessage(fmt.Sprintf("%s - added!", videoName))

apiGo/videoparser/VideoParser.go

@@ -3,6 +3,7 @@ package videoparser
 import (
 	"fmt"
 	"io/ioutil"
+	"openmediacenter/apiGo/config"
 	"openmediacenter/apiGo/database"
 	"os"
 	"path/filepath"
@@ -14,31 +15,46 @@ type StatusMessage struct {
 	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 {
 	fmt.Println("starting reindex..")
 	SendEvent("start")
 	AppendMessage("starting reindex..")
 
-	mSettings, PathPrefix, _ := database.GetSettings()
+	mSettings, _, _ := database.GetSettings()
+
 	// add the path prefix to videopath
-	mSettings.VideoPath = PathPrefix + mSettings.VideoPath
+	vidFolder := config.GetConfig().General.ReindexPrefix + mSettings.VideoPath
 
 	// check if path even exists
-	if _, err := os.Stat(mSettings.VideoPath); os.IsNotExist(err) {
+	if _, err := os.Stat(vidFolder); os.IsNotExist(err) {
 		fmt.Println("Reindex path doesn't exist!")
-		AppendMessage(fmt.Sprintf("Reindex path doesn't exist! :%s", mSettings.VideoPath))
+		AppendMessage(fmt.Sprintf("Reindex path doesn't exist! :%s", vidFolder))
 		SendEvent("stop")
 		return false
 	}
 
 	var files []string
-	err := filepath.Walk(mSettings.VideoPath, func(path string, info os.FileInfo, err error) error {
+	err := filepath.Walk(vidFolder, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			fmt.Println(err.Error())
 			return err
 		}
 
-		if !info.IsDir() && strings.HasSuffix(info.Name(), ".mp4") {
+		if !info.IsDir() && ValidVideoSuffix(info.Name()) {
 			files = append(files, info.Name())
 		}
 		return nil
@@ -49,7 +65,8 @@ func StartReindex() bool {
 	}
 	// start reindex process
 	AppendMessage("Starting Reindexing!")
-	go ReIndexVideos(files, mSettings)
+	InitDeps(&mSettings)
+	go ReIndexVideos(files)
 	return true
 }
 
@@ -104,7 +121,7 @@ func StartTVShowReindex() {
 			}
 
 			for _, epfile := range episodefiles {
-				if strings.HasSuffix(epfile.Name(), ".mp4") {
+				if ValidVideoSuffix(epfile.Name()) {
 					elem.files = append(elem.files, epfile.Name())
 				}
 			}

apiGo/videoparser/thumbnail/Thumbnailparser.go

@@ -0,0 +1,22 @@
+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
+
+}

apiGo/videoparser/thumbnail/Thumbnailparser_shared_ffmpeg.go

@@ -0,0 +1,185 @@
+// +build sharedffmpeg
+
+package thumbnail
+
+import (
+	"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, decodeExtension string, time uint64) (pic *[]byte, info *VidInfo, err error) {
+	var swsctx *gmf.SwsCtx
+
+	gmf.LogSetLevel(gmf.AV_LOG_ERROR)
+
+	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
+	}
+
+	codec, err := gmf.FindEncoder(decodeExtension)
+	if err != nil {
+		log.Printf("%s\n", err)
+		return nil, nil, err
+	}
+
+	cc := gmf.NewCodecCtx(codec)
+	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 codec.IsExperimental() {
+		cc.SetStrictCompliance(gmf.FF_COMPLIANCE_EXPERIMENTAL)
+	}
+
+	if err := cc.Open(nil); err != nil {
+		log.Println(err)
+		return nil, nil, err
+	}
+	defer cc.Free()
+
+	ist, err := inputCtx.GetStream(srcVideoStream.Index())
+	if err != nil {
+		log.Printf("Error getting stream - %s\n", err)
+		return nil, nil, err
+	}
+	defer ist.Free()
+
+	err = inputCtx.SeekFrameAt(int64(time), 0)
+	if err != nil {
+		log.Printf("Error while seeking file: %s\n", err.Error())
+		return
+	}
+
+	// convert source pix_fmt into AV_PIX_FMT_RGBA
+	// which is set up by codec context above
+	icc := srcVideoStream.CodecCtx()
+	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(ist.GetRFrameRate().AVR().Num) / float32(ist.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 = ist.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, _ := inputCtx.GetStream(i)
+		st.CodecCtx().Free()
+		st.Free()
+	}
+	return
+}

apiGo/videoparser/thumbnail/Thumbnailparser_syscall.go

@@ -0,0 +1,130 @@
+// +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
+}

deb/OpenMediaCenter/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: OpenMediaCenter
-Depends: nginx, mariadb-server, mediainfo
+Depends: nginx, mariadb-server, libffmpeg-ocaml
 Section: web
 Priority: optional
 Architecture: all

deb/OpenMediaCenter/etc/nginx/sites-available/OpenMediaCenter.conf

@@ -13,7 +13,8 @@ server {
         try_files $uri /index.html;
     }
 
-    location ~* ^/(api/|token) {
+    location ~* ^/(api) {
+        client_max_body_size 10G;
         proxy_pass http://127.0.0.1:8081;
     }
     location /subscribe {

package.json

@@ -19,16 +19,14 @@
     "react-dom": "^17.0.1",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
-    "typescript": "^4.3.5",
-    "gowebsecure": "0.1.1-beta.2",
-    "gowebsecure-react": "0.1.0-beta.3"
+    "typescript": "^4.3.5"
   },
   "scripts": {
     "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/"
+    "apidoc": "apidoc --single -i apiGo/ -o doc/"
   },
   "jest": {
     "collectCoverageFrom": [
@@ -40,7 +38,7 @@
       "text-summary"
     ]
   },
-  "proxy": "http://127.0.0.1:8080",
+  "proxy": "http://127.0.0.1:8081",
   "homepage": "/",
   "browserslist": {
     "production": [

src/App.test.js

@@ -2,6 +2,7 @@ import React from 'react';
 import App from './App';
 import {shallow} from 'enzyme';
 import GlobalInfos from "./utils/GlobalInfos";
+import {LoginContext} from './utils/context/LoginContext';
 
 describe('<App/>', function () {
     it('renders without crashing ', function () {
@@ -19,28 +20,6 @@ describe('<App/>', 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);
-    });
-
-    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 () {

src/App.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useContext} from 'react';
 import HomePage from './pages/HomePage/HomePage';
 import RandomPage from './pages/RandomPage/RandomPage';
 import GlobalInfos from './utils/GlobalInfos';
@@ -10,19 +10,17 @@ import style from './App.module.css';
 import SettingsPage from './pages/SettingsPage/SettingsPage';
 import CategoryPage from './pages/CategoryPage/CategoryPage';
 
-import {BrowserRouter as Router, NavLink, Route, Switch} from 'react-router-dom';
+import {NavLink, Route, Switch, useRouteMatch} from 'react-router-dom';
 import Player from './pages/Player/Player';
 import ActorOverviewPage from './pages/ActorOverviewPage/ActorOverviewPage';
 import ActorPage from './pages/ActorPage/ActorPage';
-import {APINode, SettingsTypes} from './types/ApiTypes';
 import AuthenticationPage from './pages/AuthenticationPage/AuthenticationPage';
 import TVShowPage from './pages/TVShowPage/TVShowPage';
 import TVPlayer from './pages/TVShowPage/TVPlayer';
-import {CookieTokenStore, token} from 'gowebsecure';
-import {callAPI} from 'gowebsecure';
+import {LoginContextProvider} from './utils/context/LoginContextProvider';
+import {FeatureContext} from './utils/context/FeatureContext';
 
 interface state {
-    password: boolean | null; // null if uninitialized - true if pwd needed false if not needed
     mediacentername: string;
 }
 
@@ -33,106 +31,37 @@ class App extends React.Component<{}, state> {
     constructor(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);
-                    }
-                },
-                true,
-                'openmediacenter',
-                '0'
-            );
-        }
-
         this.state = {
-            mediacentername: 'OpenMediaCenter',
-            password: pwdneeded
+            mediacentername: 'OpenMediaCenter'
         };
 
         // force an update on theme change
         GlobalInfos.onThemeChange(() => {
             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 {
         // add the main theme to the page body
         document.body.className = GlobalInfos.getThemeStyle().backgroundcolor;
 
-        if (this.state.password === true) {
-            // render authentication page if auth is neccessary
-            return (
-                <AuthenticationPage
-                    onSuccessLogin={(): void => {
-                        this.setState({password: false});
-                        // reinit general infos
-                        this.initialAPICall();
-                    }}
-                />
-            );
-        } else if (this.state.password === false) {
-            return (
-                <Router>
-                    <div className={style.app}>
+        return (
+            <LoginContextProvider>
+                <Switch>
+                    <Route path='/login'>
+                        <AuthenticationPage />
+                    </Route>
+                    <Route path='/media'>
                         {this.navBar()}
-                        {this.routing()}
-                    </div>
-                </Router>
-            );
-        } else {
-            return <>still loading...</>;
-        }
+                        <MyRouter />
+                    </Route>
+                </Switch>
+            </LoginContextProvider>
+        );
     }
 
+    static contextType = FeatureContext;
+
     /**
      * render the top navigation bar
      */
@@ -142,73 +71,85 @@ class App extends React.Component<{}, state> {
         return (
             <div className={[style.navcontainer, themeStyle.backgroundcolor, themeStyle.textcolor, themeStyle.hrcolor].join(' ')}>
                 <div className={style.navbrand}>{this.state.mediacentername}</div>
-                <NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/'} activeStyle={{opacity: '0.85'}}>
+                <NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/media'} activeStyle={{opacity: '0.85'}}>
                     Home
                 </NavLink>
-                <NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/random'} activeStyle={{opacity: '0.85'}}>
+                <NavLink
+                    className={[style.navitem, themeStyle.navitem].join(' ')}
+                    to={'/media/random'}
+                    activeStyle={{opacity: '0.85'}}>
                     Random Video
                 </NavLink>
 
-                <NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/categories'} activeStyle={{opacity: '0.85'}}>
+                <NavLink
+                    className={[style.navitem, themeStyle.navitem].join(' ')}
+                    to={'/media/categories'}
+                    activeStyle={{opacity: '0.85'}}>
                     Categories
                 </NavLink>
 
-                {GlobalInfos.isTVShowEnabled() ? (
-                    <NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/tvshows'} activeStyle={{opacity: '0.85'}}>
+                {this.context.TVShowEnabled ? (
+                    <NavLink
+                        className={[style.navitem, themeStyle.navitem].join(' ')}
+                        to={'/media/tvshows'}
+                        activeStyle={{opacity: '0.85'}}>
                         TV Shows
                     </NavLink>
                 ) : null}
 
-                <NavLink className={[style.navitem, themeStyle.navitem].join(' ')} to={'/settings'} activeStyle={{opacity: '0.85'}}>
+                <NavLink
+                    className={[style.navitem, themeStyle.navitem].join(' ')}
+                    to={'/media/settings'}
+                    activeStyle={{opacity: '0.85'}}>
                     Settings
                 </NavLink>
             </div>
         );
     }
-
-    /**
-     * render the react router elements
-     */
-    routing(): JSX.Element {
-        return (
-            <Switch>
-                <Route path='/random'>
-                    <RandomPage />
-                </Route>
-                <Route path='/categories'>
-                    <CategoryPage />
-                </Route>
-                <Route path='/settings'>
-                    <SettingsPage />
-                </Route>
-                <Route exact path='/player/:id'>
-                    <Player />
-                </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 path='/'>
-                    <HomePage />
-                </Route>
-            </Switch>
-        );
-    }
 }
 
+const MyRouter = (): JSX.Element => {
+    const match = useRouteMatch();
+    const features = useContext(FeatureContext);
+
+    return (
+        <Switch>
+            <Route exact path={`${match.url}/random`}>
+                <RandomPage />
+            </Route>
+            <Route path={`${match.url}/categories`}>
+                <CategoryPage />
+            </Route>
+            <Route path={`${match.url}/settings`}>
+                <SettingsPage />
+            </Route>
+            <Route exact path={`${match.url}/player/:id`}>
+                <Player />
+            </Route>
+            <Route exact path={`${match.url}/actors`}>
+                <ActorOverviewPage />
+            </Route>
+            <Route exact path={`${match.url}/actors/:id`}>
+                <ActorPage />
+            </Route>
+
+            {features.TVShowEnabled ? (
+                <Route path={`${match.url}/tvshows`}>
+                    <TVShowPage />
+                </Route>
+            ) : null}
+
+            {features.TVShowEnabled ? (
+                <Route exact path={`${match.url}/tvplayer/:id`}>
+                    <TVPlayer />
+                </Route>
+            ) : null}
+
+            <Route path={`${match.url}/`}>
+                <HomePage />
+            </Route>
+        </Switch>
+    );
+};
+
 export default App;

src/elements/ActorTile/ActorTile.tsx

@@ -21,7 +21,7 @@ class ActorTile extends React.Component<Props> {
         if (this.props.onClick) {
             return this.renderActorTile(this.props.onClick);
         } else {
-            return <Link to={{pathname: '/actors/' + this.props.actor.ActorId}}>{this.renderActorTile(() => {})}</Link>;
+            return <Link to={{pathname: '/media/actors/' + this.props.actor.ActorId}}>{this.renderActorTile(() => {})}</Link>;
         }
     }
 

src/elements/DropZone/DropZone.module.css

@@ -0,0 +1,30 @@
+.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;
+}

src/elements/DropZone/DropZone.tsx

@@ -0,0 +1,108 @@
+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>
+    );
+};

src/elements/KeyComponent.tsx

@@ -1,32 +0,0 @@
-import React from 'react';
-
-interface Props {
-    listenKey: string;
-    onKey: () => void;
-}
-
-export default class KeyComponent extends React.Component<Props> {
-    constructor(props: Props) {
-        super(props);
-
-        this.handler = this.handler.bind(this);
-    }
-
-    render(): JSX.Element {
-        return <>{this.props.children}</>;
-    }
-
-    componentDidMount(): void {
-        document.addEventListener('keyup', this.handler);
-    }
-
-    componentWillUnmount(): void {
-        document.removeEventListener('keyup', this.handler);
-    }
-
-    private handler(e: KeyboardEvent): void {
-        if (e.key === this.props.listenKey) {
-            this.props.onKey();
-        }
-    }
-}

src/elements/Popups/AddActorPopup/AddActorPopup.test.js

@@ -1,7 +1,7 @@
 import {shallow} from 'enzyme';
 import React from 'react';
 import AddActorPopup from './AddActorPopup';
-import {callAPI} from 'gowebsecure';
+import {callAPI} from '../../../utils/Api';
 
 describe('<AddActorPopup/>', function () {
     it('renders without crashing ', function () {

src/elements/Popups/AddActorPopup/AddActorPopup.tsx

@@ -3,11 +3,10 @@ import React from 'react';
 import ActorTile from '../../ActorTile/ActorTile';
 import style from './AddActorPopup.module.css';
 import {NewActorPopupContent} from '../NewActorPopup/NewActorPopup';
+import {APINode, callAPI} from '../../../utils/Api';
 import {ActorType} from '../../../types/VideoTypes';
 import {GeneralSuccess} from '../../../types/GeneralTypes';
 import FilterButton from '../../FilterButton/FilterButton';
-import {callAPI} from 'gowebsecure';
-import {APINode} from '../../../types/ApiTypes';
 
 interface Props {
     onHide: () => void;

src/elements/Popups/AddTagPopup/AddTagPopup.tsx

@@ -1,11 +1,10 @@
 import React from 'react';
 import Tag from '../../Tag/Tag';
 import PopupBase from '../PopupBase';
+import {APINode, callAPI} from '../../../utils/Api';
 import {TagType} from '../../../types/VideoTypes';
 import FilterButton from '../../FilterButton/FilterButton';
 import styles from './AddTagPopup.module.css';
-import {callAPI} from 'gowebsecure/lib/Api';
-import {APINode} from '../../../types/ApiTypes';
 
 interface Props {
     onHide: () => void;

src/elements/Popups/ButtonPopup/ButtonPopup.test.js

@@ -0,0 +1,51 @@
+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);
+    });
+});

src/elements/Popups/ButtonPopup/ButtonPopup.tsx

@@ -0,0 +1,58 @@
+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>
+        </>
+    );
+};

src/elements/Popups/NewActorPopup/NewActorPopup.test.js

@@ -3,7 +3,7 @@ import React from 'react';
 import {shallow} from 'enzyme';
 import '@testing-library/jest-dom';
 import NewActorPopup, {NewActorPopupContent} from './NewActorPopup';
-import {callAPI} from 'gowebsecure';
+import {callAPI} from '../../../utils/Api';
 
 describe('<NewActorPopup/>', function () {
     it('renders without crashing ', function () {
@@ -25,7 +25,7 @@ describe('<NewActorPopupContent/>', () => {
         const wrapper = shallow(<NewActorPopupContent onHide={() => {func();}}/>);
 
         // manually set typed in actorname
-        wrapper.instance().value = 'testactorname';
+        wrapper.instance().nameValue = 'testactorname';
 
         global.fetch = prepareFetchApi({});
 
@@ -55,6 +55,6 @@ describe('<NewActorPopupContent/>', () => {
 
         wrapper.find('input').simulate('change', {target: {value: 'testinput'}});
 
-        expect(wrapper.instance().value).toBe('testinput');
+        expect(wrapper.instance().nameValue).toBe('testinput');
     });
 });

src/elements/Popups/NewActorPopup/NewActorPopup.tsx

@@ -1,9 +1,8 @@
 import React from 'react';
 import PopupBase from '../PopupBase';
 import style from './NewActorPopup.module.css';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../../utils/Api';
 import {GeneralSuccess} from '../../../types/GeneralTypes';
-import {APINode} from '../../../types/ApiTypes';
 
 interface NewActorPopupProps {
     onHide: () => void;
@@ -23,7 +22,7 @@ class NewActorPopup extends React.Component<NewActorPopupProps> {
 }
 
 export class NewActorPopupContent extends React.Component<NewActorPopupProps> {
-    value: string | undefined;
+    nameValue: string | undefined;
 
     render(): JSX.Element {
         return (
@@ -33,7 +32,7 @@ export class NewActorPopupContent extends React.Component<NewActorPopupProps> {
                         type='text'
                         placeholder='Actor Name'
                         onChange={(v): void => {
-                            this.value = v.target.value;
+                            this.nameValue = v.target.value;
                         }}
                     />
                 </div>
@@ -49,11 +48,11 @@ export class NewActorPopupContent extends React.Component<NewActorPopupProps> {
      */
     storeselection(): void {
         // check if user typed in name
-        if (this.value === '' || this.value === undefined) {
+        if (this.nameValue === '' || this.nameValue === undefined) {
             return;
         }
 
-        callAPI(APINode.Actor, {action: 'createActor', actorname: this.value}, (result: GeneralSuccess) => {
+        callAPI(APINode.Actor, {action: 'createActor', ActorName: this.nameValue}, (result: GeneralSuccess) => {
             if (result.result !== 'success') {
                 console.log('error occured while writing to db -- todo error handling');
                 console.log(result.result);

src/elements/Popups/NewTagPopup/NewTagPopup.tsx

@@ -1,9 +1,8 @@
 import React from 'react';
 import PopupBase from '../PopupBase';
 import style from './NewTagPopup.module.css';
+import {APINode, callAPI} from '../../../utils/Api';
 import {GeneralSuccess} from '../../../types/GeneralTypes';
-import {callAPI} from 'gowebsecure';
-import {APINode} from '../../../types/ApiTypes';
 
 interface props {
     onHide: () => void;

src/elements/VideoContainer/VideoContainer.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import Preview from '../Preview/Preview';
-import {APINode, VideoTypes} from '../../types/ApiTypes';
+import {VideoTypes} from '../../types/ApiTypes';
 import DynamicContentContainer from '../DynamicContentContainer/DynamicContentContainer';
-import {callAPIPlain} from 'gowebsecure';
+import {APINode, callAPIPlain} from '../../utils/Api';
 
 interface Props {
     data: VideoTypes.VideoUnloadedType[];
@@ -26,7 +26,7 @@ const VideoContainer = (props: Props): JSX.Element => {
                         );
                     }}
                     name={el.MovieName}
-                    linkPath={'/player/' + el.MovieId}
+                    linkPath={'/media/player/' + el.MovieId}
                 />
             )}
             data={props.data}>

src/index.tsx

@@ -1,13 +1,19 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';
+import {BrowserRouter} from 'react-router-dom';
+import {FeatureContextProvider} from './utils/context/FeatureContext';
 
 // don't allow console logs within production env
 global.console.log = process.env.NODE_ENV !== 'development' ? (_: string | number | boolean): void => {} : global.console.log;
 
 ReactDOM.render(
     <React.StrictMode>
-        <App />
+        <BrowserRouter>
+            <FeatureContextProvider>
+                <App />
+            </FeatureContextProvider>
+        </BrowserRouter>
     </React.StrictMode>,
     document.getElementById('root')
 );

src/pages/ActorOverviewPage/ActorOverviewPage.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import {ActorType} from '../../types/VideoTypes';
 import ActorTile from '../../elements/ActorTile/ActorTile';
 import PageTitle from '../../elements/PageTitle/PageTitle';
@@ -8,7 +8,6 @@ import SideBar from '../../elements/SideBar/SideBar';
 import {Button} from '../../elements/GPElements/Button';
 import NewActorPopup from '../../elements/Popups/NewActorPopup/NewActorPopup';
 import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer';
-import {APINode} from '../../types/ApiTypes';
 
 interface Props {}
 

src/pages/ActorPage/ActorPage.tsx

@@ -5,12 +5,12 @@ import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import {faUser} from '@fortawesome/free-solid-svg-icons';
 import style from './ActorPage.module.css';
 import VideoContainer from '../../elements/VideoContainer/VideoContainer';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import {ActorType} from '../../types/VideoTypes';
 import {Link, withRouter} from 'react-router-dom';
 import {RouteComponentProps} from 'react-router';
 import {Button} from '../../elements/GPElements/Button';
-import {ActorTypes, APINode, VideoTypes} from '../../types/ApiTypes';
+import {ActorTypes, VideoTypes} from '../../types/ApiTypes';
 
 interface state {
     data: VideoTypes.VideoUnloadedType[];

src/pages/AuthenticationPage/AuthenticationPage.test.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import AuthenticationPage from './AuthenticationPage';
 import {shallow} from 'enzyme';
-import {token} from "../../utils/TokenHandler";
 
 describe('<AuthenticationPage/>', function () {
     it('renders without crashing ', function () {
@@ -12,10 +11,8 @@ describe('<AuthenticationPage/>', function () {
 
     it('test button click', function () {
         const func = jest.fn();
-        const wrapper = shallow(<AuthenticationPage onSuccessLogin={func}/>);
-        wrapper.instance().authenticate = jest.fn(() => {
-            wrapper.instance().props.onSuccessLogin()
-        });
+        const wrapper = shallow(<AuthenticationPage />);
+        wrapper.instance().authenticate = func;
         wrapper.setState({pwdText: 'testpwd'});
 
         wrapper.find('Button').simulate('click');
@@ -23,33 +20,16 @@ describe('<AuthenticationPage/>', function () {
         expect(func).toHaveBeenCalledTimes(1);
     });
 
-    it('test fail authenticate', function () {
+    it('test keyenter', function () {
         const events = mockKeyPress();
 
-        token.refreshAPIToken = jest.fn().mockImplementation((callback, force, pwd) => {
-            callback('there was an error')
-        });
-
         const wrapper = shallow(<AuthenticationPage/>);
 
-        events.keyup({key: 'Enter'});
-
-        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}/>);
+        const func = jest.fn();
+        wrapper.instance().authenticate = func;
 
         events.keyup({key: 'Enter'});
 
-        expect(wrapper.state().wrongPWDInfo).toBe(false);
         expect(func).toHaveBeenCalledTimes(1);
     });
 });

src/pages/AuthenticationPage/AuthenticationPage.tsx

@@ -2,18 +2,18 @@ import React from 'react';
 import {Button} from '../../elements/GPElements/Button';
 import style from './AuthenticationPage.module.css';
 import {addKeyHandler, removeKeyHandler} from '../../utils/ShortkeyHandler';
-import {token} from 'gowebsecure';
 import {faTimes} from '@fortawesome/free-solid-svg-icons';
 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 {
     pwdText: string;
     wrongPWDInfo: boolean;
 }
 
-interface Props {
-    onSuccessLogin: () => void;
-}
+interface Props {}
 
 class AuthenticationPage extends React.Component<Props, state> {
     constructor(props: Props) {
@@ -36,6 +36,8 @@ class AuthenticationPage extends React.Component<Props, state> {
         removeKeyHandler(this.keypress);
     }
 
+    static contextType = LoginContext;
+
     render(): JSX.Element {
         return (
             <>
@@ -76,22 +78,18 @@ class AuthenticationPage extends React.Component<Props, state> {
      * request a new token and check if pwd was valid
      */
     authenticate(): void {
-        token.refreshAPIToken(
-            (error) => {
-                if (error !== '') {
-                    this.setState({wrongPWDInfo: true});
+        callApiUnsafe(
+            APINode.Login,
+            {action: 'login', Password: this.state.pwdText},
+            (r: Token) => {
+                cookie.Store(r);
 
-                    // set timeout to make the info auto-disappearing
-                    setTimeout(() => {
-                        this.setState({wrongPWDInfo: false});
-                    }, 2000);
-                } else {
-                    this.props.onSuccessLogin();
-                }
+                this.context.setLoginState(LoginState.LoggedIn);
             },
-            true,
-            this.state.pwdText,
-            'openmediacenter'
+            () => {
+                this.setState({wrongPWDInfo: true});
+                setTimeout(() => this.setState({wrongPWDInfo: false}), 2000);
+            }
         );
     }
 

src/pages/CategoryPage/CategoryPage.test.js

@@ -1,10 +0,0 @@
-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();
-    });
-});

src/pages/CategoryPage/CategoryPage.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import {Route, Switch} from 'react-router-dom';
+import {Route, Switch, useRouteMatch} from 'react-router-dom';
 import {CategoryViewWR} from './CategoryView';
 import TagView from './TagView';
 
@@ -7,19 +7,19 @@ import TagView from './TagView';
  * Component for Category Page
  * Contains a Tag Overview and loads specific Tag videos in VideoContainer
  */
-class CategoryPage extends React.Component {
-    render(): JSX.Element {
-        return (
-            <Switch>
-                <Route path='/categories/:id'>
-                    <CategoryViewWR />
-                </Route>
-                <Route path='/categories'>
-                    <TagView />
-                </Route>
-            </Switch>
-        );
-    }
-}
+const CategoryPage = (): JSX.Element => {
+    const match = useRouteMatch();
+
+    return (
+        <Switch>
+            <Route exact path={`${match.url}/:id`}>
+                <CategoryViewWR />
+            </Route>
+            <Route exact path={`${match.url}/`}>
+                <TagView />
+            </Route>
+        </Switch>
+    );
+};
 
 export default CategoryPage;

src/pages/CategoryPage/CategoryView.tsx

@@ -1,9 +1,9 @@
 import {RouteComponentProps} from 'react-router';
 import React from 'react';
 import VideoContainer from '../../elements/VideoContainer/VideoContainer';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import {withRouter} from 'react-router-dom';
-import {APINode, VideoTypes} from '../../types/ApiTypes';
+import {VideoTypes} from '../../types/ApiTypes';
 import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
 import SideBar, {SideBarTitle} from '../../elements/SideBar/SideBar';
 import Tag from '../../elements/Tag/Tag';
@@ -119,9 +119,10 @@ export class CategoryView extends React.Component<CategoryViewProps, CategoryVie
                 this.videodata = result.Videos;
                 this.setState({loaded: true, TagName: result.TagName});
             },
-            (_) => {
+            (e) => {
+                console.log(e);
                 // if there is an load error redirect to home page
-                this.props.history.push('/');
+                // this.props.history.push('/');
             }
         );
     }

src/pages/CategoryPage/TagView.tsx

@@ -2,14 +2,13 @@ import {TagType} from '../../types/VideoTypes';
 import React from 'react';
 import {Link} from 'react-router-dom';
 import {TagPreview} from '../../elements/Preview/Preview';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
 import SideBar, {SideBarTitle} from '../../elements/SideBar/SideBar';
 import Tag from '../../elements/Tag/Tag';
 import {DefaultTags} from '../../types/GeneralTypes';
 import NewTagPopup from '../../elements/Popups/NewTagPopup/NewTagPopup';
 import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer';
-import {APINode} from '../../types/ApiTypes';
 
 interface TagViewState {
     loadedtags: TagType[];
@@ -57,7 +56,7 @@ class TagView extends React.Component<Props, TagViewState> {
                 <DynamicContentContainer
                     data={this.state.loadedtags}
                     renderElement={(m): JSX.Element => (
-                        <Link to={'/categories/' + m.TagId} key={m.TagId}>
+                        <Link to={'/media/categories/' + m.TagId} key={m.TagId}>
                             <TagPreview name={m.TagName} />
                         </Link>
                     )}

src/pages/HomePage/HomePage.tsx

@@ -5,17 +5,15 @@ import VideoContainer from '../../elements/VideoContainer/VideoContainer';
 
 import style from './HomePage.module.css';
 import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
+import {APINode, callAPI} from '../../utils/Api';
 import {Route, Switch, withRouter} from 'react-router-dom';
 import {RouteComponentProps} from 'react-router';
 import SearchHandling from './SearchHandling';
-import {APINode, VideoTypes} from '../../types/ApiTypes';
+import {VideoTypes} from '../../types/ApiTypes';
 import {DefaultTags} from '../../types/GeneralTypes';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import {faSortDown} from '@fortawesome/free-solid-svg-icons';
-import {TagType} from '../../types/VideoTypes';
-import {APILoader} from 'gowebsecure-react';
 
-// eslint-disable-next-line no-shadow
 export enum SortBy {
     date,
     likes,
@@ -27,10 +25,11 @@ export enum SortBy {
 interface Props extends RouteComponentProps {}
 
 interface state {
+    sideinfo: VideoTypes.startDataType;
     subtitle: string;
+    data: VideoTypes.VideoUnloadedType[];
+    selectionnr: number;
     sortby: string;
-    sortState: SortBy;
-    tagState: TagType;
 }
 
 /**
@@ -40,140 +39,185 @@ export class HomePage extends React.Component<Props, state> {
     /** keyword variable needed temporary store search keyword */
     keyword = '';
 
-    state = {
-        subtitle: 'All Videos',
-        sortby: 'Date Added',
-        sortState: SortBy.date,
-        tagState: DefaultTags.all
-    };
+    constructor(props: Props) {
+        super(props);
+
+        this.state = {
+            sideinfo: {
+                VideoNr: 0,
+                FullHdNr: 0,
+                HDNr: 0,
+                SDNr: 0,
+                DifferentTags: 0,
+                Tagged: 0
+            },
+            subtitle: 'All Videos',
+            data: [],
+            selectionnr: 0,
+            sortby: 'Date Added'
+        };
+    }
+
+    sortState = SortBy.date;
+    tagState = DefaultTags.all;
+
+    componentDidMount(): void {
+        // initial get of all videos
+        this.fetchVideoData();
+        this.fetchStartData();
+    }
 
     render(): JSX.Element {
         return (
             <Switch>
-                <Route path='/search/:name'>
+                <Route path='/media/search/:name'>
                     <SearchHandling />
                 </Route>
-                <Route path='/'>
-                    <APILoader
-                        render={(data: {Videos: VideoTypes.VideoUnloadedType[]; TagName: string}): JSX.Element => (
-                            <>
-                                <PageTitle title='Home Page' subtitle={this.state.subtitle + ' - ' + data.Videos.length}>
-                                    <form
-                                        className={'form-inline ' + style.searchform}
-                                        onSubmit={(e): void => {
-                                            e.preventDefault();
-                                            this.props.history.push('/search/' + this.keyword);
-                                        }}>
-                                        <input
-                                            data-testid='searchtextfield'
-                                            className='form-control mr-sm-2'
-                                            type='text'
-                                            placeholder='Search'
-                                            onChange={(e): void => {
-                                                this.keyword = e.target.value;
-                                            }}
-                                        />
-                                        <button data-testid='searchbtnsubmit' className='btn btn-success' type='submit'>
-                                            Search
-                                        </button>
-                                    </form>
-                                </PageTitle>
-                                <SideBar>
-                                    <APILoader
-                                        render={(sidebardata: VideoTypes.startDataType): JSX.Element => (
-                                            <>
-                                                <SideBarTitle>Infos:</SideBarTitle>
-                                                <Line />
-                                                <SideBarItem>
-                                                    <b>{sidebardata.VideoNr}</b> Videos Total!
-                                                </SideBarItem>
-                                                <SideBarItem>
-                                                    <b>{sidebardata.FullHdNr}</b> FULL-HD Videos!
-                                                </SideBarItem>
-                                                <SideBarItem>
-                                                    <b>{sidebardata.HDNr}</b> HD Videos!
-                                                </SideBarItem>
-                                                <SideBarItem>
-                                                    <b>{sidebardata.SDNr}</b> SD Videos!
-                                                </SideBarItem>
-                                                <SideBarItem>
-                                                    <b>{sidebardata.DifferentTags}</b> different Tags!
-                                                </SideBarItem>
-                                                <Line />
-                                                <SideBarTitle>Default Tags:</SideBarTitle>
-                                                <Tag
-                                                    tagInfo={{TagName: 'All', TagId: DefaultTags.all.TagId}}
-                                                    onclick={(): void => {
-                                                        this.setState({tagState: DefaultTags.all, subtitle: 'All Videos'});
-                                                    }}
-                                                />
-                                                <Tag
-                                                    tagInfo={{TagName: 'Full Hd', TagId: DefaultTags.fullhd.TagId}}
-                                                    onclick={(): void => {
-                                                        this.setState({tagState: DefaultTags.fullhd, subtitle: 'Full Hd Videos'});
-                                                    }}
-                                                />
-                                                <Tag
-                                                    tagInfo={{TagName: 'Low Quality', TagId: DefaultTags.lowq.TagId}}
-                                                    onclick={(): void => {
-                                                        this.setState({
-                                                            tagState: DefaultTags.lowq,
-                                                            subtitle: 'Low Quality Videos'
-                                                        });
-                                                    }}
-                                                />
-                                                <Tag
-                                                    tagInfo={{TagName: 'HD', TagId: DefaultTags.hd.TagId}}
-                                                    onclick={(): void => {
-                                                        this.setState({tagState: DefaultTags.hd, subtitle: 'HD Videos'});
-                                                    }}
-                                                />
-                                            </>
-                                        )}
-                                        node={APINode.Video}
-                                        action='getStartData'
-                                    />
-                                </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>
-                                            <span onClick={(): void => this.onDropDownItemClick(SortBy.length, 'Length')}>Length</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <VideoContainer data={data.Videos} />
-                                <div className={style.rightinfo} />
-                            </>
-                        )}
-                        node={APINode.Video}
-                        action='getMovies'
-                        params={{Tag: this.state.tagState.TagId, Sort: this.state.sortState}}
-                    />
-                </Route>
+                <Route path='/media/'>{this.homepageContent()}</Route>
             </Switch>
         );
     }
 
+    /**
+     * fetch available videos for specified tag
+     * this function clears all preview elements an reloads gravity with tag
+     *
+     * @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}) => {
+                this.setState({
+                    data: result.Videos,
+                    selectionnr: result.Videos.length
+                });
+            }
+        );
+    }
+
+    /**
+     * fetch the necessary data for left info box
+     */
+    fetchStartData(): void {
+        callAPI(APINode.Video, {action: 'getStartData'}, (result: VideoTypes.startDataType) => {
+            this.setState({sideinfo: result});
+        });
+    }
+
+    /**
+     * main content of homepage
+     */
+    homepageContent(): JSX.Element {
+        return (
+            <>
+                <PageTitle title='Home Page' subtitle={this.state.subtitle + ' - ' + this.state.selectionnr}>
+                    <form
+                        className={'form-inline ' + style.searchform}
+                        onSubmit={(e): void => {
+                            e.preventDefault();
+                            this.props.history.push('/media/search/' + this.keyword);
+                        }}>
+                        <input
+                            data-testid='searchtextfield'
+                            className='form-control mr-sm-2'
+                            type='text'
+                            placeholder='Search'
+                            onChange={(e): void => {
+                                this.keyword = e.target.value;
+                            }}
+                        />
+                        <button data-testid='searchbtnsubmit' className='btn btn-success' type='submit'>
+                            Search
+                        </button>
+                    </form>
+                </PageTitle>
+                <SideBar>
+                    <SideBarTitle>Infos:</SideBarTitle>
+                    <Line />
+                    <SideBarItem>
+                        <b>{this.state.sideinfo.VideoNr}</b> Videos Total!
+                    </SideBarItem>
+                    <SideBarItem>
+                        <b>{this.state.sideinfo.FullHdNr}</b> FULL-HD Videos!
+                    </SideBarItem>
+                    <SideBarItem>
+                        <b>{this.state.sideinfo.HDNr}</b> HD Videos!
+                    </SideBarItem>
+                    <SideBarItem>
+                        <b>{this.state.sideinfo.SDNr}</b> SD Videos!
+                    </SideBarItem>
+                    <SideBarItem>
+                        <b>{this.state.sideinfo.DifferentTags}</b> different Tags!
+                    </SideBarItem>
+                    <Line />
+                    <SideBarTitle>Default Tags:</SideBarTitle>
+                    <Tag
+                        tagInfo={{TagName: 'All', TagId: DefaultTags.all.TagId}}
+                        onclick={(): void => {
+                            this.tagState = DefaultTags.all;
+                            this.fetchVideoData();
+                            this.setState({subtitle: 'All Videos'});
+                        }}
+                    />
+                    <Tag
+                        tagInfo={{TagName: 'Full Hd', TagId: DefaultTags.fullhd.TagId}}
+                        onclick={(): void => {
+                            this.tagState = DefaultTags.fullhd;
+                            this.fetchVideoData();
+                            this.setState({subtitle: 'Full Hd Videos'});
+                        }}
+                    />
+                    <Tag
+                        tagInfo={{TagName: 'Low Quality', TagId: DefaultTags.lowq.TagId}}
+                        onclick={(): void => {
+                            this.tagState = DefaultTags.lowq;
+                            this.fetchVideoData();
+                            this.setState({subtitle: 'Low Quality Videos'});
+                        }}
+                    />
+                    <Tag
+                        tagInfo={{TagName: 'HD', TagId: DefaultTags.hd.TagId}}
+                        onclick={(): void => {
+                            this.tagState = DefaultTags.hd;
+                            this.fetchVideoData();
+                            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>
+                            <span onClick={(): void => this.onDropDownItemClick(SortBy.length, 'Length')}>Length</span>
+                        </div>
+                    </div>
+                </div>
+
+                <VideoContainer data={this.state.data} />
+                <div className={style.rightinfo} />
+            </>
+        );
+    }
+
     /**
      * 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.setState({sortby: name, sortState: type});
+        this.sortState = type;
+        this.setState({sortby: name});
+        this.fetchVideoData();
     }
 }
 

src/pages/HomePage/SearchHandling.tsx

@@ -1,11 +1,11 @@
 import {RouteComponentProps} from 'react-router';
 import React from 'react';
 import {withRouter} from 'react-router-dom';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import VideoContainer from '../../elements/VideoContainer/VideoContainer';
 import PageTitle from '../../elements/PageTitle/PageTitle';
 import SideBar from '../../elements/SideBar/SideBar';
-import {APINode, VideoTypes} from '../../types/ApiTypes';
+import {VideoTypes} from '../../types/ApiTypes';
 
 interface params {
     name: string;

src/pages/Player/Player.test.js

@@ -1,13 +1,15 @@
 import {shallow} from 'enzyme';
 import React from 'react';
 import {Player} from './Player';
-import {callAPI} from 'gowebsecure';
+import {callAPI} from '../../utils/Api';
+import GlobalInfos from "../../utils/GlobalInfos";
+import {LoginContext} from '../../utils/context/LoginContext';
 
 describe('<Player/>', function () {
 
     // help simulating id passed by url
     function instance() {
-        return shallow(<Player match={{params: {id: 10}}}/>);
+        return shallow(<Player match={{params: {id: 10}}}/>, {context: LoginContext});
     }
 
     it('renders without crashing ', function () {
@@ -84,23 +86,44 @@ describe('<Player/>', function () {
         expect(wrapper.find('AddTagPopup')).toHaveLength(1);
     });
 
-    it('test delete button', done => {
+    it('test fully delete popup rendering', function () {
         const wrapper = instance();
 
+        wrapper.setContext({VideosFullyDeleteable: true})
 
-        wrapper.setProps({history: {goBack: jest.fn()}});
+        wrapper.setState({deletepopupvisible: true});
 
-        global.fetch = prepareFetchApi({result: 'success'});
+        expect(wrapper.find('ButtonPopup')).toHaveLength(1)
+    });
 
+    it('test delete button', () => {
+        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('Button').at(2).simulate('click');
 
-        process.nextTick(() => {
-            // refetch is called so fetch called 3 times
-            expect(global.fetch).toHaveBeenCalledTimes(1);
-            expect(wrapper.instance().props.history.goBack).toHaveBeenCalledTimes(1);
+        // click the first submit button
+        wrapper.find('ButtonPopup').dive().find('Button').at(0).simulate('click')
 
-            global.fetch.mockClear();
-            done();
+        // refetch is called so fetch called 3 times
+        expect(callAPI).toHaveBeenCalledTimes(1);
+        expect(callback).toHaveBeenCalledTimes(1);
+
+        // now lets test if this works also with the fullydeletepopup
+        wrapper.setContext({VideosFullyDeleteable: true})
+        // 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);
         });
     });
 
@@ -109,7 +132,20 @@ describe('<Player/>', function () {
 
         const func = jest.fn();
 
-        wrapper.setProps({history: {goBack: func}});
+        wrapper.setProps({history: {push: 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);
         wrapper.find('.closebutton').simulate('click');
@@ -139,16 +175,14 @@ describe('<Player/>', function () {
     it('test click of quickadd tag btn', done => {
         const wrapper = generatetag();
 
-        global.fetch = prepareFetchApi({result: 'success'});
+        callAPIMock({result: 'success'})
 
         // render tag subcomponent
         const tag = wrapper.find('Tag').first().dive();
         tag.simulate('click');
 
         process.nextTick(() => {
-            expect(global.fetch).toHaveBeenCalledTimes(1);
-
-            global.fetch.mockClear();
+            expect(callAPI).toHaveBeenCalledTimes(1);
             done();
         });
     });
@@ -156,7 +190,7 @@ describe('<Player/>', function () {
     it('test failing quickadd', done => {
         const wrapper = generatetag();
 
-        global.fetch = prepareFetchApi({result: 'nonsuccess'});
+        callAPIMock({result: 'nonsuccess'});
         global.console.error = jest.fn();
 
         // render tag subcomponent
@@ -165,8 +199,6 @@ describe('<Player/>', function () {
 
         process.nextTick(() => {
             expect(global.console.error).toHaveBeenCalledTimes(2);
-
-            global.fetch.mockClear();
             done();
         });
     });

src/pages/Player/Player.tsx

@@ -13,14 +13,16 @@ import {faPlusCircle} from '@fortawesome/free-solid-svg-icons';
 import AddActorPopup from '../../elements/Popups/AddActorPopup/AddActorPopup';
 import ActorTile from '../../elements/ActorTile/ActorTile';
 import {withRouter} from 'react-router-dom';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import {RouteComponentProps} from 'react-router';
 import {DefaultPlyrOptions, GeneralSuccess} from '../../types/GeneralTypes';
 import {ActorType, TagType} from '../../types/VideoTypes';
 import PlyrJS from 'plyr';
 import {Button} from '../../elements/GPElements/Button';
-import {APINode, VideoTypes} from '../../types/ApiTypes';
+import {VideoTypes} from '../../types/ApiTypes';
 import GlobalInfos from '../../utils/GlobalInfos';
+import {ButtonPopup} from '../../elements/Popups/ButtonPopup/ButtonPopup';
+import {FeatureContext} from '../../utils/context/FeatureContext';
 
 interface Props extends RouteComponentProps<{id: string}> {}
 
@@ -35,6 +37,7 @@ interface mystate {
     suggesttag: TagType[];
     popupvisible: boolean;
     actorpopupvisible: boolean;
+    deletepopupvisible: boolean;
     actors: ActorType[];
 }
 
@@ -56,12 +59,15 @@ export class Player extends React.Component<Props, mystate> {
             suggesttag: [],
             popupvisible: false,
             actorpopupvisible: false,
+            deletepopupvisible: false,
             actors: []
         };
 
         this.quickAddTag = this.quickAddTag.bind(this);
     }
 
+    static contextType = FeatureContext;
+
     componentDidMount(): void {
         // initial fetch of current movie data
         this.fetchMovieData();
@@ -91,7 +97,7 @@ export class Player extends React.Component<Props, mystate> {
                         <Button
                             title='Delete Video'
                             onClick={(): void => {
-                                this.deleteVideo();
+                                this.setState({deletepopupvisible: true});
                             }}
                             color={{backgroundColor: 'red'}}
                         />
@@ -196,10 +202,46 @@ export class Player extends React.Component<Props, mystate> {
                         movieId={this.state.movieId}
                     />
                 ) : 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
      * @param tagId id of tag to add
@@ -314,23 +356,27 @@ export class Player extends React.Component<Props, mystate> {
      * calls callback to viewbinding to show previous page agains
      */
     closebtn(): void {
-        this.props.history.goBack();
+        const hist = this.props.history;
+        if (hist.length > 1) {
+            hist.goBack();
+        } else {
+            hist.push('/');
+        }
     }
 
     /**
      * delete the current video and return to last page
      */
-    deleteVideo(): void {
+    deleteVideo(fullyDelete: boolean): void {
         callAPI(
             APINode.Video,
-            {action: 'deleteVideo', MovieId: parseInt(this.props.match.params.id, 10)},
+            {action: 'deleteVideo', MovieId: parseInt(this.props.match.params.id, 10), FullyDelete: fullyDelete},
             (result: GeneralSuccess) => {
                 if (result.result === 'success') {
                     // return to last element if successful
                     this.props.history.goBack();
                 } else {
-                    console.error('an error occured while liking');
-                    console.error(result);
+                    console.error('an error occured while deleting the video: ' + JSON.stringify(result));
                 }
             }
         );

src/pages/RandomPage/RandomPage.test.js

@@ -1,7 +1,7 @@
 import {shallow} from 'enzyme';
 import React from 'react';
 import RandomPage from './RandomPage';
-import {callAPI} from 'gowebsecure';
+import {callAPI} from '../../utils/Api';
 
 describe('<RandomPage/>', function () {
     it('renders without crashing ', function () {

src/pages/RandomPage/RandomPage.tsx

@@ -4,10 +4,15 @@ import SideBar, {SideBarTitle} from '../../elements/SideBar/SideBar';
 import Tag from '../../elements/Tag/Tag';
 import PageTitle from '../../elements/PageTitle/PageTitle';
 import VideoContainer from '../../elements/VideoContainer/VideoContainer';
+import {APINode, callAPI} from '../../utils/Api';
 import {TagType} from '../../types/VideoTypes';
-import {APINode, VideoTypes} from '../../types/ApiTypes';
-import KeyComponent from '../../elements/KeyComponent';
-import {APILoader} from 'gowebsecure-react';
+import {VideoTypes} from '../../types/ApiTypes';
+import {addKeyHandler, removeKeyHandler} from '../../utils/ShortkeyHandler';
+
+interface state {
+    videos: VideoTypes.VideoUnloadedType[];
+    tags: TagType[];
+}
 
 interface GetRandomMoviesType {
     Videos: VideoTypes.VideoUnloadedType[];
@@ -17,43 +22,88 @@ interface GetRandomMoviesType {
 /**
  * Randompage shuffles random viedeopreviews and provides a shuffle btn
  */
-class RandomPage extends React.Component {
+class RandomPage extends React.Component<{}, state> {
     readonly LoadNR = 3;
 
+    constructor(props: {}) {
+        super(props);
+
+        this.state = {
+            videos: [],
+            tags: []
+        };
+
+        this.keypress = this.keypress.bind(this);
+    }
+
+    componentDidMount(): void {
+        addKeyHandler(this.keypress);
+
+        this.loadShuffledvideos(this.LoadNR);
+    }
+
+    componentWillUnmount(): void {
+        removeKeyHandler(this.keypress);
+    }
+
     render(): JSX.Element {
         return (
             <div>
-                <PageTitle title='Random Videos' subtitle={this.LoadNR + 'pcs'} />
-                <APILoader
-                    render={(data: GetRandomMoviesType, actions): JSX.Element => (
-                        <KeyComponent listenKey='s' onKey={actions.refresh}>
-                            <SideBar>
-                                <SideBarTitle>Visible Tags:</SideBarTitle>
-                                {data.Tags.map((m) => (
-                                    <Tag key={m.TagId} tagInfo={m} />
-                                ))}
-                            </SideBar>
+                <PageTitle title='Random Videos' subtitle='4pc' />
 
-                            {data.Videos.length !== 0 ? (
-                                <VideoContainer data={data.Videos}>
-                                    <div className={style.Shufflebutton}>
-                                        <button onClick={actions.refresh} className={style.btnshuffle}>
-                                            Shuffle
-                                        </button>
-                                    </div>
-                                </VideoContainer>
-                            ) : (
-                                <div>No Data found!</div>
-                            )}
-                        </KeyComponent>
-                    )}
-                    node={APINode.Video}
-                    action='getRandomMovies'
-                    params={{Number: this.LoadNR}}
-                />
+                <SideBar>
+                    <SideBarTitle>Visible Tags:</SideBarTitle>
+                    {this.state.tags.map((m) => (
+                        <Tag key={m.TagId} tagInfo={m} />
+                    ))}
+                </SideBar>
+
+                {this.state.videos.length !== 0 ? (
+                    <VideoContainer data={this.state.videos}>
+                        <div className={style.Shufflebutton}>
+                            <button onClick={(): void => this.shuffleclick()} className={style.btnshuffle}>
+                                Shuffle
+                            </button>
+                        </div>
+                    </VideoContainer>
+                ) : (
+                    <div>No Data found!</div>
+                )}
             </div>
         );
     }
+
+    /**
+     * click handler for shuffle btn
+     */
+    shuffleclick(): void {
+        this.loadShuffledvideos(this.LoadNR);
+    }
+
+    /**
+     * load random videos from backend
+     * @param nr number of videos to load
+     */
+    loadShuffledvideos(nr: number): void {
+        callAPI<GetRandomMoviesType>(APINode.Video, {action: 'getRandomMovies', Number: nr}, (result) => {
+            this.setState({videos: []}); // needed to trigger rerender of main videoview
+            this.setState({
+                videos: result.Videos,
+                tags: result.Tags
+            });
+        });
+    }
+
+    /**
+     * key event handling
+     * @param event keyevent
+     */
+    private keypress(event: KeyboardEvent): void {
+        // bind s to shuffle
+        if (event.key === 's') {
+            this.loadShuffledvideos(4);
+        }
+    }
 }
 
 export default RandomPage;

src/pages/SettingsPage/GeneralSettings.tsx

@@ -6,8 +6,8 @@ import InfoHeaderItem from '../../elements/InfoHeaderItem/InfoHeaderItem';
 import {faArchive, faBalanceScaleLeft, faRulerVertical} from '@fortawesome/free-solid-svg-icons';
 import {faAddressCard} from '@fortawesome/free-regular-svg-icons';
 import {version} from '../../../package.json';
-import {callAPI} from 'gowebsecure';
-import {APINode, SettingsTypes} from '../../types/ApiTypes';
+import {APINode, callAPI} from '../../utils/Api';
+import {SettingsTypes} from '../../types/ApiTypes';
 import {GeneralSuccess} from '../../types/GeneralTypes';
 
 interface state {

src/pages/SettingsPage/MovieSettings.module.css

@@ -11,3 +11,9 @@
     padding: 10px;
     width: 40%;
 }
+
+.uploadtext {
+    font-size: x-large;
+    margin-top: 30px;
+    margin-bottom: 10px;
+}

src/pages/SettingsPage/MovieSettings.test.js

@@ -1,7 +1,7 @@
 import {shallow} from 'enzyme';
 import React from 'react';
 import MovieSettings from './MovieSettings';
-import {callAPI} from 'gowebsecure';
+import {callAPI} from '../../utils/Api';
 
 describe('<MovieSettings/>', function () {
     it('renders without crashing ', function () {

src/pages/SettingsPage/MovieSettings.tsx

@@ -1,8 +1,9 @@
 import React from 'react';
 import style from './MovieSettings.module.css';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import {GeneralSuccess} from '../../types/GeneralTypes';
-import {APINode} from '../../types/ApiTypes';
+import {DropZone} from '../../elements/DropZone/DropZone';
+import GlobalInfos from '../../utils/GlobalInfos';
 
 interface state {
     text: string[];
@@ -100,6 +101,8 @@ class MovieSettings extends React.Component<Props, state> {
     }
 
     render(): JSX.Element {
+        const theme = GlobalInfos.getThemeStyle();
+
         return (
             <>
                 <button
@@ -118,12 +121,16 @@ class MovieSettings extends React.Component<Props, state> {
                     TVShow Reindex
                 </button>
                 <div className={style.indextextarea}>
-                    {this.state.text.map((m) => (
-                        <div key={m} className='textarea-element'>
+                    {this.state.text.map((m, i) => (
+                        <div key={i} className='textarea-element'>
                             {m}
                         </div>
                     ))}
                 </div>
+                <div className={theme.textcolor}>
+                    <div className={style.uploadtext}>Video Upload:</div>
+                    <DropZone />
+                </div>
             </>
         );
     }

src/pages/SettingsPage/SettingsPage.test.js

@@ -1,10 +0,0 @@
-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();
-    });
-});

src/pages/SettingsPage/SettingsPage.tsx

@@ -1,54 +1,56 @@
-import React from 'react';
+import React, {useContext} from 'react';
 import MovieSettings from './MovieSettings';
 import GeneralSettings from './GeneralSettings';
 import style from './SettingsPage.module.css';
 import GlobalInfos from '../../utils/GlobalInfos';
-import {NavLink, Redirect, Route, Switch} from 'react-router-dom';
+import {NavLink, Redirect, Route, Switch, useRouteMatch} from 'react-router-dom';
+import {FeatureContext} from '../../utils/context/FeatureContext';
 
 /**
  * The Settingspage handles all kinds of settings for the mediacenter
  * and is basically a wrapper for child-tabs
  */
-class SettingsPage extends React.Component {
-    render(): JSX.Element {
-        const themestyle = GlobalInfos.getThemeStyle();
-        return (
-            <div>
-                <div className={style.SettingsSidebar + ' ' + themestyle.secbackground}>
-                    <div className={style.SettingsSidebarTitle + ' ' + themestyle.lighttextcolor}>Settings</div>
-                    <NavLink to='/settings/general'>
-                        <div className={style.SettingSidebarElement}>General</div>
+const SettingsPage = (): JSX.Element => {
+    const themestyle = GlobalInfos.getThemeStyle();
+    const match = useRouteMatch();
+    const features = useContext(FeatureContext);
+
+    return (
+        <div>
+            <div className={style.SettingsSidebar + ' ' + themestyle.secbackground}>
+                <div className={style.SettingsSidebarTitle + ' ' + themestyle.lighttextcolor}>Settings</div>
+                <NavLink to='/media/settings/general'>
+                    <div className={style.SettingSidebarElement}>General</div>
+                </NavLink>
+                <NavLink to='/media/settings/movies'>
+                    <div className={style.SettingSidebarElement}>Movies</div>
+                </NavLink>
+                {features.TVShowEnabled ? (
+                    <NavLink to='/media/settings/tv'>
+                        <div className={style.SettingSidebarElement}>TV Shows</div>
                     </NavLink>
-                    <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>
-                        <Route path='/settings/general'>
-                            <GeneralSettings />
-                        </Route>
-                        <Route path='/settings/movies'>
-                            <MovieSettings />
-                        </Route>
-                        {GlobalInfos.isTVShowEnabled() ? (
-                            <Route path='/settings/tv'>
-                                <span />
-                            </Route>
-                        ) : null}
-                        <Route path='/settings'>
-                            <Redirect to='/settings/general' />
-                        </Route>
-                    </Switch>
-                </div>
+                ) : null}
             </div>
-        );
-    }
-}
+            <div className={style.SettingsContent}>
+                <Switch>
+                    <Route path={`${match.url}/general`}>
+                        <GeneralSettings />
+                    </Route>
+                    <Route path={`${match.url}/movies`}>
+                        <MovieSettings />
+                    </Route>
+                    {features.TVShowEnabled ? (
+                        <Route path={`${match.url}/tv`}>
+                            <span />
+                        </Route>
+                    ) : null}
+                    <Route path={`${match.url}/`}>
+                        <Redirect to='/media/settings/general' />
+                    </Route>
+                </Switch>
+            </div>
+        </div>
+    );
+};
 
 export default SettingsPage;

src/pages/TVShowPage/EpisodePage.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {RouteComponentProps} from 'react-router';
 import {withRouter} from 'react-router-dom';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import {Link} from 'react-router-dom';
 import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer';
 import tileStyle from './EpisodeTile.module.css';
@@ -10,7 +10,6 @@ import {faPlay} from '@fortawesome/free-solid-svg-icons';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
 import SideBar, {SideBarItem, SideBarTitle} from '../../elements/SideBar/SideBar';
-import {APINode} from '../../types/ApiTypes';
 
 interface Props extends RouteComponentProps<{id: string}> {}
 

src/pages/TVShowPage/TVPlayer.tsx

@@ -6,10 +6,9 @@ import style from '../Player/Player.module.css';
 import {Plyr} from 'plyr-react';
 import plyrstyle from 'plyr-react/dist/plyr.css';
 import {DefaultPlyrOptions} from '../../types/GeneralTypes';
-import {callAPI} from 'gowebsecure';
+import {APINode, callAPI} from '../../utils/Api';
 import GlobalInfos from '../../utils/GlobalInfos';
 import PlyrJS from 'plyr';
-import {APINode} from '../../types/ApiTypes';
 
 interface Props extends RouteComponentProps<{id: string}> {}
 

src/pages/TVShowPage/TVShowPage.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import Preview from '../../elements/Preview/Preview';
-import {callAPI, callAPIPlain} from 'gowebsecure';
-import {APINode, TVShow} from '../../types/ApiTypes';
+import {APINode, callAPI, callAPIPlain} from '../../utils/Api';
+import {TVShow} from '../../types/ApiTypes';
 import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer';
 import {Route, Switch, useRouteMatch} from 'react-router-dom';
 import EpisodePage from './EpisodePage';
@@ -72,7 +72,7 @@ export default function (): JSX.Element {
 
     return (
         <Switch>
-            <Route path={`${match.path}/:id`}>
+            <Route exact path={`${match.path}/:id`}>
                 <EpisodePage />
             </Route>
             <Route path={match.path}>

src/setupTests.js

@@ -6,8 +6,6 @@ import '@testing-library/jest-dom/extend-expect';
 
 import {configure} from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
-import {CookieTokenStore} from "gowebsecure";
-import {token} from "gowebsecure";
 
 configure({adapter: new Adapter()});
 
@@ -36,7 +34,7 @@ global.prepareFailingFetchApi = () => {
 };
 
 global.callAPIMock = (resonse) => {
-    const helpers = require('gowebsecure');
+    const helpers = require('./utils/Api');
     helpers.callAPI = jest.fn().mockImplementation((_, __, func1) => {func1(resonse);});
     helpers.callApiUnsafe = jest.fn().mockImplementation((_, __, func1) => {func1(resonse);});
 };
@@ -45,7 +43,6 @@ global.callAPIMock = (resonse) => {
 global.beforeEach(() => {
     // empty fetch response implementation for each test
     global.fetch = prepareFetchApi({});
-    token.init(new CookieTokenStore());
     // todo with callAPIMock
 });
 

src/types/ApiTypes.ts

@@ -1,14 +1,5 @@
 import {ActorType, TagType} from './VideoTypes';
 
-// eslint-disable-next-line no-shadow
-export enum APINode {
-    Settings = 'settings',
-    Tags = 'tags',
-    Actor = 'actor',
-    Video = 'video',
-    TVShow = 'tvshow'
-}
-
 export namespace VideoTypes {
     export interface loadVideoType {
         MovieUrl: string;
@@ -46,6 +37,7 @@ export namespace SettingsTypes {
         VideoPath: string;
         TVShowPath: string;
         TVShowEnabled: boolean;
+        FullDeleteEnabled: boolean;
     }
 
     export interface SettingsType {

src/utils/Api.ts

@@ -0,0 +1,107 @@
+import {cookie} from './context/Cookie';
+
+const APIPREFIX: string = '/api/';
+
+/**
+ * interface how an api request should look like
+ */
+interface ApiBaseRequest {
+    action: string | number;
+
+    [_: string]: string | number | boolean | object;
+}
+
+/**
+ * A backend api call
+ * @param apinode which api backend handler to call
+ * @param fd the object to send to backend
+ * @param callback the callback with json reply from backend
+ * @param errorcallback a optional callback if an error occured
+ */
+export function callAPI<T>(
+    apinode: APINode,
+    fd: ApiBaseRequest,
+    callback: (_: T) => void,
+    errorcallback: (_: string) => void = (_: string): void => {}
+): void {
+    generalAPICall<T>(apinode, fd, callback, errorcallback, false, true);
+}
+
+/**
+ * make a public unsafe api call (without token) -- use as rare as possible only for initialization (eg. check if pwd is neccessary)
+ * @param apinode
+ * @param fd
+ * @param callback
+ * @param errorcallback
+ */
+export function callApiUnsafe<T>(
+    apinode: APINode,
+    fd: ApiBaseRequest,
+    callback: (_: T) => void,
+    errorcallback?: (_: string) => void
+): void {
+    generalAPICall(apinode, fd, callback, errorcallback, true, true);
+}
+
+/**
+ * A backend api call
+ * @param apinode which api backend handler to call
+ * @param fd the object to send to backend
+ * @param callback the callback with PLAIN text reply from backend
+ */
+export function callAPIPlain(apinode: APINode, fd: ApiBaseRequest, callback: (_: string) => void): void {
+    generalAPICall(apinode, fd, callback, () => {}, false, false);
+}
+
+function generalAPICall<T>(
+    apinode: APINode,
+    fd: ApiBaseRequest,
+    callback: (_: T) => void,
+    errorcallback: (_: string) => void = (_: string): void => {},
+    unsafe: boolean,
+    json: boolean
+): void {
+    (async function (): Promise<void> {
+        const tkn = cookie.Load();
+        const response = await fetch(APIPREFIX + apinode + '/' + fd.action, {
+            method: 'POST',
+            body: JSON.stringify(fd),
+            headers: new Headers({
+                'Content-Type': json ? 'application/json' : 'text/plain',
+                ...(!unsafe && tkn !== null && {Token: tkn.Token})
+            })
+        });
+
+        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('bad request todo sth here');
+        } else {
+            console.log('Error: ' + response.statusText);
+            if (errorcallback) {
+                errorcallback(response.statusText);
+            }
+        }
+    })();
+}
+
+/**
+ * API nodes definitions
+ */
+
+export enum APINode {
+    Login = 'login',
+    Settings = 'settings',
+    Tags = 'tags',
+    Actor = 'actor',
+    Video = 'video',
+    TVShow = 'tvshow'
+}

src/utils/GlobalInfos.ts

@@ -10,6 +10,7 @@ class StaticInfos {
     private videopath: string = '';
     private tvshowpath: string = '';
     private TVShowsEnabled: boolean = false;
+    private fullDeleteable: boolean = false;
 
     /**
      * check if the current theme is the dark theme
@@ -24,12 +25,14 @@ class StaticInfos {
      * @param enable enable the dark theme?
      */
     enableDarkTheme(enable = true): void {
-        this.darktheme = enable;
+        if (this.darktheme !== enable) {
+            this.darktheme = enable;
 
-        // trigger onThemeChange handlers
-        this.handlers.map((func) => {
-            func();
-        });
+            // trigger onThemeChange handlers
+            this.handlers.map((func) => {
+                func();
+            });
+        }
     }
 
     /**
@@ -48,6 +51,7 @@ class StaticInfos {
     /**
      * set the current videopath
      * @param vidpath videopath with beginning and ending slash
+     * @param tvshowpath
      */
     setVideoPaths(vidpath: string, tvshowpath: string): void {
         this.videopath = vidpath;
@@ -67,19 +71,6 @@ class StaticInfos {
     getTVShowPath(): string {
         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();

src/utils/context/Cookie.ts

@@ -0,0 +1,55 @@
+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 '';
+    }
+}

src/utils/context/FeatureContext.tsx

@@ -0,0 +1,32 @@
+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>;
+};

src/utils/context/LoginContext.ts

@@ -0,0 +1,34 @@
+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
+});

src/utils/context/LoginContextProvider.tsx

@@ -0,0 +1,104 @@
+import {LoginContext, LoginPerm, LoginState} from './LoginContext';
+import React, {FunctionComponent, useContext, useEffect, useState} from 'react';
+import {useHistory, useLocation} from 'react-router';
+import {cookie} from './Cookie';
+import {APINode, callAPI} from '../Api';
+import {SettingsTypes} from '../../types/ApiTypes';
+import GlobalInfos from '../GlobalInfos';
+import {FeatureContext} from './FeatureContext';
+
+export const LoginContextProvider: FunctionComponent = (props): JSX.Element => {
+    let initialLoginState = LoginState.LoggedIn;
+    let initialUserPerm = LoginPerm.User;
+
+    const features = useContext(FeatureContext);
+
+    const t = cookie.Load();
+    // we are already logged in so we can set the token and redirect to dashboard
+    if (t !== null) {
+        initialLoginState = LoginState.LoggedIn;
+    }
+
+    const [loginState, setLoginState] = useState<LoginState>(initialLoginState);
+    const [permission, setPermission] = useState<LoginPerm>(initialUserPerm);
+
+    useEffect(() => {
+        // 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);
+
+                features.setTVShowEnabled(result.TVShowEnabled);
+                features.setVideosFullyDeleteable(result.FullDeleteEnabled);
+
+                // this.setState({
+                //     mediacentername: result.MediacenterName
+                // });
+                // set tab title to received mediacenter name
+                document.title = result.MediacenterName;
+
+                setLoginState(LoginState.LoggedIn);
+            },
+            (_) => {
+                setLoginState(LoginState.LoggedOut);
+            }
+        );
+    }, [features, loginState]);
+
+    const hist = useHistory();
+    const loc = useLocation();
+
+    // trigger redirect on loginstate change
+    useEffect(() => {
+        if (loginState === LoginState.LoggedIn) {
+            // if we arent already in dashboard tree we want to redirect to default dashboard page
+            console.log('redirecting to dashboard' + loc.pathname);
+            if (!loc.pathname.startsWith('/media')) {
+                hist.replace('/media');
+            }
+        } else {
+            if (!loc.pathname.startsWith('/login')) {
+                hist.replace('/login');
+            }
+        }
+    }, [hist, loc.pathname, loginState]);
+
+    const value = {
+        logout: (): void => {
+            setLoginState(LoginState.LoggedOut);
+            cookie.Delete();
+        },
+        setPerm: (perm: LoginPerm): void => {
+            setPermission(perm);
+        },
+        setLoginState: (state: LoginState): void => {
+            setLoginState(state);
+        },
+        loginstate: loginState,
+        permission: permission
+    };
+
+    return <LoginContext.Provider value={value}>{props.children}</LoginContext.Provider>;
+};
+
+interface Props {
+    perm: LoginPerm;
+}
+
+/**
+ * Wrapper element to render children only if permissions are sufficient
+ */
+export const AuthorizedContext: FunctionComponent<Props> = (props): JSX.Element => {
+    const loginctx = useContext(LoginContext);
+
+    if (loginctx.permission <= props.perm) {
+        return props.children as JSX.Element;
+    } else {
+        return <></>;
+    }
+};

yarn.lock

@@ -6049,18 +6049,6 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-gowebsecure-react@0.1.0-beta.3:
-  version "0.1.0-beta.3"
-  resolved "https://registry.yarnpkg.com/gowebsecure-react/-/gowebsecure-react-0.1.0-beta.3.tgz#f614761c6d31550718d5455b219065f7dafd7664"
-  integrity sha512-8Vefh/VGuJIjcD0LbMcbmAv33DhyVALxgz2j8N5Q2Hjpvm6R20CIt2xRtJeHFDqbXcmfn2Z6rda0yQJ/6OFi6g==
-
-gowebsecure@0.1.1-beta.2:
-  version "0.1.1-beta.2"
-  resolved "https://registry.yarnpkg.com/gowebsecure/-/gowebsecure-0.1.1-beta.2.tgz#3b9aaa1f83af9a7c2423da8e0ee605dc018d463b"
-  integrity sha512-8QpoBYfmUGAcKrPkyTl6e+WNzJ/NPRk1NxY3+J0K/z7z4w/dG/3Njie+J3IS0L+u8Dpp9pYXZHONbv/W11DUqA==
-  dependencies:
-    typescript "^4.1.2"
-
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
   version "4.2.6"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
@@ -11980,7 +11968,7 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@^4.1.2, typescript@^4.3.5:
+typescript@^4.3.5:
   version "4.3.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
   integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==