Skip to content

Commit

Permalink
[motherless] Fix recent videos upload date extraction (closes ytdl-or…
Browse files Browse the repository at this point in the history
…g#27661)

Less than a week old videos use a '20h ago' or '1d ago' format.

I kept the support for 'Ago' with uppercase start at is was already in the code.
  • Loading branch information
cladmi authored and ThirumalaiK committed Jan 28, 2021
1 parent fc24dbc commit 0ce1a48
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions youtube_dl/extractor/motherless.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,27 @@ def _real_extract(self, url):
or 'http://cdn4.videos.motherlessmedia.com/videos/%s.mp4?fs=opencloud' % video_id)
age_limit = self._rta_search(webpage)
view_count = str_to_int(self._html_search_regex(
(r'>(\d+)\s+Views<', r'<strong>Views</strong>\s+([^<]+)<'),
(r'>([\d,.]+)\s+Views<', # 1,234,567 Views
r'<strong>Views</strong>\s+([^<]+)<'),
webpage, 'view count', fatal=False))
like_count = str_to_int(self._html_search_regex(
(r'>(\d+)\s+Favorites<', r'<strong>Favorited</strong>\s+([^<]+)<'),
(r'>([\d,.]+)\s+Favorites<', # 1,234 Favorites
r'<strong>Favorited</strong>\s+([^<]+)<'),
webpage, 'like count', fatal=False))

upload_date = self._html_search_regex(
(r'class=["\']count[^>]+>(\d+\s+[a-zA-Z]{3}\s+\d{4})<',
r'class=["\']count[^>]+>(\d+[hd])\s+[aA]go<', # 20h/1d ago
r'<strong>Uploaded</strong>\s+([^<]+)<'), webpage, 'upload date')
if 'Ago' in upload_date:
days = int(re.search(r'([0-9]+)', upload_date).group(1))
upload_date = (datetime.datetime.now() - datetime.timedelta(days=days)).strftime('%Y%m%d')
relative = re.match(r'(\d+)([hd])$', upload_date)
if relative:
delta = int(relative.group(1))
unit = relative.group(2)
if unit == 'h':
delta_t = datetime.timedelta(hours=delta)
else: # unit == 'd'
delta_t = datetime.timedelta(days=delta)
upload_date = (datetime.datetime.now() - delta_t).strftime('%Y%m%d')
else:
upload_date = unified_strdate(upload_date)

Expand Down

0 comments on commit 0ce1a48

Please sign in to comment.