From 9717986128ee737e24dd2254b7f2d35750d1a7a2 Mon Sep 17 00:00:00 2001 From: Asry18 Date: Fri, 21 Feb 2025 15:09:37 +0530 Subject: [PATCH 1/3] - Implemented _parse_date method to convert dateTimeString to a UNIX timestamp. --- youtube_dl/extractor/stretchinternet.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/stretchinternet.py b/youtube_dl/extractor/stretchinternet.py index ec08eae55..d565344e3 100644 --- a/youtube_dl/extractor/stretchinternet.py +++ b/youtube_dl/extractor/stretchinternet.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals - from .common import InfoExtractor - +from datetime import datetime +import pytz class StretchInternetIE(InfoExtractor): _VALID_URL = r'https?://portal\.stretchinternet\.com/[^/]+/(?:portal|full)\.htm\?.*?\beventId=(?P\d+)' @@ -23,6 +23,7 @@ class StretchInternetIE(InfoExtractor): media_url = self._download_json( 'https://core.stretchlive.com/trinity/event/tcg/' + video_id, video_id)[0]['media'][0]['url'] + event = self._download_json( 'https://neo-client.stretchinternet.com/portal-ws/getEvent.json', video_id, query={'eventID': video_id, 'token': 'asdf'})['event'] @@ -30,8 +31,19 @@ class StretchInternetIE(InfoExtractor): return { 'id': video_id, 'title': event['title'], - # TODO: parse US timezone abbreviations - # 'timestamp': event.get('dateTimeString'), + 'timestamp': self._parse_date(event.get('dateTimeString')), 'url': 'https://' + media_url, 'uploader_id': event.get('ownerID'), } + + def _parse_date(self, date_string): + if date_string: + # Assume date_string is in the format 'YYYY-MM-DDTHH:MM:SS-05:00' + try: + dt = datetime.strptime(date_string, '%Y-%m-%dT%H:%M:%S%z') + # Convert the datetime to UTC (if it's not already) + dt_utc = dt.astimezone(pytz.UTC) + return int(dt_utc.timestamp()) + except ValueError: + self._downloader.report_warning(f"Could not parse date string: {date_string}") + return None From c8364d6417a324eabcdc627014c1d6fbe3929326 Mon Sep 17 00:00:00 2001 From: Asry18 Date: Sat, 22 Feb 2025 19:13:49 +0530 Subject: [PATCH 2/3] This update removes the dependency on `pytz` while maintaining accurate timestamp extraction. --- youtube_dl/extractor/stretchinternet.py | 48 ++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/youtube_dl/extractor/stretchinternet.py b/youtube_dl/extractor/stretchinternet.py index d565344e3..752f8ca11 100644 --- a/youtube_dl/extractor/stretchinternet.py +++ b/youtube_dl/extractor/stretchinternet.py @@ -1,29 +1,22 @@ from __future__ import unicode_literals from .common import InfoExtractor -from datetime import datetime -import pytz +from datetime import datetime, timezone +try: + from zoneinfo import ZoneInfo # Python 3.9+ +except ImportError: + from ..compat import compat_zoneinfo as ZoneInfo # Fallback for older versions + +from ..utils import unified_timestamp, parse_iso8601 class StretchInternetIE(InfoExtractor): _VALID_URL = r'https?://portal\.stretchinternet\.com/[^/]+/(?:portal|full)\.htm\?.*?\beventId=(?P\d+)' - _TEST = { - 'url': 'https://portal.stretchinternet.com/umary/portal.htm?eventId=573272&streamType=video', - 'info_dict': { - 'id': '573272', - 'ext': 'mp4', - 'title': 'UNIVERSITY OF MARY WRESTLING VS UPPER IOWA', - # 'timestamp': 1575668361, - # 'upload_date': '20191206', - 'uploader_id': '99997', - } - } def _real_extract(self, url): video_id = self._match_id(url) - media_url = self._download_json( 'https://core.stretchlive.com/trinity/event/tcg/' + video_id, video_id)[0]['media'][0]['url'] - + event = self._download_json( 'https://neo-client.stretchinternet.com/portal-ws/getEvent.json', video_id, query={'eventID': video_id, 'token': 'asdf'})['event'] @@ -37,13 +30,20 @@ class StretchInternetIE(InfoExtractor): } def _parse_date(self, date_string): - if date_string: - # Assume date_string is in the format 'YYYY-MM-DDTHH:MM:SS-05:00' - try: - dt = datetime.strptime(date_string, '%Y-%m-%dT%H:%M:%S%z') - # Convert the datetime to UTC (if it's not already) - dt_utc = dt.astimezone(pytz.UTC) - return int(dt_utc.timestamp()) - except ValueError: - self._downloader.report_warning(f"Could not parse date string: {date_string}") + """Parses an ISO 8601 date string into a UNIX timestamp.""" + if not date_string: + return None + + # Try using youtube-dl's existing utilities + timestamp = unified_timestamp(date_string) or parse_iso8601(date_string) + if timestamp is not None: + return timestamp + + try: + # Manual parsing for cases not handled by utils + dt = datetime.strptime(date_string, '%Y-%m-%dT%H:%M:%S%z') + return int(dt.timestamp()) # UTC timestamp + except ValueError: + self._downloader.report_warning(f"Could not parse date string: {date_string}") + return None From 0e91062090cb39a5482edc13f4f8222a0cbc2c9e Mon Sep 17 00:00:00 2001 From: Asry18 Date: Sat, 22 Feb 2025 22:08:01 +0530 Subject: [PATCH 3/3] Removed pytz, added zoneinfo fallback, and improved timestamp parsing --- youtube_dl/extractor/stretchinternet.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/youtube_dl/extractor/stretchinternet.py b/youtube_dl/extractor/stretchinternet.py index 752f8ca11..fa968c5bd 100644 --- a/youtube_dl/extractor/stretchinternet.py +++ b/youtube_dl/extractor/stretchinternet.py @@ -1,10 +1,11 @@ from __future__ import unicode_literals + from .common import InfoExtractor -from datetime import datetime, timezone +from datetime import datetime try: - from zoneinfo import ZoneInfo # Python 3.9+ + from zoneinfo import ZoneInfo as compat_ZoneInfo # Python 3.9+ except ImportError: - from ..compat import compat_zoneinfo as ZoneInfo # Fallback for older versions + compat_ZoneInfo = None # Fallback: Do not handle alphabetic time zones from ..utils import unified_timestamp, parse_iso8601 @@ -13,6 +14,7 @@ class StretchInternetIE(InfoExtractor): def _real_extract(self, url): video_id = self._match_id(url) + media_url = self._download_json( 'https://core.stretchlive.com/trinity/event/tcg/' + video_id, video_id)[0]['media'][0]['url'] @@ -33,16 +35,16 @@ class StretchInternetIE(InfoExtractor): """Parses an ISO 8601 date string into a UNIX timestamp.""" if not date_string: return None - - # Try using youtube-dl's existing utilities + + # Attempt to use built-in utils first timestamp = unified_timestamp(date_string) or parse_iso8601(date_string) if timestamp is not None: return timestamp try: - # Manual parsing for cases not handled by utils + # Manually parse ISO 8601 datetime string with numeric timezone offset dt = datetime.strptime(date_string, '%Y-%m-%dT%H:%M:%S%z') - return int(dt.timestamp()) # UTC timestamp + return int(dt.timestamp()) # Convert to UNIX timestamp except ValueError: self._downloader.report_warning(f"Could not parse date string: {date_string}")