1
This commit is contained in:
Alex Yatskov 2017-04-14 09:28:50 -07:00
parent fef928350c
commit c166f50a71
2 changed files with 10 additions and 17 deletions

View File

@ -145,6 +145,8 @@ func epwingExportDb(inputPath, outputDir, title string, stride int, pretty bool)
titles []string titles []string
) )
log.Println("formatting dictionary data...")
for _, subbook := range book.Subbooks { for _, subbook := range book.Subbooks {
if extractor, ok := epwingExtractors[subbook.Title]; ok { if extractor, ok := epwingExtractors[subbook.Title]; ok {
fontNarrow := extractor.getFontNarrow() fontNarrow := extractor.getFontNarrow()

25
gui.go
View File

@ -31,26 +31,17 @@ import (
) )
type logger struct { type logger struct {
box *ui.Box entry *ui.Entry
count int
} }
func (l *logger) Write(p []byte) (n int, err error) { func (l *logger) Write(p []byte) (n int, err error) {
data := strings.Trim(string(p), "\n")
ui.QueueMain(func() { ui.QueueMain(func() {
l.box.Append(ui.NewLabel(data), false) l.entry.SetText(strings.Trim(string(p), "\n"))
l.count++
}) })
return len(p), nil return len(p), nil
} }
func (l *logger) clear() {
for ; l.count > 0; l.count-- {
l.box.Delete(0)
}
}
func gui() error { func gui() error {
return ui.Main(func() { return ui.Main(func() {
pathEntry := ui.NewEntry() pathEntry := ui.NewEntry()
@ -70,7 +61,7 @@ func gui() error {
formatCombo.SetSelected(0) formatCombo.SetSelected(0)
titleEntry := ui.NewEntry() titleEntry := ui.NewEntry()
outputBox := ui.NewVerticalBox() outputEntry := ui.NewEntry()
importButton := ui.NewButton("Import dictionary...") importButton := ui.NewButton("Import dictionary...")
mainBox := ui.NewVerticalBox() mainBox := ui.NewVerticalBox()
@ -83,10 +74,11 @@ func gui() error {
mainBox.Append(ui.NewLabel("Dictionary format:"), false) mainBox.Append(ui.NewLabel("Dictionary format:"), false)
mainBox.Append(formatCombo, false) mainBox.Append(formatCombo, false)
mainBox.Append(ui.NewLabel("Application output:"), false) mainBox.Append(ui.NewLabel("Application output:"), false)
mainBox.Append(outputBox, true) mainBox.Append(outputEntry, false)
mainBox.Append(ui.NewVerticalBox(), true)
mainBox.Append(importButton, false) mainBox.Append(importButton, false)
window := ui.NewWindow("Yomichan Import", 640, 480, false) window := ui.NewWindow("Yomichan Import", 640, 320, false)
window.SetMargined(true) window.SetMargined(true)
window.SetChild(mainBox) window.SetChild(mainBox)
@ -96,12 +88,11 @@ func gui() error {
} }
}) })
logger := &logger{outputBox, 0} log.SetOutput(&logger{outputEntry})
log.SetOutput(logger)
importButton.OnClicked(func(*ui.Button) { importButton.OnClicked(func(*ui.Button) {
importButton.Disable() importButton.Disable()
logger.clear() outputEntry.SetText("")
var ( var (
outputDir string outputDir string