Browse Source

Fixed issue with possible damaged thumbnail jpg file

Toby Chui 3 years ago
parent
commit
e3b4446474
3 changed files with 12 additions and 1 deletions
  1. 5 1
      file_system.go
  2. 4 0
      mod/filesystem/metadata/metadata.go
  3. 3 0
      web/Video/backend/buildPlaylist.js

+ 5 - 1
file_system.go

@@ -2634,7 +2634,11 @@ func system_fs_handleFolderSortModePreference(w http.ResponseWriter, r *http.Req
 			sysdb.Read("fs-sortpref", userinfo.Username+"/"+folder, &sortMode)
 			sysdb.Read("fs-sortpref", userinfo.Username+"/"+folder, &sortMode)
 		}
 		}
 
 
-		js, _ := json.Marshal(sortMode)
+		js, err := json.Marshal(sortMode)
+		if err != nil {
+			sendErrorResponse(w, err.Error())
+			return
+		}
 		sendJSONResponse(w, string(js))
 		sendJSONResponse(w, string(js))
 	} else if opr == "set" {
 	} else if opr == "set" {
 		sortMode, err := mv(r, "mode", true)
 		sortMode, err := mv(r, "mode", true)

+ 4 - 0
mod/filesystem/metadata/metadata.go

@@ -185,6 +185,10 @@ func getImageAsBase64(path string) (string, error) {
 	if err != nil {
 	if err != nil {
 		return "", err
 		return "", err
 	}
 	}
+
+	//Added Seek to 0,0 function to prevent failed to decode: Unexpected EOF error
+	f.Seek(0, 0)
+
 	reader := bufio.NewReader(f)
 	reader := bufio.NewReader(f)
 	content, err := ioutil.ReadAll(reader)
 	content, err := ioutil.ReadAll(reader)
 	if err != nil {
 	if err != nil {

+ 3 - 0
web/Video/backend/buildPlaylist.js

@@ -111,6 +111,9 @@ function main(){
 
 
     //Scan each of the storage devices for video files
     //Scan each of the storage devices for video files
     for (var i =0; i < storages.length; i++){
     for (var i =0; i < storages.length; i++){
+        if (storages[i].Filesystem == "virtual" || storages[i].Hierarchy == "backup"){
+            continue;
+        }
         var thisDir = storages[i].UUID + ":/";
         var thisDir = storages[i].UUID + ":/";
         var thisStorageName = storages[i].Name;
         var thisStorageName = storages[i].Name;
         scanPathForVideo(thisDir, thisStorageName)
         scanPathForVideo(thisDir, thisStorageName)