[watchindianporn] Fix parser #13415
Merged
[watchindianporn] Fix parser #13415
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
dstftw
requested changes
Jun 18, 2017
| @@ -41,34 +37,26 @@ def _real_extract(self, url): | |||
| webpage = self._download_webpage(url, display_id) | |||
|
|
|||
| video_url = self._html_search_regex( | |||
| r"url: escape\('([^']+)'\)", webpage, 'url') | |||
| r'<source[^<]+type=[\'"]video/mp4[\'"\s]*src=[\'"]([^\'"]+)', webpage, 'url') | |||
There was a problem hiding this comment.
_parse_html5_media_entries.
| webpage, 'title') | ||
| title = self._html_search_regex(( | ||
| r'<title>(.*?)- Indian Porn</title>', | ||
| r'<h4>(.*?)</h4>' |
There was a problem hiding this comment.
Do not capture empty strings.
| r'<td>Comments:\s*</td>\s*<td align="right"><span>\s*(\d+)\s*</span>', | ||
| webpage, 'comment count', fatal=False)) | ||
| r'Time:\s*<strong>\s*.+?\s*<\/strong>.*?<strong>\s*(\d+)\s*</strong>', | ||
| webpage, 'view count', flags=re.DOTALL, fatal=False)) |
|
|
||
| categories = re.findall( | ||
| r'<a href="[^"]+/search/video/desi"><span>([^<]+)</span></a>', | ||
| r'<a>[^<]+?class=[\'"]categories[\'">]*([^<]+)</a>', |
|
Updated |
dstftw
requested changes
Jun 19, 2017
| upload_date = unified_strdate(self._html_search_regex( | ||
| r'Added: <strong>(.+?)</strong>', webpage, 'upload date', fatal=False)) | ||
| title = self._html_search_regex(( | ||
| r'<title>(.+?)-[\s]+Indian[\s]+Porn</title>', |
| webpage, 'duration', fatal=False)) | ||
|
|
||
| view_count = int_or_none(self._search_regex( | ||
| r'<td>Views:\s*</td>\s*<td align="right"><span>\s*(\d+)\s*</span>', | ||
| r'(?s)Time:\s*<strong>\s*.+?\s*<\/strong>.*?<strong>\s*(\d+)\s*</strong>', |
|
|
||
| categories = re.findall( | ||
| r'<a href="[^"]+/search/video/desi"><span>([^<]+)</span></a>', | ||
| r'<a[^<]+?class=[\'"]categories[\'">]*([^<]+)</a>', |
| upload_date = unified_strdate(self._html_search_regex( | ||
| r'Added: <strong>(.+?)</strong>', webpage, 'upload date', fatal=False)) | ||
| title = self._html_search_regex(( | ||
| r'<title>(.+?)-[\s]+Indian[\s]+Porn</title>', |
|
I'm not sure if the last regex is correct. Look forward to your answer @dstftw |
|
Not correct. |
|
I hope I understood |
|
No you don't. |
|
Oh, I swear, I didn't see it. I thought the mistake was at the end. If the rest is right I fix it and squash commits |
|
Fixed @dstftw |
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.
Before submitting a pull request make sure you have:
In order to be accepted and merged into youtube-dl each piece of code must be in public domain or released under Unlicense. Check one of the following options:
What is the purpose of your pull request?
Description of your pull request and other information
Fix #13411. Note that uploader, upload_info and comment_count infos are no more present in the service.