Repository: yt-dlp/yt-dlp
File: yt_dlp/extractor/glomex.py (Python)

Code before:
                data-glomex-player=(?P<_q4>%(quot_re)s)(?P<glomex_player>true)(?P=_q4)|
                [^>]*?
            )+>|
            # naive parsing of inline scripts for hard-coded integration parameters
            <(?P<script_tag>script)[^<]*?>(?:
                (?P<_stjs1>dataset\.)?integrationId\s*(?(_stjs1)=|:)\s*
                    (?P<_q5>%(quot_re)s)(?P<integration_js>(?:(?!(?P=_q5)).)+)(?P=_q5)\s*(?(_stjs1);|,)?|
                (?P<_stjs2>dataset\.)?playlistId\s*(?(_stjs2)=|:)\s*
                    (?P<_q6>%(quot_re)s)(?P<id_js>(?:(?!(?P=_q6)).)+)(?P=_q6)\s*(?(_stjs2);|,)?|
                [^>]*?
            )+</script>
        )''' % {'quot_re': r'["\']', 'url_re': rf'(?:https?:)?{re.escape(cls._BASE_PLAYER_URL)}\?(?:(?!(?P=_q1)).)+'}

        for mobj in re.finditer(EMBED_RE, webpage):
            mdict = mobj.groupdict()
            if mdict.get('url'):
                url = unescapeHTML(mdict['url'])
                if url.startswith('//'):
                    url = f'https:{url}'
                if not cls.suitable(url):
                    continue
                yield cls._smuggle_origin_url(url, origin_url)
            elif mdict.get('html_tag'):
                if mdict['html_tag'] == 'div' and not mdict.get('glomex_player'):
                    continue
                if not mdict.get('video_id_html') or not mdict.get('integration_html'):
                    continue
                yield cls.build_player_url(mdict['video_id_html'], mdict['integration_html'], origin_url)
            elif mdict.get('script_tag'):
                if not mdict.get('video_id_js') or not mdict.get('integration_js'):
                    continue
                yield cls.build_player_url(mdict['video_id_js'], mdict['integration_js'], origin_url)

    def _real_extract(self, url):
        url, origin_url = self._unsmuggle_origin_url(url)
        playlist_id = self._match_id(url)
        integration = parse_qs(url).get('integrationId', [None])[0]
        if not integration:
            raise ExtractorError('No integrationId in URL', expected=True)
        return self._download_and_extract_api_data(playlist_id, integration, origin_url)


Review comment (refactor):
So this now only validates the presence of `playlistId` parameter; `integrationId` is deferred to extraction.

Code after:
        # https://docs.glomex.com/publisher/video-player-integration/javascript-api/
        EMBED_RE = r'''(?x)(?:
            <iframe[^>]+?src=(?P<_q1>%(quot_re)s)(?P<url>%(url_re)s)(?P=_q1)|
            <(?P<html_tag>glomex-player|div)(?:
                data-integration-id=(?P<_q2>%(quot_re)s)(?P<integration_html>(?:(?!(?P=_q2)).)+)(?P=_q2)|
                data-playlist-id=(?P<_q3>%(quot_re)s)(?P<id_html>(?:(?!(?P=_q3)).)+)(?P=_q3)|
                data-glomex-player=(?P<_q4>%(quot_re)s)(?P<glomex_player>true)(?P=_q4)|
                [^>]*?
            )+>|
            # naive parsing of inline scripts for hard-coded integration parameters
            <(?P<script_tag>script)[^<]*?>(?:
                (?P<_stjs1>dataset\.)?integrationId\s*(?(_stjs1)=|:)\s*
                    (?P<_q5>%(quot_re)s)(?P<integration_js>(?:(?!(?P=_q5)).)+)(?P=_q5)\s*(?(_stjs1);|,)?|
                (?P<_stjs2>dataset\.)?playlistId\s*(?(_stjs2)=|:)\s*
                    (?P<_q6>%(quot_re)s)(?P<id_js>(?:(?!(?P=_q6)).)+)(?P=_q6)\s*(?(_stjs2);|,)?|
                (?:\s|.)*?
            )+</script>
        )''' % {'quot_re': r'["\']', 'url_re': VALID_SRC}

        for mobj in re.finditer(EMBED_RE, webpage):
            mdict = mobj.groupdict()
            if mdict.get('url'):
                url = unescapeHTML(mdict['url'])
                if url.startswith('//'):
                    url = f'https:{url}'
                if not cls.suitable(url):
                    continue
                yield cls._smuggle_origin_url(url, origin_url)
            elif mdict.get('html_tag'):
                if mdict['html_tag'] == 'div' and not mdict.get('glomex_player'):
                    continue
                if not mdict.get('video_id_html') or not mdict.get('integration_html'):
                    continue
                yield cls.build_player_url(mdict['video_id_html'], mdict['integration_html'], origin_url)
            elif mdict.get('script_tag'):
                if not mdict.get('video_id_js') or not mdict.get('integration_js'):
                    continue
                yield cls.build_player_url(mdict['video_id_js'], mdict['integration_js'], origin_url)

    def _real_extract(self, url):
        url, origin_url = self._unsmuggle_origin_url(url)
        playlist_id = self._match_id(url)
        integration = parse_qs(url).get('integrationId', [None])[0]
        if not integration:
            raise ExtractorError('No integrationId in URL', expected=True)
        return self._download_and_extract_api_data(playlist_id, integration, origin_url)