增加-cprt来自动识别同名文件

Author: zhengkeyan

build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-version="1.5.1"
+version="1.5.2"
 sourceVer=$(git log --date=iso --pretty=format:"%h @%cd" -1)
 buildTime="$(date '+%Y-%m-%d %H:%M:%S') by $(go version|sed 's/go version //')"
 cat <<EOF | gofmt >common/version.go

common/synthesis.go

@@ -7,6 +7,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"m4s-converter/conver"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -83,6 +84,8 @@ func (c *Config) Synthesis() {
 		if itemId == 0 || e != nil {
 			itemId, _ = js.Get("owner_id").Int()
 		}
+		c.ItemId = strconv.Itoa(itemId)
+
 		if status != "completed" && status != "视频已缓存完成" {
 			skipFilePaths = append(skipFilePaths, v)
 			logrus.Warn("未缓存完成,跳过合成", v, title+"-"+uname)
@@ -102,12 +105,12 @@ func (c *Config) Synthesis() {
 		mp4Name := title + conver.Mp4Suffix
 		outputFile := filepath.Join(groupDir, mp4Name)
 		newFile := filepath.Join(groupPath, mp4Name)
-		if Exist(outputFile) && c.Skip {
+		if c.Skip || Exist(outputFile) && c.findMp4Info(outputFile, c.ItemId) {
 			logrus.Warn("跳过已合成的文件:", newFile)
 			continue
 		}
 		if Exist(outputFile) && !c.Overlay {
-			outputFile = filepath.Join(groupDir, title+strconv.Itoa(itemId)+conver.Mp4Suffix)
+			outputFile = filepath.Join(groupDir, title+c.ItemId+conver.Mp4Suffix)
 		}
 
 		if er := c.Composition(video, audio, outputFile); er != nil {
@@ -135,6 +138,17 @@ func (c *Config) Synthesis() {
 	c.wait()
 }
 
+func (c *Config) findMp4Info(fp, sub string) bool {
+	if !Exist(c.GPACPath) {
+		return false
+	}
+	ret, err := exec.Command(c.GPACPath, "-info", fp).CombinedOutput()
+	if err != nil {
+		return false
+	}
+	return strings.Contains(string(ret), sub)
+}
+
 func null2Str(s string, value string) string {
 	if s != "" {
 		return s

common/util.go

@@ -28,6 +28,7 @@ type Config struct {
 	GPACPath   string
 	video      string
 	audio      string
+	ItemId     string
 }
 
 func (c *Config) overlay() string {
@@ -41,6 +42,7 @@ func (c *Config) Composition(videoFile, audioFile, outputFile string) error {
 	if c.GPACPath != "" {
 		cmd = exec.Command(c.GPACPath,
 			//"-quiet", // 仅打印异常日志
+			"-cprt", c.ItemId,
 			"-add", videoFile,
 			"-add", audioFile,
 			"-new", outputFile)

common/version.go

@@ -2,6 +2,6 @@ package common
 
 var (
 	version   = "1.5.1"
-	sourceVer = "1413d94 @2024-11-25 18:02:58 +0800"
-	buildTime = "2024-11-25 18:03:28 by go1.23.1 linux/amd64"
+	sourceVer = "b06d0d8 @2024-11-25 18:12:09 +0800"
+	buildTime = "2024-11-26 07:33:37 by go1.23.1 linux/amd64"
 )