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.

Sign up for GitHub

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

Jump to bottom

Google drive multi-user regex fix #4285

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Google drive multi-user regex fix #4285

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4fe6fb9
Update GoogledriveCom plugin regex to allow for multi-user URL suppor…
malkstar Apr 24, 2023
017c69a
Add more test links to be supported from new regex
malkstar Apr 24, 2023
c38b209
Bump GoogledriveCom plugin version number
malkstar Apr 24, 2023
4cab634
Merge branch 'develop' into google-drive-multi-user-regex-fix
malkstar Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/pyload/plugins/downloaders/GoogledriveCom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#
# Test links:
# https://drive.google.com/file/d/0B6RNTe4ygItBQm15RnJiTmMyckU/view?pli=1
# https://drive.google.com/file/u/0/d/0B6RNTe4ygItBQm15RnJiTmMyckU/view?usp=share_link
# https://drive.google.com/u/0/uc?id=0B6RNTe4ygItBQm15RnJiTmMyckU&export=download


import json
Expand All @@ -18,7 +20,7 @@
class GoogledriveCom(BaseDownloader):
__name__ = "GoogledriveCom"
__type__ = "downloader"
__version__ = "0.34"
__version__ = "0.35"
__status__ = "testing"

__pattern__ = r"https?://(?:www\.)?(?:drive|docs)\.google\.com/(?:file/d/|uc\?.*id=)(?P<ID>[-\w]+)"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
__pattern__ = r"https?://(?:www\.)?(?:drive|docs)\.google\.com/(?:file/d/|uc\?.*id=)(?P<ID>[-\w]+)"
__pattern__ = r"https?://(?:www\.)?(?:drive|docs)\.google\.com/(?:u/[0-9]/)?(?:file/)?(?:u/[0-9]/)?(?:d/|uc\?.*id=)(?P<ID>[-\w]+)"

not sure how this was lost from the PR

Expand Down