remember a shuffle seed to remain page reload

.gitlab-ci.yml

@@ -108,13 +108,18 @@ Debian_Server:
       - Minimize_Frontend
       - Build_Backend
 
-.Test_Server_Common:
+Test_Server:
   stage: deploy
   image: luki42/ssh:latest
   needs:
     - Frontend_Tests
     - Backend_Tests
     - Debian_Server
+  rules:
+    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH # run this always on default branch
+    - if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH # allow triggering this manually
+      when: manual
+      allow_failure: true
   script:
     - eval $(ssh-agent -s)
     - echo "$SSH_PRIVATE_KEY" | ssh-add -
@@ -124,38 +129,24 @@ Debian_Server:
     - ssh root@192.168.0.42 "DEBIAN_FRONTEND=noninteractive apt-get --reinstall  -y -qq install /tmp/OpenMediaCenter-*.deb && rm /tmp/OpenMediaCenter-*.deb"
   allow_failure: true
 
-Test_Server_CD:
+Test_Server_2:
-  extends: .Test_Server_Common
-  only:
-    refs:
-      - master
-
-Test_Server_MANUAL:
-  extends: .Test_Server_Common
-  when: manual
-
-.Test_Server_2_Common:
   stage: deploy
   image: luki42/ssh:latest
   needs:
     - Frontend_Tests
     - Backend_Tests
     - Debian_Server
+  rules:
+    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH # run this always on default branch
+    - if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH # allow triggering this manually
+      when: manual
+      allow_failure: true
   script:
     - eval $(ssh-agent -s)
     - echo "$SSH_PRIVATE_KEY_2" | ssh-add -
     - mkdir -p ~/.ssh
     - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
-    - scp deb/OpenMediaCenter-*.deb root@192.168.0.44:/tmp/
+    - scp deb/OpenMediaCenter-*.deb root@192.168.0.209:/tmp/
-    - ssh root@192.168.0.44 "DEBIAN_FRONTEND=noninteractive apt-get --reinstall  -y -qq install /tmp/OpenMediaCenter-*.deb && rm /tmp/OpenMediaCenter-*.deb"
+    - ssh root@192.168.0.209 "DEBIAN_FRONTEND=noninteractive apt-get --reinstall  -y -qq install /tmp/OpenMediaCenter-*.deb && rm /tmp/OpenMediaCenter-*.deb"
   allow_failure: true
 
-Test_Server_2_CD:
-  extends: .Test_Server_2_Common
-  only:
-    refs:
-      - master
-
-Test_Server_2_MANUAL:
-  extends: .Test_Server_2_Common
-  when: manual

apiGo/api/Actors.go

@@ -25,7 +25,7 @@ func getActorsFromDB() {
 	 * @apiSuccess {string} .Thumbnail Portrait Thumbnail
 	 */
 	api.AddHandler("getAllActors", api.ActorNode, api.PermUser, func(context api.Context) {
-		query := "SELECT actor_id, name, thumbnail FROM actors ORDER BY name ASC"
+		query := "SELECT actor_id, name, thumbnail FROM actors"
 		context.Json(readActorsFromResultset(database.Query(query)))
 	})
 

apiGo/api/FileUpload.go

@@ -7,6 +7,7 @@ import (
 	"openmediacenter/apiGo/database"
 	"openmediacenter/apiGo/videoparser"
 	"os"
+	"path/filepath"
 )
 
 func addUploadHandler() {
@@ -30,11 +31,11 @@ func addUploadHandler() {
 				break
 			}
 
+			// todo allow more video formats than mp4
 			// only allow valid extensions
-			if !videoparser.ValidVideoSuffix(part.FileName()) {
+			if filepath.Ext(part.FileName()) != ".mp4" {
 				continue
 			}
-
 			vidpath := PathPrefix + mSettings.VideoPath + part.FileName()
 			dst, err := os.OpenFile(vidpath, os.O_WRONLY|os.O_CREATE, 0644)
 			if err != nil {

apiGo/api/Tags.go

@@ -78,7 +78,7 @@ func getFromDB() {
 	 * @apiSuccess {string} TagName name of the Tag
 	 */
 	api.AddHandler("getAllTags", api.TagNode, api.PermUser, func(context api.Context) {
-		query := "SELECT tag_id,tag_name from tags ORDER BY tag_name ASC"
+		query := "SELECT tag_id,tag_name from tags"
 		context.Json(readTagsFromResultset(database.Query(query)))
 	})
 }

apiGo/api/Video.go

@@ -1,8 +1,8 @@
 package api
 
 import (
-	"encoding/json"
 	"fmt"
+	"math/rand"
 	"net/url"
 	"openmediacenter/apiGo/api/api"
 	"openmediacenter/apiGo/api/types"
@@ -10,7 +10,6 @@ import (
 	"openmediacenter/apiGo/database"
 	"os"
 	"strconv"
-	"strings"
 )
 
 func addVideoHandlers() {
@@ -164,65 +163,53 @@ func getVideoHandlers() {
 	 */
 	api.AddHandler("getRandomMovies", api.VideoNode, api.PermUser, func(context api.Context) {
 		var args struct {
-			Number    int
+			Number int
-			TagFilter []uint32
+			Seed   *int
 		}
 		if api.DecodeRequest(context.GetRequest(), &args) != nil {
 			context.Text("unable to decode request")
 			return
 		}
 
+		// if Seed argument not passed generate random seed
+		if args.Seed == nil {
+			r := rand.Int()
+			args.Seed = &r
+		}
+
 		var result struct {
 			Tags   []types.Tag
 			Videos []types.VideoUnloadedType
 		}
 
-		whereclause := "WHERE 1"
+		query := fmt.Sprintf("SELECT movie_id,movie_name FROM videos ORDER BY RAND(%d) LIMIT %d", *args.Seed, args.Number)
-		if len(args.TagFilter) > 0 {
-			d, _ := json.Marshal(args.TagFilter)
-			vals := strings.Trim(string(d), "[]")
-
-			whereclause = fmt.Sprintf("WHERE tag_id IN (%s)", vals)
-		}
-
-		query := fmt.Sprintf(`
-SELECT video_tags.video_id,v.movie_name FROM video_tags join videos v on v.movie_id = video_tags.video_id
-                                        %s
-                                        group by video_id
-                                        ORDER BY RAND()
-                                        LIMIT %d`, whereclause, args.Number)
 		result.Videos = readVideosFromResultset(database.Query(query))
 
-		if len(result.Videos) > 0 {
+		var ids string
-			var ids string
+		for i := range result.Videos {
-			for i := range result.Videos {
+			ids += "video_tags.video_id=" + strconv.Itoa(result.Videos[i].MovieId)
-				ids += "video_tags.video_id=" + strconv.Itoa(result.Videos[i].MovieId)
 
-				if i < len(result.Videos)-1 {
+			if i < len(result.Videos)-1 {
-					ids += " OR "
+				ids += " OR "
-				}
 			}
+		}
 
-			// add the corresponding tags
+		// add the corresponding tags
-			query = fmt.Sprintf(`SELECT t.tag_name,t.tag_id FROM video_tags
+		query = fmt.Sprintf(`SELECT t.tag_name,t.tag_id FROM video_tags
 									INNER JOIN tags t on video_tags.tag_id = t.tag_id
 									WHERE %s
 									GROUP BY t.tag_id`, ids)
 
-			rows := database.Query(query)
+		rows := database.Query(query)
-			if rows != nil {
+
-				for rows.Next() {
+		for rows.Next() {
-					var tag types.Tag
+			var tag types.Tag
-					err := rows.Scan(&tag.TagName, &tag.TagId)
+			err := rows.Scan(&tag.TagName, &tag.TagId)
-					if err != nil {
+			if err != nil {
-						panic(err.Error()) // proper Error handling instead of panic in your app
+				panic(err.Error()) // proper Error handling instead of panic in your app
-					}
-					// append to final array
-					result.Tags = append(result.Tags, tag)
-				}
 			}
-		} else {
+			// append to final array
-			result.Tags = []types.Tag{}
+			result.Tags = append(result.Tags, tag)
 		}
 
 		context.Json(result)

apiGo/api/api/Auth.go

@@ -21,7 +21,7 @@ func (p Perm) String() string {
 }
 
 const SignKey = "89013f1753a6890c6090b09e3c23ff43"
-const TokenExpireHours = 8760
+const TokenExpireHours = 24
 
 type Token struct {
 	Token     string

apiGo/api/api/Helpers.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"reflect"
 )
 
 func Jsonify(v interface{}) []byte {
@@ -29,3 +30,45 @@ func DecodeRequest(request *http.Request, arg interface{}) error {
 
 	return err
 }
+
+// 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/go.mod

@@ -5,7 +5,6 @@ go 1.16
 require (
 	github.com/3d0c/gmf v0.0.0-20210925211039-e278e6e53b16
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/fsnotify/fsnotify v1.5.4
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/pelletier/go-toml/v2 v2.0.0-beta.3
 	github.com/pressly/goose/v3 v3.1.0

apiGo/go.sum

@@ -9,8 +9,6 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
-github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 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=
@@ -84,9 +82,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

apiGo/housekeeping/HouseKeeping.go

@@ -1,18 +0,0 @@
-package housekeeping
-
-import "fmt"
-
-func RunHouseKeepingTasks() {
-	fmt.Println("Runnint houskeeping tasks!")
-
-	fmt.Println("Deduplicating Tags")
-	deduplicateTags()
-
-	fmt.Println("Deduplicating Tags assigned to videos")
-	deduplicateVideoTags()
-
-	fmt.Println("Fix missing video metadata like ratio")
-	fixMissingMetadata()
-
-	fmt.Println("Finished housekeeping")
-}

apiGo/housekeeping/MissingVideoMetaData.go

@@ -1,5 +0,0 @@
-package housekeeping
-
-func fixMissingMetadata() {
-	// todo
-}

apiGo/housekeeping/TagDeduplication.go

@@ -1,86 +0,0 @@
-package housekeeping
-
-import (
-	"fmt"
-	"openmediacenter/apiGo/database"
-)
-
-func deduplicateTags() {
-	// find all duplicate tags
-
-	// gives first occurence of duplicate
-	query := `
-SELECT
-    tag_name
-FROM
-    tags
-GROUP BY tag_name
-HAVING COUNT(tag_name) > 1`
-	rows := database.Query(query)
-	duplicates := []string{}
-	if rows != nil {
-		for rows.Next() {
-			var id string
-			err := rows.Scan(&id)
-			if err != nil {
-				panic(err.Error()) // proper Error handling instead of panic in your app
-			}
-			duplicates = append(duplicates, id)
-		}
-	} else {
-		// nothing to do
-		return
-	}
-
-	fmt.Print("deleting duplicate tag ids: ")
-	fmt.Println(duplicates)
-
-	for _, el := range duplicates {
-		query := fmt.Sprintf("SELECT tag_id FROM tags WHERE tag_name='%s'", el)
-		rows := database.Query(query)
-		ids := []uint32{}
-		for rows.Next() {
-			var id uint32
-			err := rows.Scan(&id)
-			if err != nil {
-				panic(err.Error()) // proper Error handling instead of panic in your app
-			}
-			ids = append(ids, id)
-		}
-
-		// id to copy other data to
-		mainid := ids[0]
-
-		// ids to copy from
-		copyids := ids[1:]
-
-		fmt.Printf("Migrating %s\n", el)
-		migrateTags(mainid, copyids)
-	}
-}
-
-func migrateTags(destid uint32, sourcids []uint32) {
-	querytempl := `
-UPDATE video_tags 
-SET 
-    tag_id = %d
-WHERE
-    tag_id = %d`
-
-	for _, id := range sourcids {
-		err := database.Edit(fmt.Sprintf(querytempl, destid, id))
-		if err != nil {
-			fmt.Printf("failed to set id from %d to %d\n", id, destid)
-			return
-		}
-		fmt.Printf("Merged %d into %d\n", id, destid)
-
-		// now lets delete this tag
-		query := fmt.Sprintf(`DELETE FROM tags WHERE tag_id=%d`, id)
-		err = database.Edit(query)
-		if err != nil {
-			fmt.Printf("failed to delete Tag %d", id)
-			return
-		}
-	}
-}

apiGo/housekeeping/VideoTagDeduplication.go

@@ -1,37 +0,0 @@
-package housekeeping
-
-import (
-	"fmt"
-	"openmediacenter/apiGo/database"
-)
-
-func deduplicateVideoTags() {
-	// gives first occurence of duplicate
-	query := `
-SELECT
-    tag_id, video_id, count(tag_id)
-FROM
-    video_tags
-GROUP BY tag_id, video_id
-HAVING COUNT(tag_id) > 1`
-	rows := database.Query(query)
-	if rows != nil {
-		for rows.Next() {
-			var tagid uint32
-			var vidid uint32
-			var nr uint32
-			err := rows.Scan(&tagid, &vidid, &nr)
-			if err != nil {
-				panic(err.Error()) // proper Error handling instead of panic in your app
-			}
-
-			// now lets delete this tag
-			query := fmt.Sprintf(`DELETE FROM video_tags WHERE tag_id=%d AND video_id=%d LIMIT %d`, tagid, vidid, nr-1)
-			err = database.Edit(query)
-			if err != nil {
-				fmt.Printf("failed to delete Tag %d + vid %d", tagid, vidid)
-				return
-			}
-		}
-	}
-}

apiGo/main.go

@@ -1,13 +1,11 @@
 package main
 
 import (
-	"flag"
 	"fmt"
 	"openmediacenter/apiGo/api"
 	api2 "openmediacenter/apiGo/api/api"
 	"openmediacenter/apiGo/config"
 	"openmediacenter/apiGo/database"
-	"openmediacenter/apiGo/housekeeping"
 	"openmediacenter/apiGo/static"
 	"openmediacenter/apiGo/videoparser"
 	"os"
@@ -19,8 +17,6 @@ func main() {
 	const port uint16 = 8081
 	errc := make(chan error, 1)
 
-	housekPTr := flag.Bool("HouseKeeping", false, "Run housekeeping tasks")
-
 	config.Init()
 
 	// todo some verbosity logger or sth
@@ -33,16 +29,9 @@ func main() {
 	}
 	defer database.Close()
 
-	// check if we should run the housekeeping tasks
-	if *housekPTr {
-		housekeeping.RunHouseKeepingTasks()
-		return
-	}
-
 	api.AddHandlers()
 
 	videoparser.SetupSettingsWebsocket()
-	videoparser.InitFileWatcher()
 
 	// add the static files
 	static.ServeStaticFiles()

apiGo/videoparser/FileWatcher.go

@@ -1,58 +0,0 @@
-package videoparser
-
-import (
-	"github.com/fsnotify/fsnotify"
-	"log"
-	"openmediacenter/apiGo/config"
-	"openmediacenter/apiGo/database"
-	"strings"
-)
-
-func InitFileWatcher() {
-	watcher, err := fsnotify.NewWatcher()
-	if err != nil {
-		log.Fatal("NewWatcher failed: ", err)
-	}
-
-	mSettings, _, _ := database.GetSettings()
-	vidFolder := config.GetConfig().General.ReindexPrefix + mSettings.VideoPath
-	epsfolder := config.GetConfig().General.ReindexPrefix + mSettings.EpisodePath
-
-	defer watcher.Close()
-	go func() {
-		for {
-			select {
-			case event, ok := <-watcher.Events:
-				if !ok {
-					return
-				}
-				// start new reindex
-				// (may be optimized by checking here if added file is video
-				// and start reindex just for one file)
-				if strings.Contains(event.Name, vidFolder) {
-					StartReindex()
-				} else if strings.Contains(event.Name, epsfolder) {
-					StartTVShowReindex()
-				} else {
-					log.Printf("Event in wrong folder: %s %s\n", event.Name, event.Op)
-				}
-			case err, ok := <-watcher.Errors:
-				if !ok {
-					return
-				}
-				log.Println("error:", err)
-			}
-		}
-
-	}()
-
-	err = watcher.Add(vidFolder)
-	if err != nil {
-		log.Println("Adding of file watcher failed: ", err)
-	}
-
-	err = watcher.Add(epsfolder)
-	if err != nil {
-		log.Println("Adding of file watcher failed: ", err)
-	}
-}

apiGo/videoparser/ReIndexTVShows.go

@@ -25,18 +25,20 @@ func startTVShowReindex(files []Show) {
 }
 
 func insertEpisodesIfNotExisting(show Show) {
-	query := "SELECT filename FROM tvshow_episodes JOIN tvshow t on t.id = tvshow_episodes.tvshow_id WHERE t.name=?"
+	query := "SELECT tvshow_episodes.name, season, episode FROM tvshow_episodes JOIN tvshow t on t.id = tvshow_episodes.tvshow_id WHERE t.name=?"
 	rows := database.Query(query, show.Name)
 
 	var dbepisodes []string
 	for rows.Next() {
-		var filename string
+		var epname string
-		err := rows.Scan(&filename)
+		var season int
+		var episode int
+		err := rows.Scan(&epname, &season, &episode)
 		if err != nil {
 			fmt.Println(err.Error())
 		}
 
-		dbepisodes = append(dbepisodes, filename)
+		dbepisodes = append(dbepisodes, fmt.Sprintf("%s S%02dE%02d.mp4", epname, season, episode))
 	}
 
 	// get those episodes that are missing in db
@@ -81,10 +83,6 @@ 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{}{}
@@ -131,10 +129,7 @@ func getAllTVShows() *[]string {
 	var res []string
 	for rows.Next() {
 		var show string
-		err := rows.Scan(&show)
+		rows.Scan(&show)
-		if err != nil {
-			continue
-		}
 
 		res = append(res, show)
 	}

apiGo/videoparser/VideoParser.go

@@ -6,6 +6,7 @@ import (
 	"openmediacenter/apiGo/config"
 	"openmediacenter/apiGo/database"
 	"os"
+	"path/filepath"
 	"strings"
 )
 
@@ -14,20 +15,6 @@ 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")
@@ -46,19 +33,22 @@ func StartReindex() bool {
 		return false
 	}
 
-	filelist, err := ioutil.ReadDir(vidFolder)
+	var files []string
+	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") {
+			files = append(files, info.Name())
+		}
+		return nil
+	})
+
 	if err != nil {
 		fmt.Println(err.Error())
-		return false
 	}
-
-	var files []string
-	for _, file := range filelist {
-		if !file.IsDir() && ValidVideoSuffix(file.Name()) {
-			files = append(files, file.Name())
-		}
-	}
-
 	// start reindex process
 	AppendMessage("Starting Reindexing!")
 	InitDeps(&mSettings)
@@ -117,7 +107,7 @@ func StartTVShowReindex() {
 			}
 
 			for _, epfile := range episodefiles {
-				if ValidVideoSuffix(epfile.Name()) {
+				if strings.HasSuffix(epfile.Name(), ".mp4") {
 					elem.files = append(elem.files, epfile.Name())
 				}
 			}

src/pages/HomePage/HomePage.test.js

@@ -90,14 +90,12 @@ describe('<HomePage/>', function () {
         const wrapper = shallow(<HomePage/>);
 
         // expect those default values
-        expect(wrapper.state().sortby).toBe('Date Added');
+        expect(wrapper.state().sortby).toBe(0);
-        expect(wrapper.instance().sortState).toBe(SortBy.date);
         expect(wrapper.instance().tagState).toBe(DefaultTags.all);
 
-        wrapper.instance().onDropDownItemClick(SortBy.name, 'namesort');
+        wrapper.instance().onDropDownItemClick(SortBy.name);
 
-        expect(wrapper.state().sortby).toBe('namesort');
+        expect(wrapper.state().sortby).toBe(SortBy.name);
-        expect(wrapper.instance().sortState).toBe(SortBy.name);
     });
 });
 

src/pages/HomePage/HomePage.tsx

@@ -29,7 +29,7 @@ interface state {
     subtitle: string;
     data: VideoTypes.VideoUnloadedType[];
     selectionnr: number;
-    sortby: string;
+    sortby: SortBy;
 }
 
 /**
@@ -39,9 +39,33 @@ export class HomePage extends React.Component<Props, state> {
     /** keyword variable needed temporary store search keyword */
     keyword = '';
 
+    /**
+     * get text label from sort type
+     * @param type SortBy type
+     */
+    getLabelFromSortType(type: SortBy): String {
+        switch (type) {
+            case SortBy.date:
+                return 'Date Added';
+            case SortBy.length:
+                return 'Length';
+            case SortBy.likes:
+                return 'Most likes';
+            case SortBy.name:
+                return 'Name';
+            case SortBy.random:
+                return 'Random';
+            default:
+                return '';
+        }
+    }
+
     constructor(props: Props) {
         super(props);
 
+        // get previously stored location from localstorage
+        const storedSelection = global.localStorage.getItem('sortby');
+
         this.state = {
             sideinfo: {
                 VideoNr: 0,
@@ -54,11 +78,10 @@ export class HomePage extends React.Component<Props, state> {
             subtitle: 'All Videos',
             data: [],
             selectionnr: 0,
-            sortby: 'Date Added'
+            sortby: storedSelection == null ? SortBy.date : parseInt(storedSelection, 10)
         };
     }
 
-    sortState = SortBy.random;
     tagState = DefaultTags.all;
 
     componentDidMount(): void {
@@ -87,7 +110,7 @@ export class HomePage extends React.Component<Props, state> {
     fetchVideoData(): void {
         callAPI(
             APINode.Video,
-            {action: 'getMovies', Tag: this.tagState.TagId, Sort: this.sortState},
+            {action: 'getMovies', Tag: this.tagState.TagId, Sort: this.state.sortby},
             (result: {Videos: VideoTypes.VideoUnloadedType[]; TagName: string}) => {
                 this.setState({
                     data: result.Videos,
@@ -190,15 +213,25 @@ export class HomePage extends React.Component<Props, state> {
                     <span className={style.sortbyLabel}>Sort By: </span>
                     <div className={style.dropdown}>
                         <span className={style.dropbtn}>
-                            <span>{this.state.sortby}</span>
+                            <span>{this.getLabelFromSortType(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.date)}>
-                            <span onClick={(): void => this.onDropDownItemClick(SortBy.likes, 'Most likes')}>Most likes</span>
+                                {this.getLabelFromSortType(SortBy.date)}
-                            <span onClick={(): void => this.onDropDownItemClick(SortBy.random, 'Random')}>Random</span>
+                            </span>
-                            <span onClick={(): void => this.onDropDownItemClick(SortBy.name, 'Name')}>Name</span>
+                            <span onClick={(): void => this.onDropDownItemClick(SortBy.likes)}>
-                            <span onClick={(): void => this.onDropDownItemClick(SortBy.length, 'Length')}>Length</span>
+                                {this.getLabelFromSortType(SortBy.likes)}
+                            </span>
+                            <span onClick={(): void => this.onDropDownItemClick(SortBy.random)}>
+                                {this.getLabelFromSortType(SortBy.random)}
+                            </span>
+                            <span onClick={(): void => this.onDropDownItemClick(SortBy.name)}>
+                                {this.getLabelFromSortType(SortBy.name)}
+                            </span>
+                            <span onClick={(): void => this.onDropDownItemClick(SortBy.length)}>
+                                {this.getLabelFromSortType(SortBy.length)}
+                            </span>
                         </div>
                     </div>
                 </div>
@@ -214,10 +247,12 @@ export class HomePage extends React.Component<Props, state> {
      * @param type type of sort action
      * @param name new header title
      */
-    onDropDownItemClick(type: SortBy, name: string): void {
+    onDropDownItemClick(type: SortBy): void {
-        this.sortState = type;
+        this.setState({sortby: type}, (): void => {
-        this.setState({sortby: name});
+            global.localStorage.setItem('sortby', type.toString());
-        this.fetchVideoData();
+
+            this.fetchVideoData();
+        });
     }
 }
 

src/pages/RandomPage/RandomPage.tsx

@@ -2,21 +2,16 @@ import React from 'react';
 import style from './RandomPage.module.css';
 import SideBar, {SideBarTitle} from '../../elements/SideBar/SideBar';
 import Tag from '../../elements/Tag/Tag';
-import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
+import PageTitle from '../../elements/PageTitle/PageTitle';
 import VideoContainer from '../../elements/VideoContainer/VideoContainer';
 import {APINode, callAPI} from '../../utils/Api';
 import {TagType} from '../../types/VideoTypes';
 import {VideoTypes} from '../../types/ApiTypes';
 import {addKeyHandler, removeKeyHandler} from '../../utils/ShortkeyHandler';
-import {IconButton} from '../../elements/GPElements/Button';
-import {faMinusCircle, faPlusCircle} from '@fortawesome/free-solid-svg-icons';
-import AddTagPopup from '../../elements/Popups/AddTagPopup/AddTagPopup';
 
 interface state {
     videos: VideoTypes.VideoUnloadedType[];
     tags: TagType[];
-    filterTags: TagType[];
-    addTagPopup: boolean;
 }
 
 interface GetRandomMoviesType {
@@ -30,19 +25,30 @@ interface GetRandomMoviesType {
 class RandomPage extends React.Component<{}, state> {
     readonly LoadNR = 3;
 
+    // random seed to load videos, remains page reload.
+    seed = this.genRandInt();
+
     constructor(props: {}) {
         super(props);
 
+        // get previously stored location from localstorage
+        const storedseed = global.localStorage.getItem('randpageseed');
+        if (storedseed != null) {
+            this.seed = parseInt(storedseed, 10);
+        }
+
         this.state = {
-            addTagPopup: false,
             videos: [],
-            tags: [],
+            tags: []
-            filterTags: []
         };
 
         this.keypress = this.keypress.bind(this);
     }
 
+    genRandInt(): number {
+        return Math.floor(Math.random() * 2147483647) + 1;
+    }
+
     componentDidMount(): void {
         addKeyHandler(this.keypress);
 
@@ -56,76 +62,55 @@ class RandomPage extends React.Component<{}, state> {
     render(): JSX.Element {
         return (
             <div>
-                <PageTitle title='Random Videos' subtitle='3pc' />
+                <PageTitle title='Random Videos' subtitle='4pc' />
 
                 <SideBar>
                     <SideBarTitle>Visible Tags:</SideBarTitle>
                     {this.state.tags.map((m) => (
                         <Tag key={m.TagId} tagInfo={m} />
                     ))}
-                    <Line />
-                    <SideBarTitle>Filter Tags:</SideBarTitle>
-                    {this.state.filterTags.map((m) => (
-                        <Tag key={m.TagId} tagInfo={m} />
-                    ))}
-                    <IconButton
-                        title='Add'
-                        icon={faPlusCircle}
-                        onClick={(): void => {
-                            this.setState({addTagPopup: true});
-                        }}
-                    />
-                    {this.state.filterTags.length > 0 ? (
-                        <IconButton
-                            title='Remove All'
-                            icon={faMinusCircle}
-                            onClick={(): void => {
-                                this.setState({filterTags: []}, (): void => {
-                                    this.loadShuffledvideos(this.LoadNR);
-                                });
-                            }}
-                        />
-                    ) : (
-                        <></>
-                    )}
                 </SideBar>
 
-                {this.state.videos.length !== 0 ? <VideoContainer data={this.state.videos} /> : <div>No Data found!</div>}
+                {this.state.videos.length !== 0 ? (
-                <div className={style.Shufflebutton}>
+                    <VideoContainer data={this.state.videos}>
-                    <button onClick={(): void => this.loadShuffledvideos(this.LoadNR)} className={style.btnshuffle}>
+                        <div className={style.Shufflebutton}>
-                        Shuffle
+                            <button onClick={(): void => this.shuffleclick()} className={style.btnshuffle}>
-                    </button>
+                                Shuffle
-                </div>
+                            </button>
-                {this.state.addTagPopup ? (
+                        </div>
-                    <AddTagPopup
+                    </VideoContainer>
-                        onHide={(): void => this.setState({addTagPopup: false})}
+                ) : (
-                        submit={(tagId: number, tagName: string): void => {
+                    <div>No Data found!</div>
-                            this.setState({filterTags: [...this.state.filterTags, {TagId: tagId, TagName: tagName}]}, (): void => {
+                )}
-                                this.loadShuffledvideos(this.LoadNR);
-                            });
-                        }}
-                    />
-                ) : null}
             </div>
         );
     }
 
+    /**
+     * click handler for shuffle btn
+     */
+    shuffleclick(): void {
+        this.genSeed();
+        this.loadShuffledvideos(this.LoadNR);
+    }
+
+    genSeed(): void {
+        this.seed = this.genRandInt();
+        global.localStorage.setItem('randpageseed', this.seed.toString());
+    }
+
     /**
      * load random videos from backend
      * @param nr number of videos to load
      */
     loadShuffledvideos(nr: number): void {
-        callAPI<GetRandomMoviesType>(
+        callAPI<GetRandomMoviesType>(APINode.Video, {action: 'getRandomMovies', Number: nr, Seed: this.seed}, (result) => {
-            APINode.Video,
+            this.setState({videos: []}); // needed to trigger rerender of main videoview
-            {action: 'getRandomMovies', Number: nr, TagFilter: this.state.filterTags.map((t) => t.TagId)},
+            this.setState({
-            (result) => {
+                videos: result.Videos,
-                this.setState({videos: []}); // needed to trigger rerender of main videoview
+                tags: result.Tags
-                this.setState({
+            });
-                    videos: result.Videos,
+        });
-                    tags: result.Tags
-                });
-            }
-        );
     }
 
     /**
@@ -135,7 +120,8 @@ class RandomPage extends React.Component<{}, state> {
     private keypress(event: KeyboardEvent): void {
         // bind s to shuffle
         if (event.key === 's') {
-            this.loadShuffledvideos(3);
+            this.genSeed();
+            this.loadShuffledvideos(this.LoadNR);
         }
     }
 }

src/pages/TVShowPage/EpisodePage.tsx

@@ -66,7 +66,7 @@ export class EpisodePage extends React.Component<Props, State> {
 export const EpisodeTile = (props: {episode: Episode}): JSX.Element => {
     const themestyle = GlobalInfos.getThemeStyle();
     return (
-        <Link to={'/media/tvplayer/' + props.episode.ID}>
+        <Link to={'/tvplayer/' + props.episode.ID}>
             <div className={tileStyle.tile + ' ' + themestyle.secbackground + ' ' + themestyle.textcolor}>
                 <FontAwesomeIcon
                     style={{

src/pages/TVShowPage/TVShowPage.tsx

@@ -55,7 +55,7 @@ export class TVShowPage extends React.Component<Props, State> {
                                         (result) => callback(result)
                                     );
                                 }}
-                                linkPath={'/media/tvshows/' + elem.Id}
+                                linkPath={'/tvshows/' + elem.Id}
                             />
                         )}
                         data={this.state.loading ? [] : this.data}

yarn.lock

@@ -3538,9 +3538,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001219:
-  version "1.0.30001336"
+  version "1.0.30001236"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001336.tgz"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz#0a80de4cdf62e1770bb46a30d884fc8d633e3958"
-  integrity sha512-/YxSlBmL7iKXTbIJ48IQTnAOBk7XmWsxhBF1PZLOko5Dt9qc4Pl+84lfqG3Tc4EuavurRn1QLoVJGxY2iSycfw==
+  integrity sha512-o0PRQSrSCGJKCPZcgMzl5fUaj5xHe8qA2m4QRvnyY4e1lITqoNkr7q/Oh1NcpGSy0Th97UZ35yoKcINPoq7YOQ==
 
 capture-exit@^2.0.0:
   version "2.0.0"