mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-12 20:23:11 +00:00
Compare commits
2 Commits
df635a09a4
...
fc259cc249
Author | SHA1 | Date | |
---|---|---|---|
|
fc259cc249 | ||
|
9a5b012575 |
7
.github/workflows/build.yml
vendored
7
.github/workflows/build.yml
vendored
@ -161,11 +161,10 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
# In order to create a universal2 application, the version of python3 in /usr/bin has to be used
|
# In order to create a universal2 application, the version of python3 in /usr/bin has to be used
|
||||||
# Pyinstaller is pinned to 4.5.1 because the builds are failing in 4.6, 4.7
|
|
||||||
- name: Install Requirements
|
- name: Install Requirements
|
||||||
run: |
|
run: |
|
||||||
brew install coreutils
|
brew install coreutils
|
||||||
/usr/bin/python3 -m pip install -U --user pip Pyinstaller==4.5.1 -r requirements.txt
|
/usr/bin/python3 -m pip install -U --user pip Pyinstaller==4.9 -r requirements.txt
|
||||||
- name: Bump version
|
- name: Bump version
|
||||||
id: bump_version
|
id: bump_version
|
||||||
run: /usr/bin/python3 devscripts/update-version.py
|
run: /usr/bin/python3 devscripts/update-version.py
|
||||||
@ -234,7 +233,7 @@ jobs:
|
|||||||
# Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
|
# Custom pyinstaller built with https://github.com/yt-dlp/pyinstaller-builds
|
||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip setuptools wheel py2exe
|
python -m pip install --upgrade pip setuptools wheel py2exe
|
||||||
pip install "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-4.5.1-py3-none-any.whl" -r requirements.txt
|
pip install "https://yt-dlp.github.io/Pyinstaller-Builds/x86_64/pyinstaller-4.9-py3-none-any.whl" -r requirements.txt
|
||||||
- name: Bump version
|
- name: Bump version
|
||||||
id: bump_version
|
id: bump_version
|
||||||
env:
|
env:
|
||||||
@ -321,7 +320,7 @@ jobs:
|
|||||||
- name: Install Requirements
|
- name: Install Requirements
|
||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip setuptools wheel
|
python -m pip install --upgrade pip setuptools wheel
|
||||||
pip install "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-4.5.1-py3-none-any.whl" -r requirements.txt
|
pip install "https://yt-dlp.github.io/Pyinstaller-Builds/i686/pyinstaller-4.9-py3-none-any.whl" -r requirements.txt
|
||||||
- name: Bump version
|
- name: Bump version
|
||||||
id: bump_version
|
id: bump_version
|
||||||
env:
|
env:
|
||||||
|
@ -1011,6 +1011,7 @@ from .niconico import (
|
|||||||
NicovideoSearchDateIE,
|
NicovideoSearchDateIE,
|
||||||
NicovideoSearchIE,
|
NicovideoSearchIE,
|
||||||
NicovideoSearchURLIE,
|
NicovideoSearchURLIE,
|
||||||
|
NicovideoTagURLIE,
|
||||||
)
|
)
|
||||||
from .ninecninemedia import (
|
from .ninecninemedia import (
|
||||||
NineCNineMediaIE,
|
NineCNineMediaIE,
|
||||||
|
@ -663,6 +663,8 @@ class NiconicoPlaylistIE(InfoExtractor):
|
|||||||
|
|
||||||
|
|
||||||
class NicovideoSearchBaseIE(InfoExtractor):
|
class NicovideoSearchBaseIE(InfoExtractor):
|
||||||
|
_SEARCH_TYPE = 'search'
|
||||||
|
|
||||||
def _entries(self, url, item_id, query=None, note='Downloading page %(page)s'):
|
def _entries(self, url, item_id, query=None, note='Downloading page %(page)s'):
|
||||||
query = query or {}
|
query = query or {}
|
||||||
pages = [query['page']] if 'page' in query else itertools.count(1)
|
pages = [query['page']] if 'page' in query else itertools.count(1)
|
||||||
@ -677,7 +679,7 @@ class NicovideoSearchBaseIE(InfoExtractor):
|
|||||||
|
|
||||||
def _search_results(self, query):
|
def _search_results(self, query):
|
||||||
return self._entries(
|
return self._entries(
|
||||||
self._proto_relative_url(f'//www.nicovideo.jp/search/{query}'), query)
|
self._proto_relative_url(f'//www.nicovideo.jp/{self._SEARCH_TYPE}/{query}'), query)
|
||||||
|
|
||||||
|
|
||||||
class NicovideoSearchIE(NicovideoSearchBaseIE, SearchInfoExtractor):
|
class NicovideoSearchIE(NicovideoSearchBaseIE, SearchInfoExtractor):
|
||||||
@ -757,6 +759,25 @@ class NicovideoSearchDateIE(NicovideoSearchBaseIE, SearchInfoExtractor):
|
|||||||
yield from super()._entries(url, item_id, query=query, note=note)
|
yield from super()._entries(url, item_id, query=query, note=note)
|
||||||
|
|
||||||
|
|
||||||
|
class NicovideoTagURLIE(NicovideoSearchBaseIE):
|
||||||
|
IE_NAME = 'niconico:tag'
|
||||||
|
IE_DESC = 'NicoNico video tag URLs'
|
||||||
|
_SEARCH_TYPE = 'tag'
|
||||||
|
_VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/tag/(?P<id>[^?#&]+)?'
|
||||||
|
_TESTS = [{
|
||||||
|
'url': 'https://www.nicovideo.jp/tag/ドキュメンタリー淫夢',
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'ドキュメンタリー淫夢',
|
||||||
|
'title': 'ドキュメンタリー淫夢'
|
||||||
|
},
|
||||||
|
'playlist_mincount': 400,
|
||||||
|
}]
|
||||||
|
|
||||||
|
def _real_extract(self, url):
|
||||||
|
query = self._match_id(url)
|
||||||
|
return self.playlist_result(self._entries(url, query), query, query)
|
||||||
|
|
||||||
|
|
||||||
class NiconicoUserIE(InfoExtractor):
|
class NiconicoUserIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/user/(?P<id>\d+)/?(?:$|[#?])'
|
_VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/user/(?P<id>\d+)/?(?:$|[#?])'
|
||||||
_TEST = {
|
_TEST = {
|
||||||
|
Loading…
Reference in New Issue
Block a user