[funimation] Extract more format info from site #9515
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
youtube_dl/extractor/funimation.py
Outdated
| query = compat_parse_qs(compat_urllib_parse_urlparse(url).query) | ||
| preference = None | ||
| if query.get('watch') is not None and len(query.get('watch')) > 0: | ||
| preference = query.get('watch')[-1] |
There was a problem hiding this comment.
This can be simplified to query.get('watch', [None])[-1].
|
Add some tests for series related fields.
Add a test for that also. Squash commits when done. |
|
Thanks for the review. I'll make the changes once I have a chance. |
Parent5446
force-pushed
the
funimation-fixes
branch
from
89853da to
1d42635
Compare
|
@dstftw did I miss anything? I don't see any further comments. |
youtube_dl/extractor/funimation.py
Outdated
| .format(playlist.get('showId'), pagenum * 20)) | ||
| request.add_header('User-Agent', user_agent) | ||
| episode_list = self._download_json( | ||
| request, display_id, 'Downloading episode list from {}'.format(pagenum * 20))['main'] |
There was a problem hiding this comment.
{} does not work in python 2.6.
There was a problem hiding this comment.
Compatibility kicks me in the ass again. Will fix quickly. (And sorry for not testing 2.6. I forgot on the last commit.)
Use the JSON playlist information provided by Funimation to extract more attributes about the stream formats, such as season and episode number. Also fixed the returned video information to use the 'series' key rather than the 'artist' key, the latter of which is meant for albums. Also, determine whether the user supplied the subtitle or English dub URL based on the query parameters, and set the language preference based on that and the site-provided stream info.
Add new InfoExtractor for Funimation series and video pages to make playlists of all videos in a series, similar to the existing CrunchyrollShowPlaylistIE class. Also adjusted the tests for both Funimation extractors to match pages that actually exist.
Parent5446
force-pushed
the
funimation-fixes
branch
from
747751a to
e82d98c
Compare
|
@dstftw Friendly ping |
|
Nice work @Parent5446! However, I noticed a few issues when using this patch:
|
Closed
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use the JSON playlist information provided by Funimation to extract more
attributes about the stream formats, such as season and episode
number. Also fixed the returned video information to use the 'series'
key rather than the 'artist' key, the latter of which is meant for
albums.
Also, determine whether the user supplied the subtitle or English dub
URL based on the query parameters, and set the language preference based
on that and the site-provided stream info.