[ie/joqrag] Add extractor #8384
Merged
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
Support radio "超!A&G+" on Nippon Cultural Broadcasting (JOQR).
garret1317
suggested changes
Oct 20, 2023
Co-authored-by: garret <garret1317@yandex.com>
Co-authored-by: garret <garret1317@yandex.com>
Co-authored-by: garret <garret1317@yandex.com>
Co-authored-by: garret <garret1317@yandex.com>
Co-authored-by: garret <garret1317@yandex.com>
|
Hi there, I'm going to add a change: The "joqrag" site stops at night and plays a loop video containing their logo. I think that the extractor should not download the stream but treat it as an "up_coming" live and " Now convert this PR to draft. |
garret1317
reviewed
Oct 21, 2023
Co-authored-by: bashonly <bashonly@bashonly.com>
A failed download will return False and make _search_regex() failed: TypeError: expected string or bytes-like object
bashonly
requested changes
Nov 15, 2023
- Order of imports - More readable url regex - More strict and safer quotes matching - Shorter inner function name - Using single quotes - More lenient start time regex - Inlined description - More readable code for constructing message - Raising exceptions if no m3u8 formats Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>
Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>
bashonly
approved these changes
Dec 12, 2023
yt_dlp/extractor/joqrag.py
Outdated
Comment on lines
15
to
16
| _VALID_URL = [r'https?://www\.uniqueradio\.jp/agplayer5/player\.php', | ||
| r'https?://www\.uniqueradio\.jp/agplayer5/inc-player-hls\.php', |
There was a problem hiding this comment.
Suggested change
| _VALID_URL = [r'https?://www\.uniqueradio\.jp/agplayer5/player\.php', | |
| r'https?://www\.uniqueradio\.jp/agplayer5/inc-player-hls\.php', | |
| _VALID_URL = [r'https?://www\.uniqueradio\.jp/agplayer5/(?:player|inc-player-hls)\.php', |
yt_dlp/extractor/joqrag.py
Outdated
Comment on lines
47
to
50
| def _extract_metadata(self, variable, html, name): | ||
| return clean_html(urllib.parse.unquote_plus(self._search_regex( | ||
| rf'var\s+{variable}\s*=\s*(["\'])(?P<value>(?:(?!\1).)+)\1', | ||
| html, name, group='value', default=''))) or None |
There was a problem hiding this comment.
it's always non-fatal so the name param doesn't really matter
Suggested change
| def _extract_metadata(self, variable, html, name): | |
| return clean_html(urllib.parse.unquote_plus(self._search_regex( | |
| rf'var\s+{variable}\s*=\s*(["\'])(?P<value>(?:(?!\1).)+)\1', | |
| html, name, group='value', default=''))) or None | |
| def _extract_metadata(self, variable, html): | |
| return clean_html(urllib.parse.unquote_plus(self._search_regex( | |
| rf'var\s+{variable}\s*=\s*(["\'])(?P<value>(?:(?!\1).)+)\1', | |
| html, 'metadata', group='value', default=''))) or None |
yt_dlp/extractor/joqrag.py
Outdated
| metadata = self._download_webpage( | ||
| 'https://www.uniqueradio.jp/aandg', video_id, | ||
| note='Downloading metadata', errnote='Failed to download metadata') | ||
| title = self._extract_metadata('Program_name', metadata, 'program title') |
There was a problem hiding this comment.
Suggested change
| title = self._extract_metadata('Program_name', metadata, 'program title') | |
| title = self._extract_metadata('Program_name', metadata) |
yt_dlp/extractor/joqrag.py
Outdated
| 'id': video_id, | ||
| 'title': title, | ||
| 'channel': '超!A&G+', | ||
| 'description': self._extract_metadata('Program_text', metadata, 'program description'), |
There was a problem hiding this comment.
Suggested change
| 'description': self._extract_metadata('Program_text', metadata, 'program description'), | |
| 'description': self._extract_metadata('Program_text', metadata), |
yt_dlp/extractor/joqrag.py
Outdated
Comment on lines
56
to
62
| start_time = self._search_regex( | ||
| r'<h3[^>]+\bclass="dailyProgram-itemHeaderTime"[^>]*>[\s\d:]+–\s*(?P<time>\d{1,2}:\d{1,2})', | ||
| self._download_webpage( | ||
| f'https://www.joqr.co.jp/qr/agdailyprogram/?date={date}', video_id, | ||
| note=f'Downloading program list of {date}', fatal=False, | ||
| errnote=f'Failed to download program list of {date}') or '', | ||
| 'start time of the first program', default=None, group='time') |
There was a problem hiding this comment.
could make this a little less busy
Suggested change
| start_time = self._search_regex( | |
| r'<h3[^>]+\bclass="dailyProgram-itemHeaderTime"[^>]*>[\s\d:]+–\s*(?P<time>\d{1,2}:\d{1,2})', | |
| self._download_webpage( | |
| f'https://www.joqr.co.jp/qr/agdailyprogram/?date={date}', video_id, | |
| note=f'Downloading program list of {date}', fatal=False, | |
| errnote=f'Failed to download program list of {date}') or '', | |
| 'start time of the first program', default=None, group='time') | |
| start_time = self._search_regex( | |
| r'<h3[^>]+\bclass="dailyProgram-itemHeaderTime"[^>]*>[\s\d:]+–\s*(\d{1,2}:\d{1,2})', | |
| self._download_webpage( | |
| f'https://www.joqr.co.jp/qr/agdailyprogram/?date={date}', video_id, | |
| note=f'Downloading program list of {date}', fatal=False, | |
| errnote=f'Failed to download program list of {date}') or '', | |
| 'start time', default=None) |
Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>
9 tasks
aalsuwaidi
pushed a commit
to aalsuwaidi/yt-dlp
that referenced
this pull request
Apr 21, 2024
Authored by: pzhlkj6612
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.
IMPORTANT: PRs without the template will be CLOSED
Description of your pull request and other information
Hi! I would like to let yt-dlp support radio "超!A&G+" on Nippon Cultural Broadcasting (JOQR).
Please do not to be confused with Radiko (radiko.py).
Template
Before submitting a pull request make sure you have:
In order to be accepted and merged into yt-dlp each piece of code must be in public domain or released under Unlicense. Check all of the following options that apply:
What is the purpose of your pull request?
Copilot Summary
🤖 Generated by Copilot at 4f478a9
Summary
📻🇯🇵🎙️
Add support for extracting live streams from JOQR radio station. Add
joqrag.pymodule withJoqrAgIEclass and import it in_extractors.py.Walkthrough
JoqrAgIEclass fromjoqrag.pymodule in_extractors.py(link)JoqrAgIEclass injoqrag.pymodule that inherits fromInfoExtractorbase class (link)suitableandie_keymethods to match the JOQR website url and return the extractor key (link)_real_extractmethod to parse the webpage and extract the metadata and the m3u8 url usingself._html_search_regexandself._extract_m3u8_formatsmethods (link)id,title,formats,is_live, etc. (link)joqrag.pymodule that checks theid,title,ext, andis_livefields of the extracted information (link)