aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--thumbnailer.go15
1 files changed, 8 insertions, 7 deletions
diff --git a/thumbnailer.go b/thumbnailer.go
index 40fb525..2cd80e9 100644
--- a/thumbnailer.go
+++ b/thumbnailer.go
@@ -114,12 +114,7 @@ type img struct {
}
func compositeImages(w io.Writer, images []img, imageWidth, imagesPerRow int) {
- firstRow := true
for row := range slices.Chunk(images, imagesPerRow) {
- if !firstRow {
- fmt.Fprintln(w)
- }
- firstRow = false
rowLines := make([][]string, len(row))
names := make([][]string, len(row))
for i, img := range row {
@@ -229,8 +224,14 @@ func thumbnailer(args []string) error {
if err := thumbnailFiles(w, cols, lines, imagesPerRow, files); err != nil {
return err
}
- for _, d := range dirs {
- fmt.Fprintf(w, "\n%s:\n", d)
+ if len(files) > 0 && len(dirs) > 0 {
+ fmt.Fprintln(w)
+ }
+ for i, d := range dirs {
+ if i > 0 {
+ fmt.Fprintln(w)
+ }
+ fmt.Fprintf(w, "%s:\n", d)
dirFiles, err := readDir(d)
if err != nil {
return err