Convert: Pass sub folder as first argument to limit scope #1081

see https://github.com/photoprism/photoprism/discussions/1081

internal/commands/convert.go

@@ -2,6 +2,9 @@ package commands
 
 import (
 	"context"
+	"github.com/photoprism/photoprism/pkg/txt"
+	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/photoprism/photoprism/internal/config"
@@ -11,9 +14,10 @@ import (
 
 // ConvertCommand registers the convert cli command.
 var ConvertCommand = cli.Command{
-	Name:   "convert",
-	Usage:  "Converts originals in other formats to JPEG and AVC sidecar files",
-	Action: convertAction,
+	Name:      "convert",
+	Usage:     "Converts originals in other formats to JPEG and AVC sidecar files",
+	UsageText: `To limit scope, a sub folder may be passed as first argument.`,
+	Action:    convertAction,
 }
 
 // convertAction converts originals in other formats to JPEG and AVC sidecar files.
@@ -34,11 +38,20 @@ func convertAction(ctx *cli.Context) error {
 		return err
 	}
 
-	log.Infof("converting originals in %s", conf.OriginalsPath())
+	convertPath := conf.OriginalsPath()
+
+	// Use first argument to limit scope if set.
+	subPath := strings.TrimSpace(ctx.Args().First())
+
+	if subPath != "" {
+		convertPath = filepath.Join(convertPath, subPath)
+	}
+
+	log.Infof("converting originals in %s", txt.Quote(convertPath))
 
 	convert := service.Convert()
 
-	if err := convert.Start(conf.OriginalsPath()); err != nil {
+	if err := convert.Start(convertPath); err != nil {
 		log.Error(err)
 	}
 

internal/commands/index.go

@@ -15,10 +15,11 @@ import (
 
 // IndexCommand registers the index cli command.
 var IndexCommand = cli.Command{
-	Name:   "index",
-	Usage:  "Indexes media files in originals folder",
-	Flags:  indexFlags,
-	Action: indexAction,
+	Name:      "index",
+	Usage:     "Indexes media files in originals folder",
+	UsageText: `To limit scope, a sub folder may be passed as first argument.`,
+	Flags:     indexFlags,
+	Action:    indexAction,
 }
 
 var indexFlags = []cli.Flag{
@@ -48,13 +49,13 @@ func indexAction(ctx *cli.Context) error {
 
 	conf.InitDb()
 
-	// get cli first argument
+	// Use first argument to limit scope if set.
 	subPath := strings.TrimSpace(ctx.Args().First())
 
 	if subPath == "" {
-		log.Infof("indexing photos in %s", txt.Quote(conf.OriginalsPath()))
+		log.Infof("indexing originals in %s", txt.Quote(conf.OriginalsPath()))
 	} else {
-		log.Infof("indexing originals folder %s", txt.Quote(filepath.Join(conf.OriginalsPath(), subPath)))
+		log.Infof("indexing originals in %s", txt.Quote(filepath.Join(conf.OriginalsPath(), subPath)))
 	}
 
 	if conf.ReadOnly() {