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.

Sign up for GitHub

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

release 03.09.2020 v1 - twitch fix #35

Merged
merged 11 commits into from
Sep 3, 2020
Merged

release 03.09.2020 v1 - twitch fix #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b811749
Attempt to fix Twitch extractors for new URLs
lel-amri Jul 17, 2019
cb7a087
[twitch.py] Removed obsolete IE
lel-amri Jul 18, 2019
7679c23
[twitch.py] Modified _VALID_URL of all playlist IEs
lel-amri Jul 18, 2019
a7d44de
Reverting the removal of TwitchVideoIE and TwitchChapterIE
lel-amri Jul 20, 2019
ca7e9e1
[twitch.py] Improved _VALID_URL
lel-amri Jul 20, 2019
d28026d
[twitch] Modified _VALID_URL for TwitchAllVideosIE
lel-amri Jul 29, 2019
424dc7b
[skip travis] add pypi badge
blackjack4494 Sep 3, 2020
2028c64
[skip travis] quick fix readme
blackjack4494 Sep 3, 2020
dac4ecf
Merge branch 'twitch-fix' of https://github.com/lel-amri/youtube-dl i…
blackjack4494 Sep 3, 2020
5627160
Merge branch 'lel-amri-twitch-fix'
blackjack4494 Sep 3, 2020
633c285
[skip travis] twitch release.
blackjack4494 Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[![PyPi](https://img.shields.io/pypi/v/youtube-dlc.svg)](https://pypi.org/project/youtube-dlc)
[![Build Status](https://travis-ci.com/blackjack4494/youtube-dlc.svg?branch=master)](https://travis-ci.com/blackjack4494/youtube-dlc)
[![Downloads](https://pepy.tech/badge/youtube-dlc)](https://pepy.tech/project/youtube-dlc)

Expand Down
40 changes: 22 additions & 18 deletions youtube_dlc/extractor/twitch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,82 +458,86 @@ class TwitchProfileIE(TwitchPlaylistBaseIE):

class TwitchVideosBaseIE(TwitchPlaylistBaseIE):
_VALID_URL_VIDEOS_BASE = r'%s/(?P<id>[^/]+)/videos' % TwitchBaseIE._VALID_URL_BASE
_VALID_URL_VIDEOS_FILTERS = r'\?(?:.*?[&;])??filter=%s'
_PLAYLIST_PATH = TwitchPlaylistBaseIE._PLAYLIST_PATH + '&broadcast_type='


class TwitchAllVideosIE(TwitchVideosBaseIE):
IE_NAME = 'twitch:videos:all'
_VALID_URL = r'%s/all' % TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE
_VALID_URL = '%s/?(?:(?:%s)|$)' % (
TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE,
TwitchVideosBaseIE._VALID_URL_VIDEOS_FILTERS % 'all'
)
_PLAYLIST_PATH = TwitchVideosBaseIE._PLAYLIST_PATH + 'archive,upload,highlight'
_PLAYLIST_TYPE = 'all videos'

_TESTS = [{
'url': 'https://www.twitch.tv/spamfish/videos/all',
'url': 'https://www.twitch.tv/spamfish/videos?filter=all&sort=time',
'info_dict': {
'id': '497952',
'title': 'Spamfish',
},
'playlist_mincount': 869,
}, {
'url': 'https://m.twitch.tv/spamfish/videos/all',
'url': 'https://m.twitch.tv/spamfish/videos/',
'only_matching': True,
}]


class TwitchUploadsIE(TwitchVideosBaseIE):
IE_NAME = 'twitch:videos:uploads'
_VALID_URL = r'%s/uploads' % TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE
_VALID_URL = '%s/?(?:%s)' % (
TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE,
TwitchVideosBaseIE._VALID_URL_VIDEOS_FILTERS % 'uploads'
)
_PLAYLIST_PATH = TwitchVideosBaseIE._PLAYLIST_PATH + 'upload'
_PLAYLIST_TYPE = 'uploads'

_TESTS = [{
'url': 'https://www.twitch.tv/spamfish/videos/uploads',
'url': 'https://www.twitch.tv/spamfish/videos?filter=uploads&sort=time',
'info_dict': {
'id': '497952',
'title': 'Spamfish',
},
'playlist_mincount': 0,
}, {
'url': 'https://m.twitch.tv/spamfish/videos/uploads',
'only_matching': True,
}]


class TwitchPastBroadcastsIE(TwitchVideosBaseIE):
IE_NAME = 'twitch:videos:past-broadcasts'
_VALID_URL = r'%s/past-broadcasts' % TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE
_VALID_URL = '%s/?(?:%s)' % (
TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE,
TwitchVideosBaseIE._VALID_URL_VIDEOS_FILTERS % 'archives'
)
_PLAYLIST_PATH = TwitchVideosBaseIE._PLAYLIST_PATH + 'archive'
_PLAYLIST_TYPE = 'past broadcasts'

_TESTS = [{
'url': 'https://www.twitch.tv/spamfish/videos/past-broadcasts',
'url': 'https://www.twitch.tv/spamfish/videos?filter=archives&sort=time',
'info_dict': {
'id': '497952',
'title': 'Spamfish',
},
'playlist_mincount': 0,
}, {
'url': 'https://m.twitch.tv/spamfish/videos/past-broadcasts',
'only_matching': True,
}]


class TwitchHighlightsIE(TwitchVideosBaseIE):
IE_NAME = 'twitch:videos:highlights'
_VALID_URL = r'%s/highlights' % TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE
_VALID_URL = '%s/?(?:%s)' % (
TwitchVideosBaseIE._VALID_URL_VIDEOS_BASE,
TwitchVideosBaseIE._VALID_URL_VIDEOS_FILTERS % 'highlights'
)
_PLAYLIST_PATH = TwitchVideosBaseIE._PLAYLIST_PATH + 'highlight'
_PLAYLIST_TYPE = 'highlights'

_TESTS = [{
'url': 'https://www.twitch.tv/spamfish/videos/highlights',
'url': 'https://www.twitch.tv/spamfish/videos?filter=highlights&sort=views',
'info_dict': {
'id': '497952',
'title': 'Spamfish',
},
'playlist_mincount': 805,
}, {
'url': 'https://m.twitch.tv/spamfish/videos/highlights',
'only_matching': True,
}]


Expand Down
2 changes: 1 addition & 1 deletion youtube_dlc/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from __future__ import unicode_literals

__version__ = '2020.09.03'
__version__ = '2020.09.03.1'