From afaad8184960276d4f0ea914dc15c542a0c97e5f Mon Sep 17 00:00:00 2001 From: lukas Date: Thu, 23 Sep 2021 19:45:58 +0200 Subject: [PATCH] fix linter errror use correct videopath on reindex after upload --- .eslintrc.js | 1 + apiGo/api/FileUpload.go | 1 - apiGo/videoparser/ReIndexVideos.go | 7 +++++-- apiGo/videoparser/VideoParser.go | 12 +++++++----- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 81e444c..52b1cbf 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -46,6 +46,7 @@ module.exports = { // Map from global var to bool specifying if it can be redefined globals: { File: true, + FileList: true, jest: true, __DEV__: true, __dirname: false, diff --git a/apiGo/api/FileUpload.go b/apiGo/api/FileUpload.go index 33fe6bb..d4a8a57 100644 --- a/apiGo/api/FileUpload.go +++ b/apiGo/api/FileUpload.go @@ -54,7 +54,6 @@ func addUploadHandler() { if err == io.EOF { fmt.Printf("Finished uploading file %s\n", part.FileName()) - videoparser.InitDeps(&mSettings) videoparser.ProcessVideo(part.FileName()) break diff --git a/apiGo/videoparser/ReIndexVideos.go b/apiGo/videoparser/ReIndexVideos.go index 1fca565..1a59fa2 100644 --- a/apiGo/videoparser/ReIndexVideos.go +++ b/apiGo/videoparser/ReIndexVideos.go @@ -4,6 +4,7 @@ import ( "database/sql" "fmt" "openmediacenter/apiGo/api/types" + "openmediacenter/apiGo/config" "openmediacenter/apiGo/database" "openmediacenter/apiGo/videoparser/tmdb" "regexp" @@ -122,8 +123,10 @@ func addVideo(videoName string, fileName string, year int) { Width: 0, } + vidFolder := config.GetConfig().General.ReindexPrefix + mSettings.VideoPath + if mExtDepsAvailable.FFMpeg { - ppic, err = parseFFmpegPic(mSettings.VideoPath + fileName) + ppic, err = parseFFmpegPic(vidFolder + fileName) if err != nil { fmt.Printf("FFmpeg error occured: %s\n", err.Error()) } else { @@ -132,7 +135,7 @@ func addVideo(videoName string, fileName string, year int) { } if mExtDepsAvailable.MediaInfo { - atr := getVideoAttributes(mSettings.VideoPath + fileName) + atr := getVideoAttributes(vidFolder + fileName) if atr != nil { vidAtr = atr } diff --git a/apiGo/videoparser/VideoParser.go b/apiGo/videoparser/VideoParser.go index 1f1cbd8..d64a01e 100644 --- a/apiGo/videoparser/VideoParser.go +++ b/apiGo/videoparser/VideoParser.go @@ -3,6 +3,7 @@ package videoparser import ( "fmt" "io/ioutil" + "openmediacenter/apiGo/config" "openmediacenter/apiGo/database" "os" "path/filepath" @@ -19,20 +20,21 @@ func StartReindex() bool { SendEvent("start") AppendMessage("starting reindex..") - mSettings, PathPrefix, _ := database.GetSettings() + mSettings, _, _ := database.GetSettings() + // add the path prefix to videopath - mSettings.VideoPath = PathPrefix + mSettings.VideoPath + vidFolder := config.GetConfig().General.ReindexPrefix + mSettings.VideoPath // check if path even exists - if _, err := os.Stat(mSettings.VideoPath); os.IsNotExist(err) { + if _, err := os.Stat(vidFolder); os.IsNotExist(err) { fmt.Println("Reindex path doesn't exist!") - AppendMessage(fmt.Sprintf("Reindex path doesn't exist! :%s", mSettings.VideoPath)) + AppendMessage(fmt.Sprintf("Reindex path doesn't exist! :%s", vidFolder)) SendEvent("stop") return false } var files []string - err := filepath.Walk(mSettings.VideoPath, func(path string, info os.FileInfo, err error) error { + err := filepath.Walk(vidFolder, func(path string, info os.FileInfo, err error) error { if err != nil { fmt.Println(err.Error()) return err