Compare commits
	
		
			17 Commits
		
	
	
		
			rememberLo
			...
			hls_on_the
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 5b8a63c0aa | |||
| af1de3a244 | |||
| 752200d42e | |||
| 39ed5cd7d8 | |||
| 5d409c3e23 | |||
| 05ea72a8ca | |||
| 7476e2397d | |||
| 929e0c337d | |||
| f7a0d8fa07 | |||
| 9faf457c89 | |||
| 11c1e25de5 | |||
| 3d845aaf04 | |||
| 7f98528fbe | |||
| 191fa5386d | |||
| 9715012685 | |||
| dfcb7f71d9 | |||
| 61ea42ef01 | 
@@ -108,18 +108,13 @@ Debian_Server:
 | 
				
			|||||||
      - Minimize_Frontend
 | 
					      - Minimize_Frontend
 | 
				
			||||||
      - Build_Backend
 | 
					      - Build_Backend
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Test_Server:
 | 
					.Test_Server_Common:
 | 
				
			||||||
  stage: deploy
 | 
					  stage: deploy
 | 
				
			||||||
  image: luki42/ssh:latest
 | 
					  image: luki42/ssh:latest
 | 
				
			||||||
  needs:
 | 
					  needs:
 | 
				
			||||||
    - Frontend_Tests
 | 
					    - Frontend_Tests
 | 
				
			||||||
    - Backend_Tests
 | 
					    - Backend_Tests
 | 
				
			||||||
    - Debian_Server
 | 
					    - Debian_Server
 | 
				
			||||||
  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:
 | 
					  script:
 | 
				
			||||||
    - eval $(ssh-agent -s)
 | 
					    - eval $(ssh-agent -s)
 | 
				
			||||||
    - echo "$SSH_PRIVATE_KEY" | ssh-add -
 | 
					    - echo "$SSH_PRIVATE_KEY" | ssh-add -
 | 
				
			||||||
@@ -129,24 +124,38 @@ Test_Server:
 | 
				
			|||||||
    - ssh root@192.168.0.42 "DEBIAN_FRONTEND=noninteractive apt-get --reinstall  -y -qq install /tmp/OpenMediaCenter-*.deb && rm /tmp/OpenMediaCenter-*.deb"
 | 
					    - ssh root@192.168.0.42 "DEBIAN_FRONTEND=noninteractive apt-get --reinstall  -y -qq install /tmp/OpenMediaCenter-*.deb && rm /tmp/OpenMediaCenter-*.deb"
 | 
				
			||||||
  allow_failure: true
 | 
					  allow_failure: true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Test_Server_2:
 | 
					Test_Server_CD:
 | 
				
			||||||
 | 
					  extends: .Test_Server_Common
 | 
				
			||||||
 | 
					  only:
 | 
				
			||||||
 | 
					    refs:
 | 
				
			||||||
 | 
					      - master
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Test_Server_MANUAL:
 | 
				
			||||||
 | 
					  extends: .Test_Server_Common
 | 
				
			||||||
 | 
					  when: manual
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.Test_Server_2_Common:
 | 
				
			||||||
  stage: deploy
 | 
					  stage: deploy
 | 
				
			||||||
  image: luki42/ssh:latest
 | 
					  image: luki42/ssh:latest
 | 
				
			||||||
  needs:
 | 
					  needs:
 | 
				
			||||||
    - Frontend_Tests
 | 
					    - Frontend_Tests
 | 
				
			||||||
    - Backend_Tests
 | 
					    - Backend_Tests
 | 
				
			||||||
    - Debian_Server
 | 
					    - 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:
 | 
					  script:
 | 
				
			||||||
    - eval $(ssh-agent -s)
 | 
					    - eval $(ssh-agent -s)
 | 
				
			||||||
    - echo "$SSH_PRIVATE_KEY_2" | ssh-add -
 | 
					    - echo "$SSH_PRIVATE_KEY_2" | ssh-add -
 | 
				
			||||||
    - mkdir -p ~/.ssh
 | 
					    - mkdir -p ~/.ssh
 | 
				
			||||||
    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 | 
					    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 | 
				
			||||||
    - scp deb/OpenMediaCenter-*.deb root@192.168.0.209:/tmp/
 | 
					    - scp deb/OpenMediaCenter-*.deb root@192.168.0.44:/tmp/
 | 
				
			||||||
    - ssh root@192.168.0.209 "DEBIAN_FRONTEND=noninteractive apt-get --reinstall  -y -qq install /tmp/OpenMediaCenter-*.deb && rm /tmp/OpenMediaCenter-*.deb"
 | 
					    - ssh root@192.168.0.44 "DEBIAN_FRONTEND=noninteractive apt-get --reinstall  -y -qq install /tmp/OpenMediaCenter-*.deb && rm /tmp/OpenMediaCenter-*.deb"
 | 
				
			||||||
  allow_failure: true
 | 
					  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
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -25,7 +25,7 @@ func getActorsFromDB() {
 | 
				
			|||||||
	 * @apiSuccess {string} .Thumbnail Portrait Thumbnail
 | 
						 * @apiSuccess {string} .Thumbnail Portrait Thumbnail
 | 
				
			||||||
	 */
 | 
						 */
 | 
				
			||||||
	api.AddHandler("getAllActors", api.ActorNode, api.PermUser, func(context api.Context) {
 | 
						api.AddHandler("getAllActors", api.ActorNode, api.PermUser, func(context api.Context) {
 | 
				
			||||||
		query := "SELECT actor_id, name, thumbnail FROM actors"
 | 
							query := "SELECT actor_id, name, thumbnail FROM actors ORDER BY name ASC"
 | 
				
			||||||
		context.Json(readActorsFromResultset(database.Query(query)))
 | 
							context.Json(readActorsFromResultset(database.Query(query)))
 | 
				
			||||||
	})
 | 
						})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,6 @@ import (
 | 
				
			|||||||
	"openmediacenter/apiGo/database"
 | 
						"openmediacenter/apiGo/database"
 | 
				
			||||||
	"openmediacenter/apiGo/videoparser"
 | 
						"openmediacenter/apiGo/videoparser"
 | 
				
			||||||
	"os"
 | 
						"os"
 | 
				
			||||||
	"path/filepath"
 | 
					 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func addUploadHandler() {
 | 
					func addUploadHandler() {
 | 
				
			||||||
@@ -31,11 +30,11 @@ func addUploadHandler() {
 | 
				
			|||||||
				break
 | 
									break
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			// todo allow more video formats than mp4
 | 
					 | 
				
			||||||
			// only allow valid extensions
 | 
								// only allow valid extensions
 | 
				
			||||||
			if filepath.Ext(part.FileName()) != ".mp4" {
 | 
								if !videoparser.ValidVideoSuffix(part.FileName()) {
 | 
				
			||||||
				continue
 | 
									continue
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			vidpath := PathPrefix + mSettings.VideoPath + part.FileName()
 | 
								vidpath := PathPrefix + mSettings.VideoPath + part.FileName()
 | 
				
			||||||
			dst, err := os.OpenFile(vidpath, os.O_WRONLY|os.O_CREATE, 0644)
 | 
								dst, err := os.OpenFile(vidpath, os.O_WRONLY|os.O_CREATE, 0644)
 | 
				
			||||||
			if err != nil {
 | 
								if err != nil {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -78,7 +78,7 @@ func getFromDB() {
 | 
				
			|||||||
	 * @apiSuccess {string} TagName name of the Tag
 | 
						 * @apiSuccess {string} TagName name of the Tag
 | 
				
			||||||
	 */
 | 
						 */
 | 
				
			||||||
	api.AddHandler("getAllTags", api.TagNode, api.PermUser, func(context api.Context) {
 | 
						api.AddHandler("getAllTags", api.TagNode, api.PermUser, func(context api.Context) {
 | 
				
			||||||
		query := "SELECT tag_id,tag_name from tags"
 | 
							query := "SELECT tag_id,tag_name from tags ORDER BY tag_name ASC"
 | 
				
			||||||
		context.Json(readTagsFromResultset(database.Query(query)))
 | 
							context.Json(readTagsFromResultset(database.Query(query)))
 | 
				
			||||||
	})
 | 
						})
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,14 +1,19 @@
 | 
				
			|||||||
package api
 | 
					package api
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
 | 
						"encoding/json"
 | 
				
			||||||
	"fmt"
 | 
						"fmt"
 | 
				
			||||||
 | 
						"net/http"
 | 
				
			||||||
	"net/url"
 | 
						"net/url"
 | 
				
			||||||
	"openmediacenter/apiGo/api/api"
 | 
						"openmediacenter/apiGo/api/api"
 | 
				
			||||||
	"openmediacenter/apiGo/api/types"
 | 
						"openmediacenter/apiGo/api/types"
 | 
				
			||||||
	"openmediacenter/apiGo/config"
 | 
						"openmediacenter/apiGo/config"
 | 
				
			||||||
	"openmediacenter/apiGo/database"
 | 
						"openmediacenter/apiGo/database"
 | 
				
			||||||
 | 
						"openmediacenter/apiGo/videoparser/hls"
 | 
				
			||||||
	"os"
 | 
						"os"
 | 
				
			||||||
 | 
						"os/exec"
 | 
				
			||||||
	"strconv"
 | 
						"strconv"
 | 
				
			||||||
 | 
						"strings"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func addVideoHandlers() {
 | 
					func addVideoHandlers() {
 | 
				
			||||||
@@ -163,6 +168,7 @@ func getVideoHandlers() {
 | 
				
			|||||||
	api.AddHandler("getRandomMovies", api.VideoNode, api.PermUser, func(context api.Context) {
 | 
						api.AddHandler("getRandomMovies", api.VideoNode, api.PermUser, func(context api.Context) {
 | 
				
			||||||
		var args struct {
 | 
							var args struct {
 | 
				
			||||||
			Number    int
 | 
								Number    int
 | 
				
			||||||
 | 
								TagFilter []uint32
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		if api.DecodeRequest(context.GetRequest(), &args) != nil {
 | 
							if api.DecodeRequest(context.GetRequest(), &args) != nil {
 | 
				
			||||||
			context.Text("unable to decode request")
 | 
								context.Text("unable to decode request")
 | 
				
			||||||
@@ -174,9 +180,23 @@ func getVideoHandlers() {
 | 
				
			|||||||
			Videos []types.VideoUnloadedType
 | 
								Videos []types.VideoUnloadedType
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		query := fmt.Sprintf("SELECT movie_id,movie_name FROM videos ORDER BY RAND() LIMIT %d", args.Number)
 | 
							whereclause := "WHERE 1"
 | 
				
			||||||
 | 
							if len(args.TagFilter) > 0 {
 | 
				
			||||||
 | 
								d, _ := json.Marshal(args.TagFilter)
 | 
				
			||||||
 | 
								vals := strings.Trim(string(d), "[]")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								whereclause = fmt.Sprintf("WHERE tag_id IN (%s)", vals)
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							query := fmt.Sprintf(`
 | 
				
			||||||
 | 
					SELECT video_tags.video_id,v.movie_name FROM video_tags join videos v on v.movie_id = video_tags.video_id
 | 
				
			||||||
 | 
					                                        %s
 | 
				
			||||||
 | 
					                                        group by video_id
 | 
				
			||||||
 | 
					                                        ORDER BY RAND()
 | 
				
			||||||
 | 
					                                        LIMIT %d`, whereclause, args.Number)
 | 
				
			||||||
		result.Videos = readVideosFromResultset(database.Query(query))
 | 
							result.Videos = readVideosFromResultset(database.Query(query))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							if len(result.Videos) > 0 {
 | 
				
			||||||
			var ids string
 | 
								var ids string
 | 
				
			||||||
			for i := range result.Videos {
 | 
								for i := range result.Videos {
 | 
				
			||||||
				ids += "video_tags.video_id=" + strconv.Itoa(result.Videos[i].MovieId)
 | 
									ids += "video_tags.video_id=" + strconv.Itoa(result.Videos[i].MovieId)
 | 
				
			||||||
@@ -193,7 +213,7 @@ func getVideoHandlers() {
 | 
				
			|||||||
									GROUP BY t.tag_id`, ids)
 | 
														GROUP BY t.tag_id`, ids)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			rows := database.Query(query)
 | 
								rows := database.Query(query)
 | 
				
			||||||
 | 
								if rows != nil {
 | 
				
			||||||
				for rows.Next() {
 | 
									for rows.Next() {
 | 
				
			||||||
					var tag types.Tag
 | 
										var tag types.Tag
 | 
				
			||||||
					err := rows.Scan(&tag.TagName, &tag.TagId)
 | 
										err := rows.Scan(&tag.TagName, &tag.TagId)
 | 
				
			||||||
@@ -203,6 +223,10 @@ func getVideoHandlers() {
 | 
				
			|||||||
					// append to final array
 | 
										// append to final array
 | 
				
			||||||
					result.Tags = append(result.Tags, tag)
 | 
										result.Tags = append(result.Tags, tag)
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
							} else {
 | 
				
			||||||
 | 
								result.Tags = []types.Tag{}
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		context.Json(result)
 | 
							context.Json(result)
 | 
				
			||||||
	})
 | 
						})
 | 
				
			||||||
@@ -377,6 +401,62 @@ func loadVideosHandlers() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
		context.Json(result)
 | 
							context.Json(result)
 | 
				
			||||||
	})
 | 
						})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						api.AddHandler("loadM3U8", api.VideoNode, api.PermUnauthorized, func(ctx api.Context) {
 | 
				
			||||||
 | 
							param := ctx.GetRequest().URL.Query().Get("id")
 | 
				
			||||||
 | 
							id, _ := strconv.Atoi(param)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							mylist :=
 | 
				
			||||||
 | 
								`#EXTM3U
 | 
				
			||||||
 | 
					#EXT-X-VERSION:4
 | 
				
			||||||
 | 
					#EXT-X-MEDIA-SEQUENCE:0
 | 
				
			||||||
 | 
					#EXT-X-ALLOW-CACHE:NO
 | 
				
			||||||
 | 
					#EXT-X-TARGETDURATION:10
 | 
				
			||||||
 | 
					#EXT-X-START:TIME-OFFSET=0
 | 
				
			||||||
 | 
					#EXT-X-PLAYLIST-TYPE:VOD
 | 
				
			||||||
 | 
					`
 | 
				
			||||||
 | 
							// ffprobe -v error -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 input.mp4
 | 
				
			||||||
 | 
							cmd := exec.Command("ffprobe",
 | 
				
			||||||
 | 
								"-v", "error",
 | 
				
			||||||
 | 
								"-show_entries", "format=duration",
 | 
				
			||||||
 | 
								"-of", "default=noprint_wrappers=1:nokey=1",
 | 
				
			||||||
 | 
								hls.GetVideoPathById(uint32(id)))
 | 
				
			||||||
 | 
							stdout, err := cmd.Output()
 | 
				
			||||||
 | 
							//
 | 
				
			||||||
 | 
							if err != nil {
 | 
				
			||||||
 | 
								fmt.Println(err.Error())
 | 
				
			||||||
 | 
								fmt.Println(string(err.(*exec.ExitError).Stderr))
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							secss, _, _ := strings.Cut(string(stdout), ".")
 | 
				
			||||||
 | 
							secsi, err := strconv.Atoi(secss)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							i := 0
 | 
				
			||||||
 | 
							for ; i < secsi/10; i++ {
 | 
				
			||||||
 | 
								mylist += fmt.Sprintf(
 | 
				
			||||||
 | 
									`#EXTINF:10.0,
 | 
				
			||||||
 | 
					/api/video/getVideoSegment?id=%d&idx=%d
 | 
				
			||||||
 | 
					`, id, i)
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							mylist += fmt.Sprintf(
 | 
				
			||||||
 | 
								`#EXTINF:%s,
 | 
				
			||||||
 | 
					/api/video/getVideoSegment?id=%d&idx=%d
 | 
				
			||||||
 | 
					EXT-X-ENDLIST
 | 
				
			||||||
 | 
					`, fmt.Sprintf("%d.0", secsi%10), id, i)
 | 
				
			||||||
 | 
							ctx.Text(mylist)
 | 
				
			||||||
 | 
						})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						api.AddHandler("getVideoSegment", api.VideoNode, api.PermUnauthorized, func(ctx api.Context) {
 | 
				
			||||||
 | 
							params := ctx.GetRequest().URL.Query()
 | 
				
			||||||
 | 
							idxs := params.Get("idx")
 | 
				
			||||||
 | 
							ids := params.Get("id")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							id, _ := strconv.Atoi(ids)
 | 
				
			||||||
 | 
							idx, _ := strconv.Atoi(idxs)
 | 
				
			||||||
 | 
							// todo error handling
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							tmppath := hls.GetSegment(uint32(idx), uint32(id))
 | 
				
			||||||
 | 
							http.ServeFile(ctx.GetWriter(), ctx.GetRequest(), tmppath)
 | 
				
			||||||
 | 
						})
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func addToVideoHandlers() {
 | 
					func addToVideoHandlers() {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,7 +21,7 @@ func (p Perm) String() string {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const SignKey = "89013f1753a6890c6090b09e3c23ff43"
 | 
					const SignKey = "89013f1753a6890c6090b09e3c23ff43"
 | 
				
			||||||
const TokenExpireHours = 24
 | 
					const TokenExpireHours = 8760
 | 
				
			||||||
 | 
					
 | 
				
			||||||
type Token struct {
 | 
					type Token struct {
 | 
				
			||||||
	Token     string
 | 
						Token     string
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,6 @@ import (
 | 
				
			|||||||
	"encoding/json"
 | 
						"encoding/json"
 | 
				
			||||||
	"fmt"
 | 
						"fmt"
 | 
				
			||||||
	"net/http"
 | 
						"net/http"
 | 
				
			||||||
	"reflect"
 | 
					 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func Jsonify(v interface{}) []byte {
 | 
					func Jsonify(v interface{}) []byte {
 | 
				
			||||||
@@ -30,45 +29,3 @@ func DecodeRequest(request *http.Request, arg interface{}) error {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	return err
 | 
						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
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,6 +24,7 @@ type FeaturesT struct {
 | 
				
			|||||||
type GeneralT struct {
 | 
					type GeneralT struct {
 | 
				
			||||||
	VerboseLogging bool
 | 
						VerboseLogging bool
 | 
				
			||||||
	ReindexPrefix  string
 | 
						ReindexPrefix  string
 | 
				
			||||||
 | 
						TmpDir         string
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
type FileConfT struct {
 | 
					type FileConfT struct {
 | 
				
			||||||
@@ -44,6 +45,7 @@ func defaultConfig() *FileConfT {
 | 
				
			|||||||
		General: GeneralT{
 | 
							General: GeneralT{
 | 
				
			||||||
			VerboseLogging: false,
 | 
								VerboseLogging: false,
 | 
				
			||||||
			ReindexPrefix:  "/var/www/openmediacenter",
 | 
								ReindexPrefix:  "/var/www/openmediacenter",
 | 
				
			||||||
 | 
								TmpDir:         "/tmp/openmediacenter",
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		Features: FeaturesT{
 | 
							Features: FeaturesT{
 | 
				
			||||||
			DisableTVSupport:     false,
 | 
								DisableTVSupport:     false,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,6 +5,7 @@ go 1.16
 | 
				
			|||||||
require (
 | 
					require (
 | 
				
			||||||
	github.com/3d0c/gmf v0.0.0-20210925211039-e278e6e53b16
 | 
						github.com/3d0c/gmf v0.0.0-20210925211039-e278e6e53b16
 | 
				
			||||||
	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 | 
						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/go-sql-driver/mysql v1.6.0
 | 
				
			||||||
	github.com/pelletier/go-toml/v2 v2.0.0-beta.3
 | 
						github.com/pelletier/go-toml/v2 v2.0.0-beta.3
 | 
				
			||||||
	github.com/pressly/goose/v3 v3.1.0
 | 
						github.com/pressly/goose/v3 v3.1.0
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,6 +9,8 @@ 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/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 | 
				
			||||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 | 
					github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 | 
				
			||||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 | 
					github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 | 
				
			||||||
 | 
					github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
 | 
				
			||||||
 | 
					github.com/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 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 | 
				
			||||||
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 | 
					github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 | 
				
			||||||
github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 | 
					github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 | 
				
			||||||
@@ -82,8 +84,9 @@ 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-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-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-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-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/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 | 
				
			||||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 | 
					golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 | 
				
			||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 | 
					golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										18
									
								
								apiGo/housekeeping/HouseKeeping.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								apiGo/housekeeping/HouseKeeping.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,18 @@
 | 
				
			|||||||
 | 
					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")
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										5
									
								
								apiGo/housekeeping/MissingVideoMetaData.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								apiGo/housekeeping/MissingVideoMetaData.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,5 @@
 | 
				
			|||||||
 | 
					package housekeeping
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func fixMissingMetadata() {
 | 
				
			||||||
 | 
						// todo
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										86
									
								
								apiGo/housekeeping/TagDeduplication.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										86
									
								
								apiGo/housekeeping/TagDeduplication.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,86 @@
 | 
				
			|||||||
 | 
					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
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										37
									
								
								apiGo/housekeeping/VideoTagDeduplication.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										37
									
								
								apiGo/housekeeping/VideoTagDeduplication.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,37 @@
 | 
				
			|||||||
 | 
					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
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -1,11 +1,13 @@
 | 
				
			|||||||
package main
 | 
					package main
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
 | 
						"flag"
 | 
				
			||||||
	"fmt"
 | 
						"fmt"
 | 
				
			||||||
	"openmediacenter/apiGo/api"
 | 
						"openmediacenter/apiGo/api"
 | 
				
			||||||
	api2 "openmediacenter/apiGo/api/api"
 | 
						api2 "openmediacenter/apiGo/api/api"
 | 
				
			||||||
	"openmediacenter/apiGo/config"
 | 
						"openmediacenter/apiGo/config"
 | 
				
			||||||
	"openmediacenter/apiGo/database"
 | 
						"openmediacenter/apiGo/database"
 | 
				
			||||||
 | 
						"openmediacenter/apiGo/housekeeping"
 | 
				
			||||||
	"openmediacenter/apiGo/static"
 | 
						"openmediacenter/apiGo/static"
 | 
				
			||||||
	"openmediacenter/apiGo/videoparser"
 | 
						"openmediacenter/apiGo/videoparser"
 | 
				
			||||||
	"os"
 | 
						"os"
 | 
				
			||||||
@@ -17,6 +19,8 @@ func main() {
 | 
				
			|||||||
	const port uint16 = 8081
 | 
						const port uint16 = 8081
 | 
				
			||||||
	errc := make(chan error, 1)
 | 
						errc := make(chan error, 1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						housekPTr := flag.Bool("HouseKeeping", false, "Run housekeeping tasks")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	config.Init()
 | 
						config.Init()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// todo some verbosity logger or sth
 | 
						// todo some verbosity logger or sth
 | 
				
			||||||
@@ -29,9 +33,16 @@ func main() {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
	defer database.Close()
 | 
						defer database.Close()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						// check if we should run the housekeeping tasks
 | 
				
			||||||
 | 
						if *housekPTr {
 | 
				
			||||||
 | 
							housekeeping.RunHouseKeepingTasks()
 | 
				
			||||||
 | 
							return
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	api.AddHandlers()
 | 
						api.AddHandlers()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	videoparser.SetupSettingsWebsocket()
 | 
						videoparser.SetupSettingsWebsocket()
 | 
				
			||||||
 | 
						videoparser.InitFileWatcher()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// add the static files
 | 
						// add the static files
 | 
				
			||||||
	static.ServeStaticFiles()
 | 
						static.ServeStaticFiles()
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										58
									
								
								apiGo/videoparser/FileWatcher.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										58
									
								
								apiGo/videoparser/FileWatcher.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,58 @@
 | 
				
			|||||||
 | 
					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)
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -25,20 +25,18 @@ func startTVShowReindex(files []Show) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func insertEpisodesIfNotExisting(show 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)
 | 
						rows := database.Query(query, show.Name)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	var dbepisodes []string
 | 
						var dbepisodes []string
 | 
				
			||||||
	for rows.Next() {
 | 
						for rows.Next() {
 | 
				
			||||||
		var epname string
 | 
							var filename string
 | 
				
			||||||
		var season int
 | 
							err := rows.Scan(&filename)
 | 
				
			||||||
		var episode int
 | 
					 | 
				
			||||||
		err := rows.Scan(&epname, &season, &episode)
 | 
					 | 
				
			||||||
		if err != nil {
 | 
							if err != nil {
 | 
				
			||||||
			fmt.Println(err.Error())
 | 
								fmt.Println(err.Error())
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		dbepisodes = append(dbepisodes, fmt.Sprintf("%s S%02dE%02d.mp4", epname, season, episode))
 | 
							dbepisodes = append(dbepisodes, filename)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// get those episodes that are missing in db
 | 
						// 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`.
 | 
					// difference returns the elements in `a` that aren't in `b`.
 | 
				
			||||||
func difference(a, b []string) []string {
 | 
					func difference(a, b []string) []string {
 | 
				
			||||||
 | 
						if b == nil || len(b) == 0 {
 | 
				
			||||||
 | 
							return a
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	mb := make(map[string]struct{}, len(b))
 | 
						mb := make(map[string]struct{}, len(b))
 | 
				
			||||||
	for _, x := range b {
 | 
						for _, x := range b {
 | 
				
			||||||
		mb[x] = struct{}{}
 | 
							mb[x] = struct{}{}
 | 
				
			||||||
@@ -129,7 +131,10 @@ func getAllTVShows() *[]string {
 | 
				
			|||||||
	var res []string
 | 
						var res []string
 | 
				
			||||||
	for rows.Next() {
 | 
						for rows.Next() {
 | 
				
			||||||
		var show string
 | 
							var show string
 | 
				
			||||||
		rows.Scan(&show)
 | 
							err := rows.Scan(&show)
 | 
				
			||||||
 | 
							if err != nil {
 | 
				
			||||||
 | 
								continue
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		res = append(res, show)
 | 
							res = append(res, show)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@ import (
 | 
				
			|||||||
	"openmediacenter/apiGo/config"
 | 
						"openmediacenter/apiGo/config"
 | 
				
			||||||
	"openmediacenter/apiGo/database"
 | 
						"openmediacenter/apiGo/database"
 | 
				
			||||||
	"os"
 | 
						"os"
 | 
				
			||||||
	"path/filepath"
 | 
					 | 
				
			||||||
	"strings"
 | 
						"strings"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -15,6 +14,20 @@ type StatusMessage struct {
 | 
				
			|||||||
	ContentAvailable bool
 | 
						ContentAvailable bool
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func getVideoTypes() []string {
 | 
				
			||||||
 | 
						return []string{".mp4", ".mov", ".mkv", ".flv", ".avi", ".mpeg", ".m4v"}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func ValidVideoSuffix(filename string) bool {
 | 
				
			||||||
 | 
						validExts := getVideoTypes()
 | 
				
			||||||
 | 
						for _, validExt := range validExts {
 | 
				
			||||||
 | 
							if strings.HasSuffix(filename, validExt) {
 | 
				
			||||||
 | 
								return true
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						return false
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func StartReindex() bool {
 | 
					func StartReindex() bool {
 | 
				
			||||||
	fmt.Println("starting reindex..")
 | 
						fmt.Println("starting reindex..")
 | 
				
			||||||
	SendEvent("start")
 | 
						SendEvent("start")
 | 
				
			||||||
@@ -33,22 +46,19 @@ func StartReindex() bool {
 | 
				
			|||||||
		return false
 | 
							return false
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						filelist, err := ioutil.ReadDir(vidFolder)
 | 
				
			||||||
 | 
						if err != nil {
 | 
				
			||||||
 | 
							fmt.Println(err.Error())
 | 
				
			||||||
 | 
							return false
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	var files []string
 | 
						var files []string
 | 
				
			||||||
	err := filepath.Walk(vidFolder, func(path string, info os.FileInfo, err error) error {
 | 
						for _, file := range filelist {
 | 
				
			||||||
		if err != nil {
 | 
							if !file.IsDir() && ValidVideoSuffix(file.Name()) {
 | 
				
			||||||
			fmt.Println(err.Error())
 | 
								files = append(files, file.Name())
 | 
				
			||||||
			return err
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if !info.IsDir() && strings.HasSuffix(info.Name(), ".mp4") {
 | 
					 | 
				
			||||||
			files = append(files, info.Name())
 | 
					 | 
				
			||||||
		}
 | 
					 | 
				
			||||||
		return nil
 | 
					 | 
				
			||||||
	})
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	if err != nil {
 | 
					 | 
				
			||||||
		fmt.Println(err.Error())
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	// start reindex process
 | 
						// start reindex process
 | 
				
			||||||
	AppendMessage("Starting Reindexing!")
 | 
						AppendMessage("Starting Reindexing!")
 | 
				
			||||||
	InitDeps(&mSettings)
 | 
						InitDeps(&mSettings)
 | 
				
			||||||
@@ -107,7 +117,7 @@ func StartTVShowReindex() {
 | 
				
			|||||||
			}
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			for _, epfile := range episodefiles {
 | 
								for _, epfile := range episodefiles {
 | 
				
			||||||
				if strings.HasSuffix(epfile.Name(), ".mp4") {
 | 
									if ValidVideoSuffix(epfile.Name()) {
 | 
				
			||||||
					elem.files = append(elem.files, epfile.Name())
 | 
										elem.files = append(elem.files, epfile.Name())
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										133
									
								
								apiGo/videoparser/hls/HlsDecoding.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										133
									
								
								apiGo/videoparser/hls/HlsDecoding.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,133 @@
 | 
				
			|||||||
 | 
					package hls
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import (
 | 
				
			||||||
 | 
						"fmt"
 | 
				
			||||||
 | 
						"log"
 | 
				
			||||||
 | 
						"openmediacenter/apiGo/config"
 | 
				
			||||||
 | 
						"openmediacenter/apiGo/database"
 | 
				
			||||||
 | 
						"os"
 | 
				
			||||||
 | 
						"os/exec"
 | 
				
			||||||
 | 
						"time"
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					type TranscodingState struct {
 | 
				
			||||||
 | 
						Finished bool
 | 
				
			||||||
 | 
						Active   bool
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					var transcodeAcive = make(map[uint32]TranscodingState)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func startSegmentation(videoid uint32) {
 | 
				
			||||||
 | 
						transcodeAcive[videoid] = TranscodingState{
 | 
				
			||||||
 | 
							Finished: false,
 | 
				
			||||||
 | 
							Active:   true,
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						cfg := config.GetConfig()
 | 
				
			||||||
 | 
						outpath := fmt.Sprintf("%s/%d", cfg.General.TmpDir, videoid)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if !fileExists(outpath) {
 | 
				
			||||||
 | 
							err := os.MkdirAll(outpath, os.ModePerm)
 | 
				
			||||||
 | 
							if err != nil {
 | 
				
			||||||
 | 
								log.Println(err)
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						app := "ffmpeg"
 | 
				
			||||||
 | 
						inputpath := GetVideoPathById(videoid)
 | 
				
			||||||
 | 
						fmt.Println(inputpath)
 | 
				
			||||||
 | 
						cmd := exec.Command(app,
 | 
				
			||||||
 | 
							//"-hide_banner",
 | 
				
			||||||
 | 
							//"-loglevel", "panic",
 | 
				
			||||||
 | 
							"-n",
 | 
				
			||||||
 | 
							//"-t", "10.0",
 | 
				
			||||||
 | 
							//"-ss", fmt.Sprintf("%d", id*10),
 | 
				
			||||||
 | 
							"-i", inputpath,
 | 
				
			||||||
 | 
							//"-g", "52",
 | 
				
			||||||
 | 
							//"-sc_threshold", "0",
 | 
				
			||||||
 | 
							//"-force_key_frames", "expr:gte(t,n_forced*10)",
 | 
				
			||||||
 | 
							//"-strict", "experimental",
 | 
				
			||||||
 | 
							//"-movflags", "+frag_keyframe+separate_moof+omit_tfhd_offset+empty_moov",
 | 
				
			||||||
 | 
							//"-c:v", "libx264",
 | 
				
			||||||
 | 
							//"-crf", "18",
 | 
				
			||||||
 | 
							//
 | 
				
			||||||
 | 
							//"-f", "segment",
 | 
				
			||||||
 | 
							//"-segment_time_delta", "0.2",
 | 
				
			||||||
 | 
							//"-segment_format", "mpegts",
 | 
				
			||||||
 | 
							//"-segment_times", commaSeparatedTimes,
 | 
				
			||||||
 | 
							//"-segment_start_number", `0`,
 | 
				
			||||||
 | 
							//"-segment_list_type", "flat",
 | 
				
			||||||
 | 
							//"-segment_list",
 | 
				
			||||||
 | 
							"-preset", "veryfast",
 | 
				
			||||||
 | 
							//"-maxrate", "4000k",
 | 
				
			||||||
 | 
							//"-bufsize", "8000k",
 | 
				
			||||||
 | 
							//"-vf", "scale=1280:-1,format=yuv420p",
 | 
				
			||||||
 | 
							//"-c:a", "aac",
 | 
				
			||||||
 | 
							"-force_key_frames", "expr:gte(t,n_forced*10)",
 | 
				
			||||||
 | 
							"-strict", "-2",
 | 
				
			||||||
 | 
							"-c:a", "aac",
 | 
				
			||||||
 | 
							"-c:v", "libx264",
 | 
				
			||||||
 | 
							"-f", "segment",
 | 
				
			||||||
 | 
							"-segment_list_type", "m3u8",
 | 
				
			||||||
 | 
							"-segment_time", "10.0",
 | 
				
			||||||
 | 
							"-segment_time_delta", "0.001",
 | 
				
			||||||
 | 
							"-segment_list", "test.m3u8", outpath+"/part%02d.ts")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						stdout, err := cmd.Output()
 | 
				
			||||||
 | 
						//
 | 
				
			||||||
 | 
						if err != nil {
 | 
				
			||||||
 | 
							fmt.Println(err.Error())
 | 
				
			||||||
 | 
							fmt.Println(string(err.(*exec.ExitError).Stderr))
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						fmt.Println(stdout)
 | 
				
			||||||
 | 
						fmt.Println("finished transcoding")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						transcodeAcive[videoid] = TranscodingState{
 | 
				
			||||||
 | 
							Finished: true,
 | 
				
			||||||
 | 
							Active:   false,
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func fileExists(path string) bool {
 | 
				
			||||||
 | 
						_, err := os.Stat(path)
 | 
				
			||||||
 | 
						return !os.IsNotExist(err)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func GetVideoPathById(videoid uint32) string {
 | 
				
			||||||
 | 
						query := fmt.Sprintf(`SELECT movie_url FROM videos WHERE movie_id=%d`, videoid)
 | 
				
			||||||
 | 
						var url string
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						err := database.QueryRow(query).Scan(&url)
 | 
				
			||||||
 | 
						if err != nil {
 | 
				
			||||||
 | 
							return ""
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						mSettings, _, _ := database.GetSettings()
 | 
				
			||||||
 | 
						vidFolder := config.GetConfig().General.ReindexPrefix + mSettings.VideoPath
 | 
				
			||||||
 | 
						return vidFolder + url
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func GetSegment(segIdx uint32, videoid uint32) string {
 | 
				
			||||||
 | 
						cfg := config.GetConfig()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						i, ok := transcodeAcive[videoid]
 | 
				
			||||||
 | 
						if ok {
 | 
				
			||||||
 | 
							if !i.Active && !i.Finished {
 | 
				
			||||||
 | 
								go startSegmentation(videoid)
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
						} else {
 | 
				
			||||||
 | 
							go startSegmentation(videoid)
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						// todo timeout
 | 
				
			||||||
 | 
						tspath := fmt.Sprintf("%s/%d/part%02d.ts", cfg.General.TmpDir, videoid, segIdx)
 | 
				
			||||||
 | 
						if ok && i.Finished == true {
 | 
				
			||||||
 | 
							return tspath
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						fmt.Println("checking if part exists")
 | 
				
			||||||
 | 
						for !fileExists(fmt.Sprintf("%s/%d/part%02d.ts", cfg.General.TmpDir, videoid, segIdx+1)) {
 | 
				
			||||||
 | 
							time.Sleep(100 * time.Millisecond)
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						return tspath
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -13,6 +13,7 @@
 | 
				
			|||||||
    "@fortawesome/free-solid-svg-icons": "^5.15.1",
 | 
					    "@fortawesome/free-solid-svg-icons": "^5.15.1",
 | 
				
			||||||
    "@fortawesome/react-fontawesome": "^0.1.13",
 | 
					    "@fortawesome/react-fontawesome": "^0.1.13",
 | 
				
			||||||
    "bootstrap": "^5.0.2",
 | 
					    "bootstrap": "^5.0.2",
 | 
				
			||||||
 | 
					    "hls.js": "^1.2.9",
 | 
				
			||||||
    "plyr-react": "^3.0.7",
 | 
					    "plyr-react": "^3.0.7",
 | 
				
			||||||
    "react": "^17.0.1",
 | 
					    "react": "^17.0.1",
 | 
				
			||||||
    "react-bootstrap": "^1.4.0",
 | 
					    "react-bootstrap": "^1.4.0",
 | 
				
			||||||
@@ -22,7 +23,7 @@
 | 
				
			|||||||
    "typescript": "^4.3.5"
 | 
					    "typescript": "^4.3.5"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "scripts": {
 | 
					  "scripts": {
 | 
				
			||||||
    "start": "react-scripts start",
 | 
					    "start": "react-scripts --openssl-legacy-provider start",
 | 
				
			||||||
    "build": "CI=false react-scripts build",
 | 
					    "build": "CI=false react-scripts build",
 | 
				
			||||||
    "test": "CI=true react-scripts test --reporters=jest-junit --verbose --silent --coverage --reporters=default",
 | 
					    "test": "CI=true react-scripts test --reporters=jest-junit --verbose --silent --coverage --reporters=default",
 | 
				
			||||||
    "lint": "eslint --format gitlab src/",
 | 
					    "lint": "eslint --format gitlab src/",
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										34
									
								
								src/pages/Player/HLSPlayer.tsx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										34
									
								
								src/pages/Player/HLSPlayer.tsx
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,34 @@
 | 
				
			|||||||
 | 
					import React, {useEffect, useRef} from 'react';
 | 
				
			||||||
 | 
					import Hls from 'hls.js';
 | 
				
			||||||
 | 
					import {PlyrInstance, PlyrProps, Plyr} from 'plyr-react';
 | 
				
			||||||
 | 
					import plyrstyle from 'plyr-react/dist/plyr.css';
 | 
				
			||||||
 | 
					import {DefaultPlyrOptions} from '../../types/GeneralTypes';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					interface Props {
 | 
				
			||||||
 | 
					    // children?: JSX.Element;
 | 
				
			||||||
 | 
					    videoid: number;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					const HLSPlayer = (props: Props): JSX.Element => {
 | 
				
			||||||
 | 
					    const ref = useRef(null);
 | 
				
			||||||
 | 
					    useEffect(() => {
 | 
				
			||||||
 | 
					        const loadVideo = async (): Promise<void> => {
 | 
				
			||||||
 | 
					            const video = document.getElementById('plyr') as HTMLVideoElement;
 | 
				
			||||||
 | 
					            const hls = new Hls();
 | 
				
			||||||
 | 
					            hls.loadSource('/api/video/loadM3U8?id=' + props.videoid);
 | 
				
			||||||
 | 
					            hls.attachMedia(video);
 | 
				
			||||||
 | 
					            // @ts-ignore
 | 
				
			||||||
 | 
					            ref.current!.plyr.media = video;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            hls.on(Hls.Events.MANIFEST_PARSED, function () {
 | 
				
			||||||
 | 
					                // @ts-ignore
 | 
				
			||||||
 | 
					                (ref.current!.plyr as PlyrInstance).play();
 | 
				
			||||||
 | 
					            });
 | 
				
			||||||
 | 
					        };
 | 
				
			||||||
 | 
					        loadVideo();
 | 
				
			||||||
 | 
					    });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return <Plyr style={plyrstyle} options={DefaultPlyrOptions} id='plyr' source={{} as PlyrProps['source']} ref={ref} />;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					export default HLSPlayer;
 | 
				
			||||||
@@ -1,9 +1,7 @@
 | 
				
			|||||||
import React from 'react';
 | 
					import React from 'react';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import style from './Player.module.css';
 | 
					import style from './Player.module.css';
 | 
				
			||||||
import plyrstyle from 'plyr-react/dist/plyr.css';
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
import {Plyr} from 'plyr-react';
 | 
					 | 
				
			||||||
import SideBar, {SideBarItem, SideBarTitle} from '../../elements/SideBar/SideBar';
 | 
					import SideBar, {SideBarItem, SideBarTitle} from '../../elements/SideBar/SideBar';
 | 
				
			||||||
import Tag from '../../elements/Tag/Tag';
 | 
					import Tag from '../../elements/Tag/Tag';
 | 
				
			||||||
import AddTagPopup from '../../elements/Popups/AddTagPopup/AddTagPopup';
 | 
					import AddTagPopup from '../../elements/Popups/AddTagPopup/AddTagPopup';
 | 
				
			||||||
@@ -15,7 +13,7 @@ import ActorTile from '../../elements/ActorTile/ActorTile';
 | 
				
			|||||||
import {withRouter} from 'react-router-dom';
 | 
					import {withRouter} from 'react-router-dom';
 | 
				
			||||||
import {APINode, callAPI} from '../../utils/Api';
 | 
					import {APINode, callAPI} from '../../utils/Api';
 | 
				
			||||||
import {RouteComponentProps} from 'react-router';
 | 
					import {RouteComponentProps} from 'react-router';
 | 
				
			||||||
import {DefaultPlyrOptions, GeneralSuccess} from '../../types/GeneralTypes';
 | 
					import {GeneralSuccess} from '../../types/GeneralTypes';
 | 
				
			||||||
import {ActorType, TagType} from '../../types/VideoTypes';
 | 
					import {ActorType, TagType} from '../../types/VideoTypes';
 | 
				
			||||||
import PlyrJS from 'plyr';
 | 
					import PlyrJS from 'plyr';
 | 
				
			||||||
import {IconButton} from '../../elements/GPElements/Button';
 | 
					import {IconButton} from '../../elements/GPElements/Button';
 | 
				
			||||||
@@ -23,6 +21,7 @@ import {VideoTypes} from '../../types/ApiTypes';
 | 
				
			|||||||
import GlobalInfos from '../../utils/GlobalInfos';
 | 
					import GlobalInfos from '../../utils/GlobalInfos';
 | 
				
			||||||
import {ButtonPopup} from '../../elements/Popups/ButtonPopup/ButtonPopup';
 | 
					import {ButtonPopup} from '../../elements/Popups/ButtonPopup/ButtonPopup';
 | 
				
			||||||
import {FeatureContext} from '../../utils/context/FeatureContext';
 | 
					import {FeatureContext} from '../../utils/context/FeatureContext';
 | 
				
			||||||
 | 
					import HLSPlayer from './HLSPlayer';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
interface Props extends RouteComponentProps<{id: string}> {}
 | 
					interface Props extends RouteComponentProps<{id: string}> {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -84,11 +83,8 @@ export class Player extends React.Component<Props, mystate> {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                <div className={style.videowrapper}>
 | 
					                <div className={style.videowrapper}>
 | 
				
			||||||
                    {/* video component is added here */}
 | 
					                    {/* video component is added here */}
 | 
				
			||||||
                    {this.state.sources ? (
 | 
					                    {/*<Plyr style={plyrstyle} source={this.state.sources} options={DefaultPlyrOptions} />*/}
 | 
				
			||||||
                        <Plyr style={plyrstyle} source={this.state.sources} options={DefaultPlyrOptions} />
 | 
					                    {this.state.sources ? <HLSPlayer videoid={this.state.movieId} /> : <div>not loaded yet</div>}
 | 
				
			||||||
                    ) : (
 | 
					 | 
				
			||||||
                        <div>not loaded yet</div>
 | 
					 | 
				
			||||||
                    )}
 | 
					 | 
				
			||||||
                    <div className={style.videoactions}>
 | 
					                    <div className={style.videoactions}>
 | 
				
			||||||
                        <IconButton icon={faThumbsUp} onClick={(): void => this.likebtn()} title='Like!' />
 | 
					                        <IconButton icon={faThumbsUp} onClick={(): void => this.likebtn()} title='Like!' />
 | 
				
			||||||
                        <IconButton icon={faTag} onClick={(): void => this.setState({popupvisible: true})} title='Add Tag!' />
 | 
					                        <IconButton icon={faTag} onClick={(): void => this.setState({popupvisible: true})} title='Add Tag!' />
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,16 +2,21 @@ import React from 'react';
 | 
				
			|||||||
import style from './RandomPage.module.css';
 | 
					import style from './RandomPage.module.css';
 | 
				
			||||||
import SideBar, {SideBarTitle} from '../../elements/SideBar/SideBar';
 | 
					import SideBar, {SideBarTitle} from '../../elements/SideBar/SideBar';
 | 
				
			||||||
import Tag from '../../elements/Tag/Tag';
 | 
					import Tag from '../../elements/Tag/Tag';
 | 
				
			||||||
import PageTitle from '../../elements/PageTitle/PageTitle';
 | 
					import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
 | 
				
			||||||
import VideoContainer from '../../elements/VideoContainer/VideoContainer';
 | 
					import VideoContainer from '../../elements/VideoContainer/VideoContainer';
 | 
				
			||||||
import {APINode, callAPI} from '../../utils/Api';
 | 
					import {APINode, callAPI} from '../../utils/Api';
 | 
				
			||||||
import {TagType} from '../../types/VideoTypes';
 | 
					import {TagType} from '../../types/VideoTypes';
 | 
				
			||||||
import {VideoTypes} from '../../types/ApiTypes';
 | 
					import {VideoTypes} from '../../types/ApiTypes';
 | 
				
			||||||
import {addKeyHandler, removeKeyHandler} from '../../utils/ShortkeyHandler';
 | 
					import {addKeyHandler, removeKeyHandler} from '../../utils/ShortkeyHandler';
 | 
				
			||||||
 | 
					import {IconButton} from '../../elements/GPElements/Button';
 | 
				
			||||||
 | 
					import {faMinusCircle, faPlusCircle} from '@fortawesome/free-solid-svg-icons';
 | 
				
			||||||
 | 
					import AddTagPopup from '../../elements/Popups/AddTagPopup/AddTagPopup';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
interface state {
 | 
					interface state {
 | 
				
			||||||
    videos: VideoTypes.VideoUnloadedType[];
 | 
					    videos: VideoTypes.VideoUnloadedType[];
 | 
				
			||||||
    tags: TagType[];
 | 
					    tags: TagType[];
 | 
				
			||||||
 | 
					    filterTags: TagType[];
 | 
				
			||||||
 | 
					    addTagPopup: boolean;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
interface GetRandomMoviesType {
 | 
					interface GetRandomMoviesType {
 | 
				
			||||||
@@ -29,8 +34,10 @@ class RandomPage extends React.Component<{}, state> {
 | 
				
			|||||||
        super(props);
 | 
					        super(props);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        this.state = {
 | 
					        this.state = {
 | 
				
			||||||
 | 
					            addTagPopup: false,
 | 
				
			||||||
            videos: [],
 | 
					            videos: [],
 | 
				
			||||||
            tags: []
 | 
					            tags: [],
 | 
				
			||||||
 | 
					            filterTags: []
 | 
				
			||||||
        };
 | 
					        };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        this.keypress = this.keypress.bind(this);
 | 
					        this.keypress = this.keypress.bind(this);
 | 
				
			||||||
@@ -49,49 +56,76 @@ class RandomPage extends React.Component<{}, state> {
 | 
				
			|||||||
    render(): JSX.Element {
 | 
					    render(): JSX.Element {
 | 
				
			||||||
        return (
 | 
					        return (
 | 
				
			||||||
            <div>
 | 
					            <div>
 | 
				
			||||||
                <PageTitle title='Random Videos' subtitle='4pc' />
 | 
					                <PageTitle title='Random Videos' subtitle='3pc' />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                <SideBar>
 | 
					                <SideBar>
 | 
				
			||||||
                    <SideBarTitle>Visible Tags:</SideBarTitle>
 | 
					                    <SideBarTitle>Visible Tags:</SideBarTitle>
 | 
				
			||||||
                    {this.state.tags.map((m) => (
 | 
					                    {this.state.tags.map((m) => (
 | 
				
			||||||
                        <Tag key={m.TagId} tagInfo={m} />
 | 
					                        <Tag key={m.TagId} tagInfo={m} />
 | 
				
			||||||
                    ))}
 | 
					                    ))}
 | 
				
			||||||
 | 
					                    <Line />
 | 
				
			||||||
 | 
					                    <SideBarTitle>Filter Tags:</SideBarTitle>
 | 
				
			||||||
 | 
					                    {this.state.filterTags.map((m) => (
 | 
				
			||||||
 | 
					                        <Tag key={m.TagId} tagInfo={m} />
 | 
				
			||||||
 | 
					                    ))}
 | 
				
			||||||
 | 
					                    <IconButton
 | 
				
			||||||
 | 
					                        title='Add'
 | 
				
			||||||
 | 
					                        icon={faPlusCircle}
 | 
				
			||||||
 | 
					                        onClick={(): void => {
 | 
				
			||||||
 | 
					                            this.setState({addTagPopup: true});
 | 
				
			||||||
 | 
					                        }}
 | 
				
			||||||
 | 
					                    />
 | 
				
			||||||
 | 
					                    {this.state.filterTags.length > 0 ? (
 | 
				
			||||||
 | 
					                        <IconButton
 | 
				
			||||||
 | 
					                            title='Remove All'
 | 
				
			||||||
 | 
					                            icon={faMinusCircle}
 | 
				
			||||||
 | 
					                            onClick={(): void => {
 | 
				
			||||||
 | 
					                                this.setState({filterTags: []}, (): void => {
 | 
				
			||||||
 | 
					                                    this.loadShuffledvideos(this.LoadNR);
 | 
				
			||||||
 | 
					                                });
 | 
				
			||||||
 | 
					                            }}
 | 
				
			||||||
 | 
					                        />
 | 
				
			||||||
 | 
					                    ) : (
 | 
				
			||||||
 | 
					                        <></>
 | 
				
			||||||
 | 
					                    )}
 | 
				
			||||||
                </SideBar>
 | 
					                </SideBar>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                {this.state.videos.length !== 0 ? (
 | 
					                {this.state.videos.length !== 0 ? <VideoContainer data={this.state.videos} /> : <div>No Data found!</div>}
 | 
				
			||||||
                    <VideoContainer data={this.state.videos}>
 | 
					 | 
				
			||||||
                <div className={style.Shufflebutton}>
 | 
					                <div className={style.Shufflebutton}>
 | 
				
			||||||
                            <button onClick={(): void => this.shuffleclick()} className={style.btnshuffle}>
 | 
					                    <button onClick={(): void => this.loadShuffledvideos(this.LoadNR)} className={style.btnshuffle}>
 | 
				
			||||||
                        Shuffle
 | 
					                        Shuffle
 | 
				
			||||||
                    </button>
 | 
					                    </button>
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
                    </VideoContainer>
 | 
					                {this.state.addTagPopup ? (
 | 
				
			||||||
                ) : (
 | 
					                    <AddTagPopup
 | 
				
			||||||
                    <div>No Data found!</div>
 | 
					                        onHide={(): void => this.setState({addTagPopup: false})}
 | 
				
			||||||
                )}
 | 
					                        submit={(tagId: number, tagName: string): void => {
 | 
				
			||||||
 | 
					                            this.setState({filterTags: [...this.state.filterTags, {TagId: tagId, TagName: tagName}]}, (): void => {
 | 
				
			||||||
 | 
					                                this.loadShuffledvideos(this.LoadNR);
 | 
				
			||||||
 | 
					                            });
 | 
				
			||||||
 | 
					                        }}
 | 
				
			||||||
 | 
					                    />
 | 
				
			||||||
 | 
					                ) : null}
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        );
 | 
					        );
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					 | 
				
			||||||
     * click handler for shuffle btn
 | 
					 | 
				
			||||||
     */
 | 
					 | 
				
			||||||
    shuffleclick(): void {
 | 
					 | 
				
			||||||
        this.loadShuffledvideos(this.LoadNR);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * load random videos from backend
 | 
					     * load random videos from backend
 | 
				
			||||||
     * @param nr number of videos to load
 | 
					     * @param nr number of videos to load
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    loadShuffledvideos(nr: number): void {
 | 
					    loadShuffledvideos(nr: number): void {
 | 
				
			||||||
        callAPI<GetRandomMoviesType>(APINode.Video, {action: 'getRandomMovies', Number: nr}, (result) => {
 | 
					        callAPI<GetRandomMoviesType>(
 | 
				
			||||||
 | 
					            APINode.Video,
 | 
				
			||||||
 | 
					            {action: 'getRandomMovies', Number: nr, TagFilter: this.state.filterTags.map((t) => t.TagId)},
 | 
				
			||||||
 | 
					            (result) => {
 | 
				
			||||||
                this.setState({videos: []}); // needed to trigger rerender of main videoview
 | 
					                this.setState({videos: []}); // needed to trigger rerender of main videoview
 | 
				
			||||||
                this.setState({
 | 
					                this.setState({
 | 
				
			||||||
                    videos: result.Videos,
 | 
					                    videos: result.Videos,
 | 
				
			||||||
                    tags: result.Tags
 | 
					                    tags: result.Tags
 | 
				
			||||||
                });
 | 
					                });
 | 
				
			||||||
        });
 | 
					            }
 | 
				
			||||||
 | 
					        );
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
@@ -101,7 +135,7 @@ class RandomPage extends React.Component<{}, state> {
 | 
				
			|||||||
    private keypress(event: KeyboardEvent): void {
 | 
					    private keypress(event: KeyboardEvent): void {
 | 
				
			||||||
        // bind s to shuffle
 | 
					        // bind s to shuffle
 | 
				
			||||||
        if (event.key === 's') {
 | 
					        if (event.key === 's') {
 | 
				
			||||||
            this.loadShuffledvideos(4);
 | 
					            this.loadShuffledvideos(3);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -66,7 +66,7 @@ export class EpisodePage extends React.Component<Props, State> {
 | 
				
			|||||||
export const EpisodeTile = (props: {episode: Episode}): JSX.Element => {
 | 
					export const EpisodeTile = (props: {episode: Episode}): JSX.Element => {
 | 
				
			||||||
    const themestyle = GlobalInfos.getThemeStyle();
 | 
					    const themestyle = GlobalInfos.getThemeStyle();
 | 
				
			||||||
    return (
 | 
					    return (
 | 
				
			||||||
        <Link to={'/tvplayer/' + props.episode.ID}>
 | 
					        <Link to={'/media/tvplayer/' + props.episode.ID}>
 | 
				
			||||||
            <div className={tileStyle.tile + ' ' + themestyle.secbackground + ' ' + themestyle.textcolor}>
 | 
					            <div className={tileStyle.tile + ' ' + themestyle.secbackground + ' ' + themestyle.textcolor}>
 | 
				
			||||||
                <FontAwesomeIcon
 | 
					                <FontAwesomeIcon
 | 
				
			||||||
                    style={{
 | 
					                    style={{
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -55,7 +55,7 @@ export class TVShowPage extends React.Component<Props, State> {
 | 
				
			|||||||
                                        (result) => callback(result)
 | 
					                                        (result) => callback(result)
 | 
				
			||||||
                                    );
 | 
					                                    );
 | 
				
			||||||
                                }}
 | 
					                                }}
 | 
				
			||||||
                                linkPath={'/tvshows/' + elem.Id}
 | 
					                                linkPath={'/media/tvshows/' + elem.Id}
 | 
				
			||||||
                            />
 | 
					                            />
 | 
				
			||||||
                        )}
 | 
					                        )}
 | 
				
			||||||
                        data={this.state.loading ? [] : this.data}
 | 
					                        data={this.state.loading ? [] : this.data}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										11
									
								
								yarn.lock
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								yarn.lock
									
									
									
									
									
								
							@@ -3538,9 +3538,9 @@ caniuse-api@^3.0.0:
 | 
				
			|||||||
    lodash.uniq "^4.5.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:
 | 
					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.30001236"
 | 
					  version "1.0.30001336"
 | 
				
			||||||
  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz#0a80de4cdf62e1770bb46a30d884fc8d633e3958"
 | 
					  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001336.tgz"
 | 
				
			||||||
  integrity sha512-o0PRQSrSCGJKCPZcgMzl5fUaj5xHe8qA2m4QRvnyY4e1lITqoNkr7q/Oh1NcpGSy0Th97UZ35yoKcINPoq7YOQ==
 | 
					  integrity sha512-/YxSlBmL7iKXTbIJ48IQTnAOBk7XmWsxhBF1PZLOko5Dt9qc4Pl+84lfqG3Tc4EuavurRn1QLoVJGxY2iSycfw==
 | 
				
			||||||
 | 
					
 | 
				
			||||||
capture-exit@^2.0.0:
 | 
					capture-exit@^2.0.0:
 | 
				
			||||||
  version "2.0.0"
 | 
					  version "2.0.0"
 | 
				
			||||||
@@ -6191,6 +6191,11 @@ history@^4.9.0:
 | 
				
			|||||||
    tiny-warning "^1.0.0"
 | 
					    tiny-warning "^1.0.0"
 | 
				
			||||||
    value-equal "^1.0.1"
 | 
					    value-equal "^1.0.1"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					hls.js@^1.2.9:
 | 
				
			||||||
 | 
					  version "1.2.9"
 | 
				
			||||||
 | 
					  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-1.2.9.tgz#2f25e42ec4c2ea8c88ab23c0f854f39062d45ac9"
 | 
				
			||||||
 | 
					  integrity sha512-SPjm8ix0xe6cYzwDvdVGh2QvQPDkCYrGWpZu6bRaKNNVyEGWM9uF0pooh/Lqj/g8QBQgPFEx1vHzW8SyMY9rqg==
 | 
				
			||||||
 | 
					
 | 
				
			||||||
hmac-drbg@^1.0.1:
 | 
					hmac-drbg@^1.0.1:
 | 
				
			||||||
  version "1.0.1"
 | 
					  version "1.0.1"
 | 
				
			||||||
  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
 | 
					  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user