diff --git a/dsSupport/ConvertMovie/Convert.go b/dsSupport/ConvertMovie/Convert.go index 655b0961..371720a4 100644 --- a/dsSupport/ConvertMovie/Convert.go +++ b/dsSupport/ConvertMovie/Convert.go @@ -4,19 +4,20 @@ import ( "dsSupport/Utils/ConvertUtil" ) -func main(){ +func main() { //源文件 - source:="B7318F5D-46B8-4AA1-8811-1A9D65528E19.wmv" + source := "B7318F5D-46B8-4AA1-8811-1A9D65528E19.wmv" //1、对视频文件进行切片 ConvertUtil.Cut(source) //2、切片完成后,尝试进行转码 - var childMovie=ConvertUtil.GetAllCutChild(source) + var childMovie = ConvertUtil.GetAllCutChild(source) for i := range childMovie { ConvertUtil.ConvertToH264Mp4(childMovie[i]) } //3、生成拼接的索引文件 - indexName:=ConvertUtil.GenerateIndexTxt(source,childMovie) + indexName := ConvertUtil.GenerateIndexTxt(source, childMovie) //4、合成MP4 - ConvertUtil.Merge(source,indexName) + ConvertUtil.Merge(source, indexName) + //5、清除垃圾 + ConvertUtil.ClearRubbish(source) } - diff --git a/dsSupport/Utils/ConvertUtil/ConvertUtil.go b/dsSupport/Utils/ConvertUtil/ConvertUtil.go index 9966e019..7cd946d6 100644 --- a/dsSupport/Utils/ConvertUtil/ConvertUtil.go +++ b/dsSupport/Utils/ConvertUtil/ConvertUtil.go @@ -127,5 +127,9 @@ func Merge(source string,indexName string){ 时间:2020-07-08 */ func ClearRubbish(source string){ - + var deletePath=[]string{"Working","Target"} + for i := range deletePath { + //删除目录 + os.RemoveAll(runDir+`/`+deletePath[i]+`/`+source[0:2]+"/"+source[0:36]) + } } diff --git a/dsSupport/Utils/FileUtil/FileUtil.go b/dsSupport/Utils/FileUtil/FileUtil.go index 952d3f59..49d9c658 100644 --- a/dsSupport/Utils/FileUtil/FileUtil.go +++ b/dsSupport/Utils/FileUtil/FileUtil.go @@ -54,4 +54,5 @@ func WriteLines(lines []string, path string) error { fmt.Fprintln(w, line) } return w.Flush() -} \ No newline at end of file +} + diff --git a/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19.txt b/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19.txt deleted file mode 100644 index c444bdca..00000000 --- a/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19.txt +++ /dev/null @@ -1,4 +0,0 @@ -file 'E:\Work\dsMin\dsSupport\Working\B7\B7318F5D-46B8-4AA1-8811-1A9D65528E19\B7318F5D-46B8-4AA1-8811-1A9D65528E19_000.mp4' -file 'E:\Work\dsMin\dsSupport\Working\B7\B7318F5D-46B8-4AA1-8811-1A9D65528E19\B7318F5D-46B8-4AA1-8811-1A9D65528E19_000.mp4' -file 'E:\Work\dsMin\dsSupport\Working\B7\B7318F5D-46B8-4AA1-8811-1A9D65528E19\B7318F5D-46B8-4AA1-8811-1A9D65528E19_001.mp4' -file 'E:\Work\dsMin\dsSupport\Working\B7\B7318F5D-46B8-4AA1-8811-1A9D65528E19\B7318F5D-46B8-4AA1-8811-1A9D65528E19_001.mp4' diff --git a/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19_000.mp4 b/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19_000.mp4 deleted file mode 100644 index e90d1f06..00000000 Binary files a/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19_000.mp4 and /dev/null differ diff --git a/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19_000.wmv b/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19_000.wmv deleted file mode 100644 index 78a14553..00000000 Binary files a/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19_000.wmv and /dev/null differ diff --git a/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19_001.mp4 b/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19_001.mp4 deleted file mode 100644 index 6ca91b8b..00000000 Binary files a/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19_001.mp4 and /dev/null differ diff --git a/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19_001.wmv b/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19_001.wmv deleted file mode 100644 index 8be82fda..00000000 Binary files a/dsSupport/Working/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19_001.wmv and /dev/null differ