Skip to content

Commit

Permalink
Merge pull request #271 from simulot:simulot/issue267
Browse files Browse the repository at this point in the history
fix: Count offile not assiciated with google JSON
  • Loading branch information
simulot authored May 29, 2024
2 parents 6ffb62a + eb275b6 commit c80201b
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions browser/gp/googlephotos.go
Original file line number Diff line number Diff line change
Expand Up @@ -429,16 +429,14 @@ func (to *Takeout) passTwoWalk(ctx context.Context, w fs.FS, assetChan chan *bro
if !to.sm.IsMedia(ext) {
return nil
}
f, exist := to.catalogs[w][dir].matchedFiles[base]
if !exist {
if _, exist := to.catalogs[w][dir].unMatchedFiles[base]; exist {
to.log.Record(ctx, fileevent.AnalysisMissingAssociatedMetadata, nil, name, "hint", "process all parts of the takeout at the same time")
return nil
}

if f.md == nil {
to.log.Record(ctx, fileevent.AnalysisMissingAssociatedMetadata, nil, name, "hint", "process all parts of the takeout at the same time")
f, exist := to.catalogs[w][dir].matchedFiles[base]
if !exist {
return nil
}

finfo, err := d.Info()
if err != nil {
to.log.Record(ctx, fileevent.Error, err, name, "message", err.Error())
Expand Down

0 comments on commit c80201b

Please sign in to comment.