🐛 Incorrect rtfd file handling when Insert image or file on macOS https://github.com/siyuan-note/siyuan/issues/9585

kernel/model/upload.go

@@ -150,7 +150,12 @@ func Upload(c *gin.Context) {
 	for _, file := range files {
 		baseName := file.Filename
 
-		logging.LogInfof("uploading %s", baseName)
+		needUnzip2Dir := false
+		if gulu.OS.IsDarwin() {
+			if strings.HasSuffix(baseName, ".rtfd.zip") {
+				needUnzip2Dir = true
+			}
+		}
 
 		fName := baseName
 		fName = util.FilterUploadFileName(fName)
@@ -179,19 +184,86 @@ func Upload(c *gin.Context) {
 		} else {
 			fName = util.AssetName(fName)
 			writePath := filepath.Join(assetsDirPath, fName)
+			tmpDir := filepath.Join(util.TempDir, "convert", "zip", gulu.Rand.String(7))
+			if needUnzip2Dir {
+				if err = os.MkdirAll(tmpDir, 0755); nil != err {
+					errFiles = append(errFiles, fName)
+					ret.Msg = err.Error()
+					f.Close()
+					break
+				}
+				writePath = filepath.Join(tmpDir, fName)
+			}
+
 			if _, err = f.Seek(0, io.SeekStart); nil != err {
+				logging.LogErrorf("seek failed: %s", err)
 				errFiles = append(errFiles, fName)
 				ret.Msg = err.Error()
 				f.Close()
 				break
 			}
 			if err = filelock.WriteFileByReader(writePath, f); nil != err {
+				logging.LogErrorf("write file failed: %s", err)
 				errFiles = append(errFiles, fName)
 				ret.Msg = err.Error()
 				f.Close()
 				break
 			}
 			f.Close()
+
+			if needUnzip2Dir {
+				baseName = strings.TrimSuffix(file.Filename, ".rtfd.zip") + ".rtfd"
+				fName = baseName
+				fName = util.FilterUploadFileName(fName)
+				ext = filepath.Ext(fName)
+				fName = strings.TrimSuffix(fName, ext)
+				ext = strings.ToLower(ext)
+				fName += ext
+				fName = util.AssetName(fName)
+				tmpDir2 := filepath.Join(util.TempDir, "convert", "zip", gulu.Rand.String(7))
+				if err = gulu.Zip.Unzip(writePath, tmpDir2); nil != err {
+					errFiles = append(errFiles, fName)
+					ret.Msg = err.Error()
+					break
+				}
+
+				entries, readErr := os.ReadDir(tmpDir2)
+				if nil != readErr {
+					logging.LogErrorf("read dir [%s] failed: %s", tmpDir2, readErr)
+					errFiles = append(errFiles, fName)
+					ret.Msg = readErr.Error()
+					break
+				}
+				if 1 > len(entries) {
+					logging.LogErrorf("read dir [%s] failed: no entry", tmpDir2)
+					errFiles = append(errFiles, fName)
+					ret.Msg = "no entry"
+					break
+				}
+				dirName := entries[0].Name()
+				srcDir := filepath.Join(tmpDir2, dirName)
+				entries, readErr = os.ReadDir(srcDir)
+				if nil != readErr {
+					logging.LogErrorf("read dir [%s] failed: %s", filepath.Join(tmpDir2, entries[0].Name()), readErr)
+					errFiles = append(errFiles, fName)
+					ret.Msg = readErr.Error()
+					break
+				}
+				destDir := filepath.Join(assetsDirPath, fName)
+				for _, entry := range entries {
+					from := filepath.Join(srcDir, entry.Name())
+					to := filepath.Join(destDir, entry.Name())
+					if copyErr := gulu.File.Copy(from, to); nil != copyErr {
+						logging.LogErrorf("copy [%s] to [%s] failed: %s", from, to, copyErr)
+						errFiles = append(errFiles, fName)
+						ret.Msg = copyErr.Error()
+						break
+					}
+				}
+				os.RemoveAll(tmpDir)
+				os.RemoveAll(tmpDir2)
+			}
+
 			succMap[baseName] = strings.TrimPrefix(path.Join(relAssetsDirPath, fName), "/")
 		}
 	}