Skip to content

Commit

Permalink
fix(google_photo): fix issue copy videos from google photo (#7160 close
Browse files Browse the repository at this point in the history
#7158)

#7158 During copy from google photo to aliyun, it failed consistently with 404 when copying mp4 file with =m37.

Change =m37 to =dv will fix the issue
  • Loading branch information
jindongh authored Sep 12, 2024
1 parent bb58b94 commit 1b42b96
Showing 1 changed file with 3 additions and 27 deletions.
30 changes: 3 additions & 27 deletions drivers/google_photo/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,33 +58,9 @@ func (d *GooglePhoto) Link(ctx context.Context, file model.Obj, args model.LinkA
URL: f.BaseURL + "=d",
}, nil
} else if strings.Contains(f.MimeType, "video/") {
var width, height int

fmt.Sscanf(f.MediaMetadata.Width, "%d", &width)
fmt.Sscanf(f.MediaMetadata.Height, "%d", &height)

switch {
// 1080P
case width == 1920 && height == 1080:
return &model.Link{
URL: f.BaseURL + "=m37",
}, nil
// 720P
case width == 1280 && height == 720:
return &model.Link{
URL: f.BaseURL + "=m22",
}, nil
// 360P
case width == 640 && height == 360:
return &model.Link{
URL: f.BaseURL + "=m18",
}, nil
default:
return &model.Link{
URL: f.BaseURL + "=dv",
}, nil
}

return &model.Link{
URL: f.BaseURL + "=dv",
}, nil
}
return &model.Link{}, nil
}
Expand Down

0 comments on commit 1b42b96

Please sign in to comment.