Thumbs: Improve thumbnail types and sizes report #4300

Signed-off-by: Michael Mayer <michael@photoprism.app>
photoprism · May 29, 2024 · 9fef64c · 9fef64c
1 parent c55da7f
commit 9fef64c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/internal/commands/show_file_formats.go b/internal/commands/show_file_formats.go
@@ -12,8 +12,9 @@ import (
 
 // ShowFileFormatsCommand configures the command name, flags, and action.
 var ShowFileFormatsCommand = cli.Command{
-	Name:  "file-formats",
-	Usage: "Displays supported media and sidecar file formats",
+	Name:    "file-formats",
+	Aliases: []string{"formats"},
+	Usage:   "Displays supported media and sidecar file formats",
 	Flags: append(report.CliFlags, cli.BoolFlag{
 		Name:  "short, s",
 		Usage: "hide format descriptions",

diff --git a/internal/commands/show_metadata.go b/internal/commands/show_metadata.go
@@ -12,8 +12,9 @@ import (
 
 // ShowMetadataCommand configures the command name, flags, and action.
 var ShowMetadataCommand = cli.Command{
-	Name:  "metadata",
-	Usage: "Displays supported metadata tags and standards",
+	Name:    "metadata",
+	Aliases: []string{"meta"},
+	Usage:   "Displays supported metadata tags and standards",
 	Flags: append(report.CliFlags, cli.BoolFlag{
 		Name:  "short, s",
 		Usage: "hide links to documentation",

diff --git a/internal/commands/show_thumb_sizes.go b/internal/commands/show_thumb_sizes.go
@@ -11,10 +11,11 @@ import (
 
 // ShowThumbSizesCommand configures the command name, flags, and action.
 var ShowThumbSizesCommand = cli.Command{
-	Name:   "thumb-sizes",
-	Usage:  "Displays supported standard thumbnail sizes",
-	Flags:  report.CliFlags,
-	Action: showThumbSizesAction,
+	Name:    "thumb-sizes",
+	Aliases: []string{"thumbs"},
+	Usage:   "Displays supported thumbnail types and sizes",
+	Flags:   report.CliFlags,
+	Action:  showThumbSizesAction,
 }
 
 // showThumbSizesAction displays supported standard thumbnail sizes.

diff --git a/internal/thumb/report.go b/internal/thumb/report.go
@@ -12,7 +12,7 @@ func Report(sizes SizeList, short bool) (rows [][]string, cols []string) {
 	if short {
 		cols = []string{"Size", "Usage"}
 	} else {
-		cols = []string{"Name", "Width", "Height", "Aspect Ratio", "Usage"}
+		cols = []string{"Name", "Width", "Height", "Aspect Ratio", "Available", "Usage"}
 	}
 
 	sorted := append(SizeList{}, sizes...)
@@ -31,7 +31,17 @@ func Report(sizes SizeList, short bool) (rows [][]string, cols []string) {
 		if short {
 			rows = append(rows, []string{fmt.Sprintf("%d", s.Width), s.Usage})
 		} else {
-			rows = append(rows, []string{s.Name.String(), fmt.Sprintf("%d", s.Width), fmt.Sprintf("%d", s.Height), report.Bool(s.Fit, "Preserved", "1:1"), s.Usage})
+			aspectRatio := report.Bool(s.Fit, "Preserved", "1:1")
+
+			available := "On-Demand"
+
+			if s.Required {
+				available = "Always"
+			} else if s.Optional {
+				available = "Optional"
+			}
+
+			rows = append(rows, []string{s.Name.String(), fmt.Sprintf("%d", s.Width), fmt.Sprintf("%d", s.Height), aspectRatio, available, s.Usage})
 		}
 	}