more fix
This commit is contained in:
2
.vscode/launch.json
vendored
2
.vscode/launch.json
vendored
@@ -18,7 +18,7 @@
|
||||
"type": "go",
|
||||
"request": "launch",
|
||||
"mode": "auto",
|
||||
"args": ["run"],
|
||||
"args": ["sync"],
|
||||
"console": "integratedTerminal",
|
||||
"program": "${workspaceFolder}/cmd/cli"
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ func (p *AddCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) s
|
||||
return subcommands.ExitFailure
|
||||
}
|
||||
|
||||
if err := p.Service.Scan(gameID); err != nil {
|
||||
if _, err := p.Service.Scan(gameID); err != nil {
|
||||
fmt.Fprintln(os.Stderr, "error: failed to scan:", err)
|
||||
return subcommands.ExitFailure
|
||||
}
|
||||
|
||||
@@ -37,15 +37,16 @@ func (p *RunCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) s
|
||||
}
|
||||
|
||||
for _, metadata := range datastore {
|
||||
if err := p.Service.MakeBackup(metadata.ID); err != nil {
|
||||
fmt.Fprintln(os.Stderr, "error: failed to make backup:", err)
|
||||
return subcommands.ExitFailure
|
||||
changed, err := p.Service.Scan(metadata.ID)
|
||||
if err != nil {
|
||||
fmt.Println("❌", metadata.Name, ":", err.Error())
|
||||
continue
|
||||
}
|
||||
if err := p.Service.Scan(metadata.ID); err != nil {
|
||||
fmt.Fprintln(os.Stderr, "error: failed to scan:", err)
|
||||
return subcommands.ExitFailure
|
||||
if changed {
|
||||
fmt.Println("✅", metadata.Name, ": backed up")
|
||||
} else {
|
||||
fmt.Println("🆗", metadata.Name, ": up to date")
|
||||
}
|
||||
fmt.Println("✅", metadata.Name)
|
||||
}
|
||||
|
||||
fmt.Println("done.")
|
||||
|
||||
@@ -66,7 +66,6 @@ func (p *SyncCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
|
||||
pg.Finish()
|
||||
pg.Clear()
|
||||
pg.Close()
|
||||
|
||||
}
|
||||
|
||||
pg.Describe(fmt.Sprintf("[%s] Checking status...", g.Name))
|
||||
@@ -88,6 +87,7 @@ func (p *SyncCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
|
||||
destroyPg()
|
||||
slog.Warn("failed to push backup files", "err", err)
|
||||
}
|
||||
destroyPg()
|
||||
fmt.Println(g.Name + ": pushed")
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -82,47 +82,51 @@ func (s *Service) UpdateMetadata(gameID string, m repository.Metadata) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Service) Scan(gameID string) error {
|
||||
func (s *Service) Scan(gameID string) (bool, error) {
|
||||
id := repository.NewGameIdentifier(gameID)
|
||||
|
||||
lastRun, err := s.repo.LastScan(id)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get last scan time: %w", err)
|
||||
return false, fmt.Errorf("failed to get last scan time: %w", err)
|
||||
}
|
||||
|
||||
m, err := s.repo.Metadata(id)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get game metadata: %w", err)
|
||||
return false, fmt.Errorf("failed to get game metadata: %w", err)
|
||||
}
|
||||
|
||||
if !IsDirectoryChanged(m.Path, lastRun) {
|
||||
return nil
|
||||
return false, nil
|
||||
}
|
||||
|
||||
if err := s.MakeBackup(gameID); err != nil {
|
||||
return false, fmt.Errorf("failed to make the backup: %w", err)
|
||||
}
|
||||
|
||||
f, err := s.repo.WriteBlob(id)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get datastore stream: %w", err)
|
||||
return false, fmt.Errorf("failed to get datastore stream: %w", err)
|
||||
}
|
||||
if v, ok := f.(io.Closer); ok {
|
||||
defer v.Close()
|
||||
}
|
||||
|
||||
if err := archive.Tar(f, m.Path); err != nil {
|
||||
return fmt.Errorf("failed to make archive: %w", err)
|
||||
return false, fmt.Errorf("failed to make archive: %w", err)
|
||||
}
|
||||
|
||||
if err := s.repo.ResetLastScan(id); err != nil {
|
||||
return fmt.Errorf("failed to reset scan date: %w", err)
|
||||
return false, fmt.Errorf("failed to reset scan date: %w", err)
|
||||
}
|
||||
|
||||
m.Date = time.Now()
|
||||
m.Version += 1
|
||||
|
||||
if err := s.repo.WriteMetadata(id, m); err != nil {
|
||||
return fmt.Errorf("failed to update metadata: %w", err)
|
||||
return false, fmt.Errorf("failed to update metadata: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
return true, nil
|
||||
}
|
||||
|
||||
func (s *Service) MakeBackup(gameID string) error {
|
||||
|
||||
@@ -459,6 +459,12 @@ func (r *EagerRepository) WriteMetadata(id GameIdentifier, m Metadata) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// reload from disk because md5
|
||||
m, err = r.Repository.Metadata(id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
d := r.data[id.gameID]
|
||||
d.Metadata = m
|
||||
r.data[id.gameID] = d
|
||||
|
||||
Reference in New Issue
Block a user