- [+] none-video files are now duplicated to dest dir

Author: suntong

ffcvt.go

@@ -198,6 +198,7 @@ func visit(path string, f os.FileInfo, err error) error {
 }
 
 // Append the video file to the list, unless it's encoded already
+// and duplicate none-video files to dest dir as well
 func appendVideo(fname string) {
 	if Opts.WDirectory == "" && fname[len(fname)-5:] == encodedExt {
 		debug("Already-encoded file ignored: "+fname, 1)
@@ -206,7 +207,16 @@ func appendVideo(fname string) {
 
 	fext := strings.ToUpper(fname[len(fname)-4:])
 	if strings.Index(Opts.Exts, fext) < 0 {
-		debug("None-video file ignored: "+fname, 3)
+		// None-video files, dup to dest, hardlink 1st else copy
+		if Opts.WDirectory != "" {
+			src := Opts.Directory+ "/" + fname
+			dst := Opts.WDirectory+ "/" + fname
+			err := linkFile(src, dst)
+			if err != nil {
+				copyFile(src, dst)
+			}
+		}
+		debug("None-video file '"+fname+"' duplicated to dest dir.", 1)
 		return
 	}
 
@@ -243,7 +253,8 @@ func createPar2s(workDirs []string) {
 		os.Chdir(dir)
 		dirName := filepath.Base(dir)
 
-		cmd := []string{"par2create", "-u", "zz_" + dirName + ".par2", "*" + encodedExt}
+		// create par2s for all files within dest dir
+		cmd := []string{"par2create", "-u", "zz_" + dirName + ".par2", "*"}
 		debug(strings.Join(cmd, " "), 1)
 
 		out, err := exec.Command(cmd[0], cmd[1:]...).CombinedOutput()

file_dup.go

@@ -0,0 +1,39 @@
+// Copy or hardlink a file in Go
+
+package main
+
+import (
+	"io"
+	"os"
+)
+
+func mainSample() {
+	copyFile("test.txt", "test_copy.txt")
+	copyFile("test_copy.txt", "test_link.txt")
+}
+
+// hardlink a file
+func linkFile(src, dst string) error {
+	return os.Link(src, dst)
+}
+
+// Copy a file
+func copyFile(src, dst string) {
+	srcFile, err := os.Open(src)
+	check(err)
+	defer srcFile.Close()
+
+	destFile, err := os.Create(dst) // creates if file doesn't exist
+	check(err)
+	defer destFile.Close()
+
+	_, err = io.Copy(destFile, srcFile) // check first var for number of bytes copied
+	check(err)
+
+	err = destFile.Sync()
+	check(err)
+}
+
+func check(err error) {
+	checkError(err)
+}

test/ffcvt_test.txt

@@ -148,6 +148,8 @@ ffcvt: to execute -
 Org Size: 0 MB
 New Size: 0 MB
 Saved:    0%
+] None-video file './ffcvt_test.txt' duplicated to dest dir.
+] None-video file './test-all.sh' duplicated to dest dir.
 ] Skip symlink file: ./test1.avi
 ] Skip symlink file: ./test2.avi
 ] Skip symlink file: ./test3.webm
@@ -161,6 +163,8 @@ ffcvt: to execute -
 Org Size: 0 MB
 New Size: 0 MB
 Saved:    0%
+] None-video file './ffcvt_test.txt' duplicated to dest dir.
+] None-video file './test-all.sh' duplicated to dest dir.
 
 == Transcoding [1/4]: 'StreamSample.mkv'
    under .
@@ -189,6 +193,8 @@ ffcvt: to execute -
 Org Size: 0 MB
 New Size: 0 MB
 Saved:    0%
+] None-video file './ffcvt_test.txt' duplicated to dest dir.
+] None-video file './test-all.sh' duplicated to dest dir.
 ] Skip symlink file: ./test1.avi
 ] Skip symlink file: ./test2.avi
 ] Skip symlink file: ./test3.webm
@@ -202,6 +208,8 @@ ffcvt: to execute -
 Org Size: 0 MB
 New Size: 0 MB
 Saved:    0%
+] None-video file './ffcvt_test.txt' duplicated to dest dir.
+] None-video file './test-all.sh' duplicated to dest dir.
 
 == Transcoding [1/4]: 'StreamSample.mkv'
    under .
@@ -231,6 +239,8 @@ Org Size: 0 MB
 New Size: 0 MB
 Saved:    0%
 ] Transcoding to /tmp/test
+] None-video file './ffcvt_test.txt' duplicated to dest dir.
+] None-video file './test-all.sh' duplicated to dest dir.
 
 == Transcoding [1/4]: 'StreamSample.mkv'
    under .

test2/ffcvt_test.txt

@@ -148,14 +148,18 @@ ffcvt: to execute -
 Org Size: 0 MB
 New Size: 0 MB
 Saved:    0%
+] None-video file './ffcvt_test.txt' duplicated to dest dir.
 ] Skip symlink file: ./subdir/test_s1.avi
+] None-video file './test-all.sh' duplicated to dest dir.
 ] Skip symlink file: ./test1.avi
 ] Skip symlink file: ./test2.avi
 ] Skip symlink file: ./test3.webm
 
 Org Size: 0 MB
 New Size: 0 MB
 Saved:    0%
+] None-video file './ffcvt_test.txt' duplicated to dest dir.
+] None-video file './test-all.sh' duplicated to dest dir.
 
 == Transcoding [1/4]: 'test_s1.avi'
    under subdir
@@ -184,14 +188,18 @@ ffcvt: to execute -
 Org Size: 0 MB
 New Size: 0 MB
 Saved:    0%
+] None-video file './ffcvt_test.txt' duplicated to dest dir.
 ] Skip symlink file: ./subdir/test_s1.avi
+] None-video file './test-all.sh' duplicated to dest dir.
 ] Skip symlink file: ./test1.avi
 ] Skip symlink file: ./test2.avi
 ] Skip symlink file: ./test3.webm
 
 Org Size: 0 MB
 New Size: 0 MB
 Saved:    0%
+] None-video file './ffcvt_test.txt' duplicated to dest dir.
+] None-video file './test-all.sh' duplicated to dest dir.
 
 == Transcoding [1/4]: 'test_s1.avi'
    under subdir
@@ -221,6 +229,8 @@ Org Size: 0 MB
 New Size: 0 MB
 Saved:    0%
 ] Transcoding to /tmp/test2
+] None-video file './ffcvt_test.txt' duplicated to dest dir.
+] None-video file './test-all.sh' duplicated to dest dir.
 
 == Transcoding [1/4]: 'test_s1.avi'
    under subdir