From 728129aba21531a6f8d55383e2e3abee6e37c19f Mon Sep 17 00:00:00 2001
From: celogeek <65178+celogeek@users.noreply.github.com>
Date: Mon, 1 May 2023 19:08:18 +0200
Subject: [PATCH] reorg params and display relevant params only
---
internal/converter/converter.go | 6 +-
.../converter/options/converter_options.go | 61 ++++++++++---------
2 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/internal/converter/converter.go b/internal/converter/converter.go
index 4e1ba66..a8c0868 100644
--- a/internal/converter/converter.go
+++ b/internal/converter/converter.go
@@ -110,7 +110,6 @@ func (c *Converter) InitParse() {
c.AddIntParam(&c.Options.Brightness, "brightness", c.Options.Brightness, "Brightness readjustement: between -100 and 100, > 0 lighter, < 0 darker")
c.AddIntParam(&c.Options.Contrast, "contrast", c.Options.Contrast, "Contrast readjustement: between -100 and 100, > 0 more contrast, < 0 less contrast")
c.AddBoolParam(&c.Options.AutoRotate, "autorotate", c.Options.AutoRotate, "Auto Rotate page when width > height")
- c.AddBoolParam(&c.Options.Auto, "auto", false, "Activate all automatic options")
c.AddBoolParam(&c.Options.AutoSplitDoublePage, "autosplitdoublepage", c.Options.AutoSplitDoublePage, "Auto Split double page when width > height")
c.AddBoolParam(&c.Options.NoBlankImage, "noblankimage", c.Options.NoBlankImage, "Remove blank image")
c.AddBoolParam(&c.Options.Manga, "manga", c.Options.Manga, "Manga mode (right to left)")
@@ -128,8 +127,11 @@ func (c *Converter) InitParse() {
c.AddBoolParam(&c.Options.Save, "save", false, "Save your parameters as default")
c.AddBoolParam(&c.Options.Reset, "reset", false, "Reset your parameters to default")
+ c.AddSection("Shortcut")
+ c.AddBoolParam(&c.Options.Auto, "auto", false, "Activate all automatic options")
+ c.AddBoolParam(&c.Options.NoFilter, "nofilter", false, "Deactivate all filters")
+
c.AddSection("Other")
- c.AddBoolParam(&c.Options.NoFilter, "nofilter", false, "Disable all filter")
c.AddIntParam(&c.Options.Workers, "workers", runtime.NumCPU(), "Number of workers")
c.AddBoolParam(&c.Options.Dry, "dry", false, "Dry run to show all options")
c.AddBoolParam(&c.Options.DryVerbose, "dry-verbose", false, "Display also sorted files after the TOC")
diff --git a/internal/converter/options/converter_options.go b/internal/converter/options/converter_options.go
index 7816c91..af84b06 100644
--- a/internal/converter/options/converter_options.go
+++ b/internal/converter/options/converter_options.go
@@ -31,7 +31,6 @@ type Options struct {
CropRatioBottom int `yaml:"crop_ratio_bottom"`
Brightness int `yaml:"brightness"`
Contrast int `yaml:"contrast"`
- Auto bool `yaml:"-"`
AutoRotate bool `yaml:"auto_rotate"`
AutoSplitDoublePage bool `yaml:"auto_split_double_page"`
NoBlankImage bool `yaml:"no_blank_image"`
@@ -50,9 +49,12 @@ type Options struct {
Save bool `yaml:"-"`
Reset bool `yaml:"-"`
+ // Shortcut
+ Auto bool `yaml:"-"`
+ NoFilter bool `yaml:"-"`
+
// Other
Workers int `yaml:"-"`
- NoFilter bool `yaml:"-"`
Dry bool `yaml:"-"`
DryVerbose bool `yaml:"-"`
Quiet bool `yaml:"-"`
@@ -157,10 +159,6 @@ func (o *Options) ShowConfig() string {
perfectHeight,
)
}
- limitmb := "nolimit"
- if o.LimitMb > 0 {
- limitmb = fmt.Sprintf("%d Mb", o.LimitMb)
- }
sortpathmode := ""
switch o.SortPathMode {
@@ -174,32 +172,35 @@ func (o *Options) ShowConfig() string {
var b strings.Builder
for _, v := range []struct {
- K string
- V any
+ Key string
+ Value any
+ Condition bool
}{
- {"Profile", profileDesc},
- {"ViewRatio", fmt.Sprintf("1:%s", strings.TrimRight(fmt.Sprintf("%f", profiles.PerfectRatio), "0"))},
- {"View", viewDesc},
- {"Quality", o.Quality},
- {"Grayscale", o.Grayscale},
- {"Crop", o.Crop},
- {"CropRatio", fmt.Sprintf("%d Left - %d Up - %d Right - %d Bottom", o.CropRatioLeft, o.CropRatioUp, o.CropRatioRight, o.CropRatioBottom)},
- {"Brightness", o.Brightness},
- {"Contrast", o.Contrast},
- {"AutoRotate", o.AutoRotate},
- {"AutoSplitDoublePage", o.AutoSplitDoublePage},
- {"NoBlankImage", o.NoBlankImage},
- {"Manga", o.Manga},
- {"HasCover", o.HasCover},
- {"LimitMb", limitmb},
- {"StripFirstDirectoryFromToc", o.StripFirstDirectoryFromToc},
- {"SortPathMode", sortpathmode},
- {"Foreground Color", fmt.Sprintf("#%s", o.ForegroundColor)},
- {"Background Color", fmt.Sprintf("#%s", o.BackgroundColor)},
- {"Resize", !o.NoResize},
- {"Format", o.Format},
+ {"Profile", profileDesc, true},
+ {"ViewRatio", fmt.Sprintf("1:%s", strings.TrimRight(fmt.Sprintf("%f", profiles.PerfectRatio), "0")), true},
+ {"View", viewDesc, true},
+ {"Format", o.Format, true},
+ {"Quality", o.Quality, o.Format == "jpeg"},
+ {"Grayscale", o.Grayscale, true},
+ {"Crop", o.Crop, true},
+ {"CropRatio", fmt.Sprintf("%d Left - %d Up - %d Right - %d Bottom", o.CropRatioLeft, o.CropRatioUp, o.CropRatioRight, o.CropRatioBottom), o.Crop},
+ {"Brightness", o.Brightness, o.Brightness != 0},
+ {"Contrast", o.Contrast, o.Contrast != 0},
+ {"AutoRotate", o.AutoRotate, true},
+ {"AutoSplitDoublePage", o.AutoSplitDoublePage, true},
+ {"NoBlankImage", o.NoBlankImage, true},
+ {"Manga", o.Manga, true},
+ {"HasCover", o.HasCover, true},
+ {"LimitMb", fmt.Sprintf("%d Mb", o.LimitMb), o.LimitMb != 0},
+ {"StripFirstDirectoryFromToc", o.StripFirstDirectoryFromToc, true},
+ {"SortPathMode", sortpathmode, true},
+ {"Foreground Color", fmt.Sprintf("#%s", o.ForegroundColor), true},
+ {"Background Color", fmt.Sprintf("#%s", o.BackgroundColor), true},
+ {"Resize", !o.NoResize, true},
} {
- b.WriteString(fmt.Sprintf("\n %-26s: %v", v.K, v.V))
+ if v.Condition {
+ b.WriteString(fmt.Sprintf("\n %-26s: %v", v.Key, v.Value))
+ }
}
return b.String()
}