diff options
| -rw-r--r-- | mkvlib/ass.go | 13 | ||||
| -rw-r--r-- | mkvlib/mkv.go | 16 | ||||
| -rw-r--r-- | mkvlib/shared.go | 2 |
3 files changed, 18 insertions, 13 deletions
diff --git a/mkvlib/ass.go b/mkvlib/ass.go index 06ea545..6d8e346 100644 --- a/mkvlib/ass.go +++ b/mkvlib/ass.go @@ -214,6 +214,9 @@ func (self *assProcessor) parse() bool { } func (self *assProcessor) getFontsList() [][]string { + if !self.parse() { + return nil + } list := make([]string, 0) for k, _ := range self.m { list = append(list, k) @@ -864,12 +867,12 @@ func (self *assProcessor) copyFontsFromCache() bool { if self.parse() { l := len(self.m) i := 0 - for k, _ := range self.m { - ok, _ := self.matchCache(k, k, true) - if ok != "" { - _, fn, _, _ := splitPath(ok) + self.matchFonts() + for k, v := range self.m { + if v.file != "" { + _, fn, _, _ := splitPath(v.file) fn = path.Join(self.output, fn) - if copyFile(ok, fn) == nil { + if copyFile(v.file, fn) == nil { i++ printLog(self.lcb, "Copy (%d/%d) done.", i, l) } diff --git a/mkvlib/mkv.go b/mkvlib/mkv.go index 69eb4b0..7a37d70 100644 --- a/mkvlib/mkv.go +++ b/mkvlib/mkv.go @@ -208,8 +208,9 @@ func (self *mkvProcessor) DumpMKVs(dir, output string, subset bool, lcb logCallb if !self.DumpMKV(item, p, subset, lcb) { ok = false printLog(lcb, `Failed to dump the mkv file "%s".`, item) + } else { + printLog(lcb, "Dump (%d/%d) done.", i+1, l) } - printLog(lcb, "Dump (%d/%d) done.", i+1, l) } return ok } @@ -276,8 +277,9 @@ func (self *mkvProcessor) CreateMKVs(vDir, sDir, fDir, tDir, oDir, slang, stitle if ec > 0 { ok = false printLog(lcb, `Failed to create the mkv/mks file: "%s".`, item) + } else { + printLog(lcb, "Create (%d/%d) done.", i+1, l) } - printLog(lcb, "Create (%d/%d) done.", i+1, l) } _ = os.RemoveAll(tDir) return ok @@ -300,8 +302,9 @@ func (self *mkvProcessor) MakeMKVs(dir, data, output, slang, stitle string, lcb if !self.CreateMKV(item, tracks, attachments, fn, slang, stitle, true) { ok = false printLog(lcb, `Faild to make the mkv file: "%s".`, item) + } else { + printLog(lcb, "Make (%d/%d) done.", i+1, l) } - printLog(lcb, "Make (%d/%d) done.", i+1, l) } return ok } @@ -368,9 +371,7 @@ func (self *mkvProcessor) GetFontsList(files []string, fonts string, lcb logCall obj.check = self.check obj.strict = self.strict obj.loadCache(self.caches) - if obj.parse() { - return obj.getFontsList() - } + return obj.getFontsList() } return nil } @@ -480,8 +481,9 @@ func (self *mkvProcessor) CreateTestVideo(asses []string, s, fontdir, enc string if !ok { ec++ printLog(lcb, `Failed to create the test video file: "%s"`, _output) + } else { + printLog(lcb, "CT (%d/%d) done.", i+1, l) } - printLog(lcb, "CT (%d/%d) done.", i+1, l) } return ec == 0 } diff --git a/mkvlib/shared.go b/mkvlib/shared.go index 90aea34..d75c912 100644 --- a/mkvlib/shared.go +++ b/mkvlib/shared.go @@ -11,7 +11,7 @@ import ( ) const libName = "mkvlib" -const libVer = "v2.0.7" +const libVer = "v2.0.8" const LibFName = libName + " " + libVer |