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

Backups: Rename album backups to exports and improve command help #1887

Browse Source
This commit is contained in:
Michael Mayer
2022-01-05 11:40:44 +01:00
parent 1a4158c7bc
commit 58a5f94069
40 changed files with 90 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
internal/commands/restore.go
View File

@@ -22,13 +22,18 @@ import (
"github.com/photoprism/photoprism/pkg/sanitize"
)
const restoreDescription = "A user-defined SQL dump FILENAME can be passed as the first argument. " +
"The -i parameter can be omitted in this case.\n" +
" The index backup and album exports paths are automatically detected if not specified explicitly."
// RestoreCommand configures the backup cli command.
var RestoreCommand = cli.Command{
Name: "restore",
Usage: "Restores the index from database dumps and YAML album backups",
UsageText: `A custom database SQL dump FILENAME may be passed as first argument. The backup paths will be detected automatically if not provided.`,
Flags: restoreFlags,
Action: restoreAction,
Name: "restore",
Description: restoreDescription,
Usage: "Restores the index from an SQL dump and optionally albums from YAML exports",
ArgsUsage: "[FILENAME]",
Flags: restoreFlags,
Action: restoreAction,
}
var restoreFlags = []cli.Flag{
@@ -38,19 +43,19 @@ var restoreFlags = []cli.Flag{
},
cli.BoolFlag{
Name: "albums, a",
Usage: "restore albums from YAML backups",
Usage: "restore albums from YAML exports",
},
cli.StringFlag{
Name: "albums-path",
Usage: "custom albums backup `PATH`",
Usage: "custom album exports `PATH`",
},
cli.BoolFlag{
Name: "index, i",
Usage: "restore index from database SQL dump",
Usage: "restore index from SQL dump",
},
cli.StringFlag{
Name: "index-path",
Usage: "custom database backup `PATH`",
Usage: "custom index backup `PATH`",
},
}
@@ -65,11 +70,7 @@ func restoreAction(ctx *cli.Context) error {
restoreAlbums := ctx.Bool("albums") || albumsPath != ""
if !restoreIndex && !restoreAlbums {
for _, flag := range restoreFlags {
fmt.Println(flag.String())
}
return nil
return cli.ShowSubcommandHelp(ctx)
}
start := time.Now()
@@ -97,7 +98,7 @@ func restoreAction(ctx *cli.Context) error {
}
if len(matches) == 0 {
log.Errorf("no backup files found in %s", indexPath)
log.Errorf("no SQL dumps found in %s", indexPath)
return nil
}
@@ -105,7 +106,7 @@ func restoreAction(ctx *cli.Context) error {
}
if !fs.FileExists(indexFileName) {
log.Errorf("backup file not found: %s", indexFileName)
log.Errorf("SQL dump not found: %s", indexFileName)
return nil
}
@@ -199,21 +200,21 @@ func restoreAction(ctx *cli.Context) error {
}
if !fs.PathExists(albumsPath) {
log.Warnf("albums backup path %s not found", sanitize.Log(albumsPath))
log.Warnf("album exports path %s not found", sanitize.Log(albumsPath))
} else {
log.Infof("restoring albums from %s", sanitize.Log(albumsPath))
if count, err := photoprism.RestoreAlbums(albumsPath, true); err != nil {
return err
} else {
log.Infof("restored %s from YAML backups", english.Plural(count, "album", "albums"))
log.Infof("restored %s from YAML exports", english.Plural(count, "album", "albums"))
}
}
}
elapsed := time.Since(start)
log.Infof("backup restored in %s", elapsed)
log.Infof("restored in %s", elapsed)
conf.Shutdown()