mirror of
https://github.com/photoprism/photoprism.git
synced 2025-12-12 00:34:13 +01:00
Split import command into copy and move
Upgraded JS dependencies and did some refactoring along the way... Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
@@ -1,60 +0,0 @@
|
||||
package commands
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"github.com/photoprism/photoprism/internal/classify"
|
||||
"github.com/photoprism/photoprism/internal/config"
|
||||
"github.com/photoprism/photoprism/internal/nsfw"
|
||||
"github.com/photoprism/photoprism/internal/photoprism"
|
||||
"github.com/urfave/cli"
|
||||
)
|
||||
|
||||
// Imports photos from path defined in command-line args
|
||||
var ImportCommand = cli.Command{
|
||||
Name: "import",
|
||||
Usage: "Moves and indexes photos from import directory",
|
||||
Action: importAction,
|
||||
}
|
||||
|
||||
func importAction(ctx *cli.Context) error {
|
||||
start := time.Now()
|
||||
|
||||
conf := config.NewConfig(ctx)
|
||||
|
||||
if conf.ReadOnly() {
|
||||
return config.ErrReadOnly
|
||||
}
|
||||
|
||||
if err := conf.CreateDirectories(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
cctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
if err := conf.Init(cctx); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
conf.MigrateDb()
|
||||
|
||||
log.Infof("importing photos from %s", conf.ImportPath())
|
||||
|
||||
tensorFlow := classify.New(conf.ResourcesPath(), conf.TensorFlowDisabled())
|
||||
nsfwDetector := nsfw.New(conf.NSFWModelPath())
|
||||
|
||||
ind := photoprism.NewIndex(conf, tensorFlow, nsfwDetector)
|
||||
|
||||
convert := photoprism.NewConvert(conf)
|
||||
|
||||
imp := photoprism.NewImport(conf, ind, convert)
|
||||
|
||||
imp.Start(conf.ImportPath())
|
||||
|
||||
elapsed := time.Since(start)
|
||||
|
||||
log.Infof("photo import completed in %s", elapsed)
|
||||
conf.Shutdown()
|
||||
return nil
|
||||
}
|
||||
Reference in New Issue
Block a user