use new lib
This commit is contained in:
		
							
								
								
									
										48
									
								
								apiGo/api/API.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										48
									
								
								apiGo/api/API.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,48 @@
 | 
			
		||||
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)
 | 
			
		||||
	gws.AddAPINode("tags", TagNode)
 | 
			
		||||
	gws.AddAPINode("settings", SettingsNode)
 | 
			
		||||
	gws.AddAPINode("actor", ActorNode)
 | 
			
		||||
	gws.AddAPINode("tvshow", TVShowNode)
 | 
			
		||||
 | 
			
		||||
	// 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)
 | 
			
		||||
}
 | 
			
		||||
@@ -2,6 +2,7 @@ package api
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"fmt"
 | 
			
		||||
	gws "github.com/gowebsecure/goWebSecure-go"
 | 
			
		||||
	"openmediacenter/apiGo/api/types"
 | 
			
		||||
	"openmediacenter/apiGo/database"
 | 
			
		||||
)
 | 
			
		||||
@@ -23,7 +24,7 @@ func getActorsFromDB() {
 | 
			
		||||
	 * @apiSuccess {string} .Name Actor Name
 | 
			
		||||
	 * @apiSuccess {string} .Thumbnail Portrait Thumbnail
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("getAllActors", ActorNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("getAllActors", ActorNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		query := "SELECT actor_id, name, thumbnail FROM actors"
 | 
			
		||||
		return jsonify(readActorsFromResultset(database.Query(query)))
 | 
			
		||||
	})
 | 
			
		||||
@@ -41,7 +42,7 @@ func getActorsFromDB() {
 | 
			
		||||
	 * @apiSuccess {string} .Name Actor Name
 | 
			
		||||
	 * @apiSuccess {string} .Thumbnail Portrait Thumbnail
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("getActorsOfVideo", ActorNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("getActorsOfVideo", ActorNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			MovieId int
 | 
			
		||||
		}
 | 
			
		||||
@@ -74,7 +75,7 @@ func getActorsFromDB() {
 | 
			
		||||
	 * @apiSuccess {string} Info.Name Actor Name
 | 
			
		||||
	 * @apiSuccess {string} Info.Thumbnail Actor Thumbnail
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("getActorInfo", ActorNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("getActorInfo", ActorNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			ActorId int
 | 
			
		||||
		}
 | 
			
		||||
@@ -114,7 +115,7 @@ func saveActorsToDB() {
 | 
			
		||||
	 *
 | 
			
		||||
	 * @apiSuccess {string} result 'success' if successfully or error message if not
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("createActor", ActorNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("createActor", ActorNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			ActorName string
 | 
			
		||||
		}
 | 
			
		||||
@@ -138,7 +139,7 @@ func saveActorsToDB() {
 | 
			
		||||
	 *
 | 
			
		||||
	 * @apiSuccess {string} result 'success' if successfully or error message if not
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("addActorToVideo", ActorNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("addActorToVideo", ActorNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			ActorId int
 | 
			
		||||
			MovieId int
 | 
			
		||||
 
 | 
			
		||||
@@ -1,113 +0,0 @@
 | 
			
		||||
package api
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"bytes"
 | 
			
		||||
	"encoding/json"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"gopkg.in/oauth2.v3"
 | 
			
		||||
	"net/http"
 | 
			
		||||
	"openmediacenter/apiGo/api/oauth"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
const APIPREFIX = "/api"
 | 
			
		||||
 | 
			
		||||
const (
 | 
			
		||||
	VideoNode    = iota
 | 
			
		||||
	TagNode      = iota
 | 
			
		||||
	SettingsNode = iota
 | 
			
		||||
	ActorNode    = iota
 | 
			
		||||
	TVShowNode   = iota
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
type HandlerInfo struct {
 | 
			
		||||
	ID    string
 | 
			
		||||
	Token string
 | 
			
		||||
	Data  map[string]interface{}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
type actionStruct struct {
 | 
			
		||||
	Action string
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
type Handler struct {
 | 
			
		||||
	action  string
 | 
			
		||||
	handler func(info *HandlerInfo) []byte
 | 
			
		||||
	apiNode int
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
var handlers = make(map[string]Handler)
 | 
			
		||||
 | 
			
		||||
func AddHandler(action string, apiNode int, h func(info *HandlerInfo) []byte) {
 | 
			
		||||
	// append new handler to the handlers
 | 
			
		||||
	handlers[fmt.Sprintf("%s/%d", action, apiNode)] = Handler{action, h, apiNode}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func ServerInit() {
 | 
			
		||||
	http.Handle(APIPREFIX+"/video", oauth.ValidateToken(handlefunc, VideoNode))
 | 
			
		||||
	http.Handle(APIPREFIX+"/tags", oauth.ValidateToken(handlefunc, TagNode))
 | 
			
		||||
	http.Handle(APIPREFIX+"/settings", oauth.ValidateToken(handlefunc, SettingsNode))
 | 
			
		||||
	http.Handle(APIPREFIX+"/actor", oauth.ValidateToken(handlefunc, ActorNode))
 | 
			
		||||
	http.Handle(APIPREFIX+"/tvshow", oauth.ValidateToken(handlefunc, TVShowNode))
 | 
			
		||||
 | 
			
		||||
	// initialize oauth service and add corresponding auth routes
 | 
			
		||||
	oauth.InitOAuth()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func handleAPICall(action string, requestBody string, apiNode int, info *HandlerInfo) []byte {
 | 
			
		||||
	handler, ok := handlers[fmt.Sprintf("%s/%d", action, apiNode)]
 | 
			
		||||
	if !ok {
 | 
			
		||||
		// handler doesn't exist!
 | 
			
		||||
		fmt.Printf("no handler found for Action: %d/%s\n", apiNode, action)
 | 
			
		||||
		return nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// check if info even exists
 | 
			
		||||
	if info == nil {
 | 
			
		||||
		info = &HandlerInfo{}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// parse the arguments
 | 
			
		||||
	var args map[string]interface{}
 | 
			
		||||
	err := json.Unmarshal([]byte(requestBody), &args)
 | 
			
		||||
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		fmt.Printf("failed to decode arguments of action %s :: %s\n", action, requestBody)
 | 
			
		||||
	} else {
 | 
			
		||||
		// check if map has an action
 | 
			
		||||
		if _, ok := args["action"]; ok {
 | 
			
		||||
			delete(args, "action")
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		info.Data = args
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// call the handler
 | 
			
		||||
	return handler.handler(info)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func handlefunc(rw http.ResponseWriter, req *http.Request, node int, tokenInfo *oauth2.TokenInfo) {
 | 
			
		||||
	// only allow post requests
 | 
			
		||||
	if req.Method != "POST" {
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	buf := new(bytes.Buffer)
 | 
			
		||||
	buf.ReadFrom(req.Body)
 | 
			
		||||
	body := buf.String()
 | 
			
		||||
 | 
			
		||||
	var t actionStruct
 | 
			
		||||
	err := json.Unmarshal([]byte(body), &t)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		fmt.Println("failed to read action from request! :: " + body)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// load userid from received token object
 | 
			
		||||
	id := (*tokenInfo).GetClientID()
 | 
			
		||||
 | 
			
		||||
	userinfo := &HandlerInfo{
 | 
			
		||||
		ID:    id,
 | 
			
		||||
		Token: (*tokenInfo).GetCode(),
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	rw.Write(handleAPICall(t.Action, body, node, userinfo))
 | 
			
		||||
}
 | 
			
		||||
@@ -1,72 +0,0 @@
 | 
			
		||||
package api
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"testing"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func cleanUp() {
 | 
			
		||||
	handlers = make(map[string]Handler)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestAddHandler(t *testing.T) {
 | 
			
		||||
	cleanUp()
 | 
			
		||||
 | 
			
		||||
	AddHandler("test", ActorNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
		return nil
 | 
			
		||||
	})
 | 
			
		||||
	if len(handlers) != 1 {
 | 
			
		||||
		t.Errorf("Handler insertion failed, got: %d handlers, want: %d.", len(handlers), 1)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestCallOfHandler(t *testing.T) {
 | 
			
		||||
	cleanUp()
 | 
			
		||||
 | 
			
		||||
	i := 0
 | 
			
		||||
	AddHandler("test", ActorNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
		i++
 | 
			
		||||
		return nil
 | 
			
		||||
	})
 | 
			
		||||
 | 
			
		||||
	// simulate the call of the api
 | 
			
		||||
	handleAPICall("test", "", ActorNode, nil)
 | 
			
		||||
 | 
			
		||||
	if i != 1 {
 | 
			
		||||
		t.Errorf("Unexpected number of Lambda calls : %d/1", i)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestDecodingOfArguments(t *testing.T) {
 | 
			
		||||
	cleanUp()
 | 
			
		||||
 | 
			
		||||
	AddHandler("test", ActorNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			Test    string
 | 
			
		||||
			TestInt int
 | 
			
		||||
		}
 | 
			
		||||
		err := FillStruct(&args, info.Data)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			t.Errorf("Error parsing args: %s", err.Error())
 | 
			
		||||
			return nil
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if args.TestInt != 42 || args.Test != "myString" {
 | 
			
		||||
			t.Errorf("Wrong parsing of argument parameters : %d/42 - %s/myString", args.TestInt, args.Test)
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		return nil
 | 
			
		||||
	})
 | 
			
		||||
 | 
			
		||||
	// simulate the call of the api
 | 
			
		||||
	handleAPICall("test", `{"Test":"myString","TestInt":42}`, ActorNode, nil)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestNoHandlerCovers(t *testing.T) {
 | 
			
		||||
	cleanUp()
 | 
			
		||||
 | 
			
		||||
	ret := handleAPICall("test", "", ActorNode, nil)
 | 
			
		||||
 | 
			
		||||
	if ret != nil {
 | 
			
		||||
		t.Error("Expect nil return within unhandled api action")
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -3,6 +3,7 @@ package api
 | 
			
		||||
import (
 | 
			
		||||
	"encoding/json"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	gws "github.com/gowebsecure/goWebSecure-go"
 | 
			
		||||
	"openmediacenter/apiGo/api/types"
 | 
			
		||||
	"openmediacenter/apiGo/database"
 | 
			
		||||
	"openmediacenter/apiGo/database/settings"
 | 
			
		||||
@@ -37,7 +38,7 @@ func getSettingsFromDB() {
 | 
			
		||||
	 * @apiSuccess {uint32} Sizes.DifferentTags number of different tags available
 | 
			
		||||
	 * @apiSuccess {uint32} Sizes.TagsAdded number of different tags added to videos
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("loadGeneralSettings", SettingsNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("loadGeneralSettings", SettingsNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		result, _, sizes := database.GetSettings()
 | 
			
		||||
 | 
			
		||||
		var ret = struct {
 | 
			
		||||
@@ -63,7 +64,7 @@ func getSettingsFromDB() {
 | 
			
		||||
	 * @apiSuccess {bool} DarkMode Darkmode enabled?
 | 
			
		||||
	 * @apiSuccess {bool} TVShowEnabled is are TVShows enabled
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("loadInitialData", SettingsNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("loadInitialData", SettingsNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		sett := settings.LoadSettings()
 | 
			
		||||
 | 
			
		||||
		type InitialDataTypeResponse struct {
 | 
			
		||||
@@ -111,7 +112,7 @@ func saveSettingsToDB() {
 | 
			
		||||
	 *
 | 
			
		||||
	 * @apiSuccess {string} result 'success' if successfully or error message if not
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("saveGeneralSettings", SettingsNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("saveGeneralSettings", SettingsNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args types.SettingsType
 | 
			
		||||
		if err := FillStruct(&args, info.Data); err != nil {
 | 
			
		||||
			fmt.Println(err.Error())
 | 
			
		||||
@@ -143,7 +144,7 @@ func reIndexHandling() {
 | 
			
		||||
	 *
 | 
			
		||||
	 * @apiSuccess {string} result 'success' if successfully or error message if not
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("startReindex", SettingsNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("startReindex", SettingsNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		videoparser.StartReindex()
 | 
			
		||||
		return database.ManualSuccessResponse(nil)
 | 
			
		||||
	})
 | 
			
		||||
@@ -156,7 +157,7 @@ func reIndexHandling() {
 | 
			
		||||
	 *
 | 
			
		||||
	 * @apiSuccess {string} result 'success' if successfully or error message if not
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("startTVShowReindex", SettingsNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("startTVShowReindex", SettingsNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		videoparser.StartTVShowReindex()
 | 
			
		||||
		return database.ManualSuccessResponse(nil)
 | 
			
		||||
	})
 | 
			
		||||
@@ -167,7 +168,7 @@ func reIndexHandling() {
 | 
			
		||||
	 * @apiName cleanupGravity
 | 
			
		||||
	 * @apiGroup Settings
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("cleanupGravity", SettingsNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("cleanupGravity", SettingsNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		videoparser.StartCleanup()
 | 
			
		||||
		return nil
 | 
			
		||||
	})
 | 
			
		||||
 
 | 
			
		||||
@@ -2,6 +2,7 @@ package api
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"fmt"
 | 
			
		||||
	gws "github.com/gowebsecure/goWebSecure-go"
 | 
			
		||||
	"openmediacenter/apiGo/database"
 | 
			
		||||
	"openmediacenter/apiGo/database/settings"
 | 
			
		||||
)
 | 
			
		||||
@@ -22,7 +23,7 @@ func AddTvshowHandlers() {
 | 
			
		||||
	 * @apiSuccess {uint32} .Id tvshow id
 | 
			
		||||
	 * @apiSuccess {string} .Name tvshow name
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("getTVShows", TVShowNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("getTVShows", TVShowNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		query := "SELECT id, name FROM tvshow"
 | 
			
		||||
		rows := database.Query(query)
 | 
			
		||||
		return jsonify(readTVshowsFromResultset(rows))
 | 
			
		||||
@@ -42,7 +43,7 @@ func AddTvshowHandlers() {
 | 
			
		||||
	 * @apiSuccess {uint8} .Season Season number
 | 
			
		||||
	 * @apiSuccess {uint8} .Episode Episode number
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("getEpisodes", TVShowNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("getEpisodes", TVShowNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			ShowID uint32
 | 
			
		||||
		}
 | 
			
		||||
@@ -90,7 +91,7 @@ func AddTvshowHandlers() {
 | 
			
		||||
	 * @apiSuccess {uint8} Episode Episode number
 | 
			
		||||
	 * @apiSuccess {string} Path webserver path of video file
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("loadEpisode", TVShowNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("loadEpisode", TVShowNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			ID uint32
 | 
			
		||||
		}
 | 
			
		||||
@@ -137,7 +138,7 @@ WHERE tvshow_episodes.id=%d`, args.ID)
 | 
			
		||||
	 *
 | 
			
		||||
	 * @apiSuccess {string} . Base64 encoded Thubnail
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("readThumbnail", TVShowNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("readThumbnail", TVShowNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			Id int
 | 
			
		||||
		}
 | 
			
		||||
 
 | 
			
		||||
@@ -2,6 +2,7 @@ package api
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"fmt"
 | 
			
		||||
	gws "github.com/gowebsecure/goWebSecure-go"
 | 
			
		||||
	"openmediacenter/apiGo/database"
 | 
			
		||||
	"regexp"
 | 
			
		||||
)
 | 
			
		||||
@@ -24,7 +25,7 @@ func deleteFromDB() {
 | 
			
		||||
	 *
 | 
			
		||||
	 * @apiSuccess {string} result 'success' if successfully or error message if not
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("deleteTag", TagNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("deleteTag", TagNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			TagId int
 | 
			
		||||
			Force bool
 | 
			
		||||
@@ -74,7 +75,7 @@ func getFromDB() {
 | 
			
		||||
	 * @apiSuccess {uint32} TagId
 | 
			
		||||
	 * @apiSuccess {string} TagName name of the Tag
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("getAllTags", TagNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("getAllTags", TagNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		query := "SELECT tag_id,tag_name from tags"
 | 
			
		||||
		return jsonify(readTagsFromResultset(database.Query(query)))
 | 
			
		||||
	})
 | 
			
		||||
@@ -91,7 +92,7 @@ func addToDB() {
 | 
			
		||||
	 *
 | 
			
		||||
	 * @apiSuccess {string} result 'success' if successfully or error message if not
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("createTag", TagNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("createTag", TagNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			TagName string
 | 
			
		||||
		}
 | 
			
		||||
@@ -115,7 +116,7 @@ func addToDB() {
 | 
			
		||||
	 *
 | 
			
		||||
	 * @apiSuccess {string} result 'success' if successfully or error message if not
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("addTag", TagNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("addTag", TagNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			MovieId int
 | 
			
		||||
			TagId   int
 | 
			
		||||
 
 | 
			
		||||
@@ -3,6 +3,7 @@ package api
 | 
			
		||||
import (
 | 
			
		||||
	"encoding/json"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	gws "github.com/gowebsecure/goWebSecure-go"
 | 
			
		||||
	"net/url"
 | 
			
		||||
	"openmediacenter/apiGo/api/types"
 | 
			
		||||
	"openmediacenter/apiGo/database"
 | 
			
		||||
@@ -29,7 +30,7 @@ func getVideoHandlers() {
 | 
			
		||||
	 * @apiSuccess {String} Videos.MovieName  Name of video
 | 
			
		||||
	 * @apiSuccess {String} TagName Name of the Tag returned
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("getMovies", VideoNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("getMovies", VideoNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			Tag  uint32
 | 
			
		||||
			Sort uint8
 | 
			
		||||
@@ -120,7 +121,7 @@ func getVideoHandlers() {
 | 
			
		||||
	 *
 | 
			
		||||
	 * @apiSuccess {string} . Base64 encoded Thubnail
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("readThumbnail", VideoNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("readThumbnail", VideoNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			Movieid int
 | 
			
		||||
		}
 | 
			
		||||
@@ -158,7 +159,7 @@ func getVideoHandlers() {
 | 
			
		||||
	 * @apiSuccess {string} Videos.MovieName Video Name
 | 
			
		||||
	 * @apiSuccess {int} Videos.MovieId Video ID
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("getRandomMovies", VideoNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("getRandomMovies", VideoNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			Number int
 | 
			
		||||
		}
 | 
			
		||||
@@ -219,7 +220,7 @@ func getVideoHandlers() {
 | 
			
		||||
	 * @apiSuccess {number} .MovieId Id of Video
 | 
			
		||||
	 * @apiSuccess {String} .MovieName  Name of video
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("getSearchKeyWord", VideoNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("getSearchKeyWord", VideoNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			KeyWord string
 | 
			
		||||
		}
 | 
			
		||||
@@ -271,7 +272,7 @@ func loadVideosHandlers() {
 | 
			
		||||
	 * @apiSuccess {string} Actors.Name Actor Name
 | 
			
		||||
	 * @apiSuccess {string} Actors.Thumbnail Portrait Thumbnail
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("loadVideo", VideoNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("loadVideo", VideoNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			MovieId int
 | 
			
		||||
		}
 | 
			
		||||
@@ -347,7 +348,7 @@ func loadVideosHandlers() {
 | 
			
		||||
	 * @apiSuccess {uint32} DifferentTags number of different Tags available
 | 
			
		||||
	 * @apiSuccess {uint32} Tagged number of different Tags assigned
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("getStartData", VideoNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("getStartData", VideoNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var result types.StartData
 | 
			
		||||
		// query settings and infotile values
 | 
			
		||||
		query := `
 | 
			
		||||
@@ -398,7 +399,7 @@ func addToVideoHandlers() {
 | 
			
		||||
	 *
 | 
			
		||||
	 * @apiSuccess {string} result 'success' if successfully or error message if not
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("addLike", VideoNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("addLike", VideoNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			MovieId int
 | 
			
		||||
		}
 | 
			
		||||
@@ -421,7 +422,7 @@ func addToVideoHandlers() {
 | 
			
		||||
	 *
 | 
			
		||||
	 * @apiSuccess {string} result 'success' if successfully or error message if not
 | 
			
		||||
	 */
 | 
			
		||||
	AddHandler("deleteVideo", VideoNode, func(info *HandlerInfo) []byte {
 | 
			
		||||
	gws.AddHandler("deleteVideo", VideoNode, func(info *gws.HandlerInfo) []byte {
 | 
			
		||||
		var args struct {
 | 
			
		||||
			MovieId int
 | 
			
		||||
		}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,57 +0,0 @@
 | 
			
		||||
package oauth
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"gopkg.in/oauth2.v3"
 | 
			
		||||
	"openmediacenter/apiGo/database/settings"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
type CustomClientStore struct {
 | 
			
		||||
	oauth2.ClientStore
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
type CustomClientInfo struct {
 | 
			
		||||
	oauth2.ClientInfo
 | 
			
		||||
	ID     string
 | 
			
		||||
	Secret string
 | 
			
		||||
	Domain string
 | 
			
		||||
	UserID string
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func NewCustomStore() oauth2.ClientStore {
 | 
			
		||||
	s := new(CustomClientStore)
 | 
			
		||||
	return s
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (a *CustomClientStore) GetByID(id string) (oauth2.ClientInfo, error) {
 | 
			
		||||
	password := settings.GetPassword()
 | 
			
		||||
	// if password not set assign default password
 | 
			
		||||
	if password == nil {
 | 
			
		||||
		defaultpassword := "openmediacenter"
 | 
			
		||||
		password = &defaultpassword
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	clientinfo := CustomClientInfo{
 | 
			
		||||
		ID:     "openmediacenter",
 | 
			
		||||
		Secret: *password,
 | 
			
		||||
		Domain: "http://localhost:8081",
 | 
			
		||||
		UserID: "openmediacenter",
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return &clientinfo, nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (a *CustomClientInfo) GetID() string {
 | 
			
		||||
	return a.ID
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (a *CustomClientInfo) GetSecret() string {
 | 
			
		||||
	return a.Secret
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (a *CustomClientInfo) GetDomain() string {
 | 
			
		||||
	return a.Domain
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (a *CustomClientInfo) GetUserID() string {
 | 
			
		||||
	return a.UserID
 | 
			
		||||
}
 | 
			
		||||
@@ -1,62 +0,0 @@
 | 
			
		||||
package oauth
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"gopkg.in/oauth2.v3"
 | 
			
		||||
	"gopkg.in/oauth2.v3/errors"
 | 
			
		||||
	"gopkg.in/oauth2.v3/manage"
 | 
			
		||||
	"gopkg.in/oauth2.v3/server"
 | 
			
		||||
	"gopkg.in/oauth2.v3/store"
 | 
			
		||||
	"log"
 | 
			
		||||
	"net/http"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
var srv *server.Server
 | 
			
		||||
 | 
			
		||||
func InitOAuth() {
 | 
			
		||||
	manager := manage.NewDefaultManager()
 | 
			
		||||
	// token store
 | 
			
		||||
	manager.MustTokenStorage(store.NewMemoryTokenStore())
 | 
			
		||||
 | 
			
		||||
	// create new secretstore
 | 
			
		||||
	clientStore := NewCustomStore()
 | 
			
		||||
	manager.MapClientStorage(clientStore)
 | 
			
		||||
 | 
			
		||||
	srv = server.NewServer(server.NewConfig(), manager)
 | 
			
		||||
	srv.SetClientInfoHandler(server.ClientFormHandler)
 | 
			
		||||
	manager.SetRefreshTokenCfg(manage.DefaultRefreshTokenCfg)
 | 
			
		||||
 | 
			
		||||
	srv.SetInternalErrorHandler(func(err error) (re *errors.Response) {
 | 
			
		||||
		log.Println("Internal Error:", err.Error())
 | 
			
		||||
		return
 | 
			
		||||
	})
 | 
			
		||||
 | 
			
		||||
	srv.SetResponseErrorHandler(func(re *errors.Response) {
 | 
			
		||||
		log.Println("Response Error:", re.Error.Error())
 | 
			
		||||
	})
 | 
			
		||||
 | 
			
		||||
	http.HandleFunc("/authorize", func(w http.ResponseWriter, r *http.Request) {
 | 
			
		||||
		err := srv.HandleAuthorizeRequest(w, r)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			http.Error(w, err.Error(), http.StatusBadRequest)
 | 
			
		||||
		}
 | 
			
		||||
	})
 | 
			
		||||
 | 
			
		||||
	http.HandleFunc("/token", func(w http.ResponseWriter, r *http.Request) {
 | 
			
		||||
		err := srv.HandleTokenRequest(w, r)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			http.Error(w, err.Error(), http.StatusInternalServerError)
 | 
			
		||||
		}
 | 
			
		||||
	})
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func ValidateToken(f func(rw http.ResponseWriter, req *http.Request, node int, tokenInfo *oauth2.TokenInfo), node int) http.HandlerFunc {
 | 
			
		||||
	return func(w http.ResponseWriter, r *http.Request) {
 | 
			
		||||
		tokeninfo, err := srv.ValidationBearerToken(r)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			http.Error(w, err.Error(), http.StatusBadRequest)
 | 
			
		||||
			return
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		f(w, r, node, &tokeninfo)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
@@ -4,6 +4,6 @@ go 1.16
 | 
			
		||||
 | 
			
		||||
require (
 | 
			
		||||
	github.com/go-sql-driver/mysql v1.5.0
 | 
			
		||||
	gopkg.in/oauth2.v3 v3.12.0
 | 
			
		||||
	github.com/gowebsecure/goWebSecure-go v0.1.0-beta.0
 | 
			
		||||
	nhooyr.io/websocket v1.8.7
 | 
			
		||||
)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										46
									
								
								apiGo/go.sum
									
									
									
									
									
								
							
							
						
						
									
										46
									
								
								apiGo/go.sum
									
									
									
									
									
								
							@@ -1,58 +1,90 @@
 | 
			
		||||
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 | 
			
		||||
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=
 | 
			
		||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 | 
			
		||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 | 
			
		||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 | 
			
		||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 | 
			
		||||
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
 | 
			
		||||
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 | 
			
		||||
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 | 
			
		||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 | 
			
		||||
github.com/gavv/httpexpect v2.0.0+incompatible h1:1X9kcRshkSKEjNJJxX9Y9mQ5BRfbxU5kORdjhlA1yX8=
 | 
			
		||||
github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
 | 
			
		||||
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 | 
			
		||||
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 | 
			
		||||
github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 | 
			
		||||
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 | 
			
		||||
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 | 
			
		||||
github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 | 
			
		||||
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 | 
			
		||||
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
 | 
			
		||||
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 | 
			
		||||
github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
 | 
			
		||||
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 | 
			
		||||
github.com/go-session/session v3.1.2+incompatible/go.mod h1:8B3iivBQjrz/JtC68Np2T1yBBLxTan3mn/3OM0CyRt0=
 | 
			
		||||
github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 | 
			
		||||
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 | 
			
		||||
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
 | 
			
		||||
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 | 
			
		||||
github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
 | 
			
		||||
github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 | 
			
		||||
github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
 | 
			
		||||
github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
 | 
			
		||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 | 
			
		||||
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 | 
			
		||||
github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
 | 
			
		||||
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 | 
			
		||||
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 | 
			
		||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 | 
			
		||||
github.com/google/go-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.0 h1:sRtAUayLicrau6qYD6gBpnXpmpz5pkbOJsHk3vy18LU=
 | 
			
		||||
github.com/gowebsecure/goWebSecure-go v0.1.0-beta.0/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=
 | 
			
		||||
github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eTO0Q8=
 | 
			
		||||
github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 | 
			
		||||
github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 | 
			
		||||
github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 | 
			
		||||
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 | 
			
		||||
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 | 
			
		||||
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 | 
			
		||||
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 | 
			
		||||
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 | 
			
		||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 | 
			
		||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 | 
			
		||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 | 
			
		||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 | 
			
		||||
github.com/moul/http2curl v1.0.0 h1:dRMWoAtb+ePxMlLkrCbAqh4TlPHXvoGUSQ323/9Zahs=
 | 
			
		||||
github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 | 
			
		||||
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/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/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=
 | 
			
		||||
@@ -70,16 +102,26 @@ github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e h1:+NL1GDIUOKxVfbp2K
 | 
			
		||||
github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e/go.mod h1:/h+UnNGt0IhNNJLkGikcdcJqm66zGD/uJGMRxK/9+Ao=
 | 
			
		||||
github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563 h1:Otn9S136ELckZ3KKDyCkxapfufrqDqwmGjcHfAyXRrE=
 | 
			
		||||
github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563/go.mod h1:mLqSmt7Dv/CNneF2wfcChfN1rvapyQr01LGKnKex0DQ=
 | 
			
		||||
github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 | 
			
		||||
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 | 
			
		||||
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 | 
			
		||||
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 | 
			
		||||
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 | 
			
		||||
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 | 
			
		||||
github.com/valyala/fasthttp v1.6.0 h1:uWF8lgKmeaIewWVPwi4GRq2P6+R46IgYZdxWtM+GtEY=
 | 
			
		||||
github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
 | 
			
		||||
github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 | 
			
		||||
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
 | 
			
		||||
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 | 
			
		||||
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
 | 
			
		||||
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 | 
			
		||||
github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
 | 
			
		||||
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 | 
			
		||||
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 h1:6fRhSjgLCkTD3JnJxvaJ4Sj+TYblw757bqYgZaOq5ZY=
 | 
			
		||||
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
 | 
			
		||||
github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA=
 | 
			
		||||
github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
 | 
			
		||||
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/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 | 
			
		||||
@@ -87,6 +129,7 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r
 | 
			
		||||
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 | 
			
		||||
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 | 
			
		||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 | 
			
		||||
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM=
 | 
			
		||||
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 | 
			
		||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 | 
			
		||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 | 
			
		||||
@@ -94,12 +137,14 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 | 
			
		||||
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 | 
			
		||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 | 
			
		||||
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg=
 | 
			
		||||
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 | 
			
		||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 | 
			
		||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 | 
			
		||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 | 
			
		||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 | 
			
		||||
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 | 
			
		||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 | 
			
		||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 | 
			
		||||
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 | 
			
		||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 | 
			
		||||
@@ -109,6 +154,7 @@ gopkg.in/oauth2.v3 v3.12.0/go.mod h1:XEYgKqWX095YiPT+Aw5y3tCn+7/FMnlTFKrupgSiJ3I
 | 
			
		||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 | 
			
		||||
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 | 
			
		||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 | 
			
		||||
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 | 
			
		||||
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 | 
			
		||||
nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
 | 
			
		||||
nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
 | 
			
		||||
 
 | 
			
		||||
@@ -28,18 +28,12 @@ func main() {
 | 
			
		||||
	database.InitDB(db)
 | 
			
		||||
	defer database.Close()
 | 
			
		||||
 | 
			
		||||
	api.AddVideoHandlers()
 | 
			
		||||
	api.AddSettingsHandlers()
 | 
			
		||||
	api.AddTagHandlers()
 | 
			
		||||
	api.AddActorsHandlers()
 | 
			
		||||
	api.AddTvshowHandlers()
 | 
			
		||||
 | 
			
		||||
	videoparser.SetupSettingsWebsocket()
 | 
			
		||||
 | 
			
		||||
	// add the static files
 | 
			
		||||
	static.ServeStaticFiles()
 | 
			
		||||
 | 
			
		||||
	api.ServerInit()
 | 
			
		||||
	api.Init()
 | 
			
		||||
 | 
			
		||||
	fmt.Printf("OpenMediacenter server up and running on port %d\n", port)
 | 
			
		||||
	log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", port), nil))
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user