johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/custom-tf-model-127

Browse Source
This commit is contained in:
raystlin
2025-07-26 21:24:05 +00:00
parent 3b1e1bb32a 38cafb1c2b
commit b4ac12c301
161 changed files with 3447 additions and 2448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/commands/find.go
View File

@@ -41,8 +41,10 @@ func findAction(ctx *cli.Context) error {
defer conf.Shutdown()
filter := strings.TrimSpace(strings.Join(ctx.Args().Slice(), " "))
frm := form.SearchPhotos{
Query: strings.TrimSpace(ctx.Args().First()),
Query: filter,
Primary: false,
Merged: false,
Count: ctx.Int("count"),

16
internal/commands/reset.go
View File

@@ -76,7 +76,7 @@ func resetAction(ctx *cli.Context) error {
IsConfirm: true,
}
if _, err := removeIndexPrompt.Run(); err == nil {
if _, err = removeIndexPrompt.Run(); err == nil {
confirmed = true
} else {
log.Infof("keeping index database")
@@ -99,7 +99,7 @@ func resetAction(ctx *cli.Context) error {
IsConfirm: true,
}
if _, err := removeCachePrompt.Run(); err == nil {
if _, err = removeCachePrompt.Run(); err == nil {
resetCache(conf)
} else {
log.Infof("keeping cache files")
@@ -111,7 +111,7 @@ func resetAction(ctx *cli.Context) error {
IsConfirm: true,
}
if _, err := removeSidecarJsonPrompt.Run(); err == nil {
if _, err = removeSidecarJsonPrompt.Run(); err == nil {
resetSidecarJson(conf)
} else {
log.Infof("keeping *.json sidecar files")
@@ -123,7 +123,7 @@ func resetAction(ctx *cli.Context) error {
IsConfirm: true,
}
if _, err := removeSidecarYamlPrompt.Run(); err == nil {
if _, err = removeSidecarYamlPrompt.Run(); err == nil {
resetSidecarYaml(conf)
} else {
log.Infof("keeping *.yml metadata files")
@@ -135,13 +135,13 @@ func resetAction(ctx *cli.Context) error {
IsConfirm: true,
}
if _, err := removeAlbumYamlPrompt.Run(); err == nil {
if _, err = removeAlbumYamlPrompt.Run(); err == nil {
start := time.Now()
matches, err := filepath.Glob(regexp.QuoteMeta(conf.BackupAlbumsPath()) + "/**/*.yml")
matches, globErr := filepath.Glob(regexp.QuoteMeta(conf.BackupAlbumsPath()) + "/**/*.yml")
if err != nil {
return err
if globErr != nil {
return globErr
}
if len(matches) > 0 {

3
internal/commands/vision_run.go
View File

@@ -41,8 +41,9 @@ var VisionRunCommand = &cli.Command{
func visionRunAction(ctx *cli.Context) error {
return CallWithDependencies(ctx, func(conf *config.Config) error {
worker := workers.NewVision(conf)
filter := strings.TrimSpace(strings.Join(ctx.Args().Slice(), " "))
return worker.Start(
strings.TrimSpace(ctx.Args().First()),
filter,
vision.ParseTypes(ctx.String("models")),
ctx.String("source"),
ctx.Bool("force"),