summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mkvlib/mkv.go6
-rw-r--r--mkvlib/shared.go2
2 files changed, 4 insertions, 4 deletions
diff --git a/mkvlib/mkv.go b/mkvlib/mkv.go
index f0e16ec..7cbeb3c 100644
--- a/mkvlib/mkv.go
+++ b/mkvlib/mkv.go
@@ -149,7 +149,7 @@ func (self *mkvProcessor) CheckSubset(file string, lcb logCallback) (bool, bool)
func (self *mkvProcessor) CreateMKV(file string, tracks, attachments []string, output, slang, stitle string, clean bool) bool {
args := make([]string, 0)
- if clean {
+ if clean && !self.mks {
args = append(args, "--no-subtitles", "--no-attachments")
}
if !self.mks {
@@ -232,7 +232,7 @@ func (self *mkvProcessor) CreateMKVs(vDir, sDir, fDir, tDir, oDir, slang, stitle
l := len(files)
for i, item := range files {
_, _, _, _f := splitPath(item)
- tmp, _ := findPath(sDir, fmt.Sprintf(`%s\S*\.\S+$`, regexp.QuoteMeta(_f)))
+ tmp, _ := findPath(sDir, fmt.Sprintf(`%s(_[\S ]*)?\.\S+$`, regexp.QuoteMeta(_f)))
asses := make([]string, 0)
subs := make([]string, 0)
p := path.Join(tDir, _f)
@@ -265,7 +265,7 @@ func (self *mkvProcessor) CreateMKVs(vDir, sDir, fDir, tDir, oDir, slang, stitle
ec++
}
if ec > 0 {
- printLog(lcb, `Failed to create the mkv file: "%s".`, item)
+ printLog(lcb, `Failed to create the mkv/mks file: "%s".`, item)
}
printLog(lcb, "Create (%d/%d) done.", i+1, l)
}
diff --git a/mkvlib/shared.go b/mkvlib/shared.go
index 67330e9..16ab322 100644
--- a/mkvlib/shared.go
+++ b/mkvlib/shared.go
@@ -11,7 +11,7 @@ import (
)
const libName = "mkvlib"
-const libVer = "v1.6.3"
+const libVer = "v1.6.4"
const LibFName = libName + " " + libVer