Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix google photos picker videos #5635

Merged
merged 1 commit into from
Feb 3, 2025
Merged

Conversation

mifi
Copy link
Contributor

@mifi mifi commented Feb 3, 2025

would previously just download thumbnails

would previously just download thumbnails
Copy link
Contributor

github-actions bot commented Feb 3, 2025

Diff output files
diff --git a/packages/@uppy/provider-views/lib/GooglePicker/googlePicker.js b/packages/@uppy/provider-views/lib/GooglePicker/googlePicker.js
index abf47ed..62f568a 100644
--- a/packages/@uppy/provider-views/lib/GooglePicker/googlePicker.js
+++ b/packages/@uppy/provider-views/lib/GooglePicker/googlePicker.js
@@ -183,6 +183,7 @@ async function resolvePickedPhotos(_ref4) {
   return mediaItems.map(_ref5 => {
     let {
       id,
+      type,
       mediaFile: {
         mimeType,
         filename,
@@ -193,7 +194,7 @@ async function resolvePickedPhotos(_ref4) {
       platform: "photos",
       id,
       mimeType,
-      url: baseUrl,
+      url: type === "VIDEO" ? `${baseUrl}=dv` : baseUrl,
       name: filename,
     };
   });

@mifi mifi merged commit ff47668 into main Feb 3, 2025
16 checks passed
@mifi mifi deleted the fix-google-photos-picker-videos branch February 3, 2025 09:40
github-actions bot added a commit that referenced this pull request Feb 3, 2025
| Package                    | Version | Package                    | Version |
| -------------------------- | ------- | -------------------------- | ------- |
| @uppy/core                 |   4.4.2 | @uppy/provider-views       |   4.4.2 |
| @uppy/google-drive-picker  |   0.3.3 | @uppy/url                  |   4.2.2 |
| @uppy/google-photos-picker |   0.3.3 | @uppy/utils                |   6.1.2 |
| @uppy/locales              |   4.5.1 | uppy                       |  4.13.2 |

- @uppy/utils: do not strip www in getSocketHost (Merlijn Vos / #5621)
- @uppy/url: skip drag/dropped local files (Merlijn Vos / #5626)
- @uppy/provider-views: fix google photos picker videos (Mikael Finstad / #5635)
- @uppy/core,@uppy/google-drive-picker,@uppy/google-photos-picker,@uppy/provider-views:
  fix google picker i18n (Mikael Finstad / #5632)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants