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

Update video_id regexp to account for recent abc.com changes (fixes #25197 and #25207) #25216

Closed
wants to merge 2 commits into from
Closed

Conversation

tmthywynn8
Copy link

@tmthywynn8 tmthywynn8 commented May 10, 2020

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)

What is the purpose of your pull request?

  • Bug fix
  • Improvement
  • New extractor
  • New feature

Description of your pull request and other information

This pull request fixes #25197 and #25207 by accounting for the new changes on abc.com—first noticed on Wednesday, May 6. Now, the unique video ID can be found by searching for videoIdCode; note that only one instance will be found), potentially avoiding any false positives, e.g., other video IDs referenced on the page.

The solution was to change the regexp on line 141 and simplifying it for the new name on the video's source. The Rookie video in the examples dictionary can be used to verify the new changes.

@tmthywynn8 tmthywynn8 changed the title Update video_id regexp to account for recent abc.com changes (fixes #25207) Update video_id regexp to account for recent abc.com changes (fixes #25197 and #25207) May 10, 2020
Copy link

@Azmaeus Azmaeus left a comment

Choose a reason for hiding this comment

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

I verified this fix allows downloading from abc.com. I reviewed the code change, it looks fine to me.

@cliss
Copy link

cliss commented Jun 5, 2020

Bump; there have been two releases since this PR was opened; any chance we can see it land in the next release, please? 😇

@@ -138,7 +138,7 @@ def _real_extract(self, url):
# from http://freeform.go.com/shows/shadowhunters/episodes/season-2/1-this-guilty-blood
r'data-video-id=["\']*(VDKA\w+)',
# https://abc.com/shows/the-rookie/episode-guide/season-02/03-the-bet
r'\b(?:video)?id["\']\s*:\s*["\'](VDKA\w+)'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do not touch old patterns.

Choose a reason for hiding this comment

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

Sorry for not minding my own business, but it looks like your requested change was implemented by @tmthywynn8 a couple of months ago. I'm not that familiar with the GitHub workflow, but it looks like this is just waiting for your approval.

Copy link
Author

Choose a reason for hiding this comment

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

Yes. I made the necessary changes in commit 783d296 and requested another review to make sure that I fulfilled the requirements. I'm not sure what the procedure is suppose to be, so maybe requesting another review was the wrong thing to do

Copy link

@tony-izzo tony-izzo Aug 18, 2020

Choose a reason for hiding this comment

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

I'm not sure yet but I think removing the original pattern (by replacing it with the new pattern) fixed the problem, and putting it back has re-broken it. My suspicion is that both patterns are matched on the page in question but one returns an invalid ID. Or perhaps a valid ID that nevertheless yields an error when the code later tries to retrieve it.

If I'm right, undoing the requested change will get it working again. But that's not really a solution, and again I'm not sure yet.

Choose a reason for hiding this comment

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

Sorry it took me so long to get to this, but I just tested #25216 and it works for me as-is. So my theory above is completely wrong.

Leaves original pattern untouched.
@tmthywynn8 tmthywynn8 requested a review from dstftw June 7, 2020 03:18
@magnum32
Copy link

the fix still has not been added to youtube-dl. what is going on?

@DarF234
Copy link

DarF234 commented Jul 2, 2020

May I respectfully inquire as to what is delaying this fix? ABC is a very popular site and has the habit of reducing retention of free and logged-in content at seemingly random times. A timely fix would be most welcome. I am assuming (possibly incorrectly) that dstftw's request is the one we are waiting on, as he has been handling this issue.
All the patches I've found don't correspond with the code. So the only solution seems to be here.
I normally have high praise for the rapid updates to your software. But I believe this is the longest period of time I have seen without an update.

@chrisallen
Copy link

Could we please get this merged?

@DarF234
Copy link

DarF234 commented Jul 18, 2020

The problem has changed. I was stupid enough to not check logs until today. I'm no longer getting the Adobe Pass error. Now I'm getting "ExtractorError: Go said: 1025:Unable to retrieve required files for playback. Please try again in a few minutes."
An error that was assumed to be fixed in early may. This probably explained why the program worked that one evening. So the latest version may not have the Adobe Pass error, but it definitely has the one above. I won't be able to post an issue for more than 16 hours. If someone reading this can, please run a test on any full ABC show (clips download okay) that's not locked. If you get error 1025, if there's nothing open on it already, please post an issue ASAP! You'll be doing us all a favor by getting this error on the right track.
It it is an open issue, please provide a URL to it so we can follow it.

@kucksdorfs
Copy link

What's going on with this PR? This has been implemented in youtube-dlc months ago: blackjack4494#149 (comment)

@liamengland1
Copy link

liamengland1 commented Jan 22, 2021

It will not be merged until maintainers fly to US, purchase a cable package, and test it themselves. And no, I'm not joking (well maybe a little bit).

@kucksdorfs
Copy link

It will not be merged until maintainers fly to US, purchase a cable package, and test it themselves. And no, I'm not joking (well maybe a little bit).

Would SSH access to a Raspberry Pi on a US ISP work?

@rautamiekka
Copy link
Contributor

It will not be merged until maintainers fly to US, purchase a cable package, and test it themselves. And no, I'm not joking (well maybe a little bit).

Would SSH access to a Raspberry Pi on a US ISP work?

Don't you need to play the vids too ?

@kucksdorfs
Copy link

It will not be merged until maintainers fly to US, purchase a cable package, and test it themselves. And no, I'm not joking (well maybe a little bit).

Would SSH access to a Raspberry Pi on a US ISP work?

Don't you need to play the vids too ?

I think this could be handled by rsync or X11 forwarding (depending on how testing would need to get done). Or you know, whoever provides the SSH endpoint could also make sure the mp4 (or whatever) file could make sure the file is playable.

@owenthewizard
Copy link

I have a subscription and would be willing to provide any needed access to the maintainers. I'm located in the US.

@kucksdorfs
Copy link

I don't have the login, but I also have a residential IP address in the United States.

@dstftw dstftw closed this in ac19c3a Apr 20, 2021
github-actions bot added a commit to hellopony/youtube-dl that referenced this pull request Apr 21, 2021
* https://github.com/ytdl-org/youtube-dl:
  [youtube] Remove unused code
  [go] Improve video id extraction (closes ytdl-org#25207, closes ytdl-org#25216, closes ytdl-org#26058)
  [test_execution] Add test for lazy extractors (refs ytdl-org#28780)
  [test_youtube_misc] Move YoutubeIE.extract_id test into separate module
  [youtube] Fix lazy extractors (closes ytdl-org#28780)
  [bbc] Extract full description from __INITIAL_DATA__ (refs ytdl-org#28774)
  [bbc] Extract description and timestamp from __INITIAL_DATA__ (ytdl-org#28774)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Go] Abc.com giving Adobe Pass error