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

Add GooglePhotosIE from tokune/youtube-dl #31640

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

upintheairsheep
Copy link

@upintheairsheep upintheairsheep commented Feb 21, 2023

Please follow the guide below

  • You will be asked some questions, please read them carefully and answer honestly
  • Put an x into all the boxes [ ] relevant to your pull request (like that [x])
  • Use Preview tab to see how your pull request will actually look like

Before submitting a pull request make sure you have:

In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under Unlicense. Check one of the following options:

  • I am the original author of this code and I am willing to release it under Unlicense
  • I am not the original author of this code but it is in public domain or released under Unlicense (provide reliable evidence)

https://archive.softwareheritage.org/browse/origin/directory/?origin_url=https://github.com/tokune/youtube-dl
#13889 (comment)

What is the purpose of your pull request?

  • Bug fix
  • Improvement
  • New extractor
  • New feature

Description of your pull request and other information

Fixes #13889 . Due to tokune's youtube-dl fork being taken down back in 2020, when the "DMCA incident" occurred, I used the SoftwareHeritige archive of it. Thank you Tokune for creating the extractor itself and SoftwareHeritage for archiving GitHub repositories without any cost to access them.

@upintheairsheep
Copy link
Author

I also would wish to have a list of extractors that have been removed due to the site being shut down. I will plan on slowly but surely, porting every feature from that branch to the main youtube-dl, or someone else that has the git program can, as I do not have access to the command line at this time.

Copy link
Contributor

@dirkf dirkf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

There are some issues to consider. Let me know what you think.



class GooglePhotosIE(InfoExtractor):
_VALID_URL = r'https?://photos\.google\.com/share/(.+?)/photo/(.+?)key=(?P<id>.*)'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the key not [\da-zA-Z]+ rather than .*? Maybe - is allowed, so [\da-zA-Z-]+ if so.

youtube_dl/extractor/googlephotos.py Outdated Show resolved Hide resolved
youtube_dl/extractor/googlephotos.py Outdated Show resolved Hide resolved
youtube_dl/extractor/googlephotos.py Outdated Show resolved Hide resolved
from .common import InfoExtractor


class GooglePhotosIE(InfoExtractor):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be merged with GoogleDriveIE in youtube_dl/extractor/googledrive.py? There seems to be a lot of commonality.

youtube_dl/extractor/googlephotos.py Outdated Show resolved Hide resolved
youtube_dl/extractor/googlephotos.py Outdated Show resolved Hide resolved
upintheairsheep and others added 4 commits February 22, 2023 09:28
Co-authored-by: dirkf <fieldhouse@gmx.net>
thanks again

Co-authored-by: dirkf <fieldhouse@gmx.net>
Co-authored-by: dirkf <fieldhouse@gmx.net>
@upintheairsheep
Copy link
Author

Note to self: There is more info to extract, try and extract it?

@upintheairsheep
Copy link
Author

image
image

@upintheairsheep
Copy link
Author

Let's merge

@gamer191
Copy link

gamer191 commented Mar 13, 2023

I also would wish to have a list of extractors that have been removed due to the site being shut down. I will plan on slowly but surely, porting every feature from that branch to the main youtube-dl, or someone else that has the git program can, as I do not have access to the command line at this time.

Since I have access to cmd, I just ran a git diff, and the only difference was that Tokune's branch has Google Photos IE

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.

Support videos from Google Photos
3 participants