From e8b11fd0ddd1c4deb5a8b87645a0059c79ec9ccf Mon Sep 17 00:00:00 2001 From: Advik Date: Tue, 24 Oct 2023 16:06:35 +0530 Subject: [PATCH] Remove unreachable code and final hotfix https://github.com/jsavargas/zspotify/issues/149#issuecomment-1773933227 --- librespot/audio/__init__.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/librespot/audio/__init__.py b/librespot/audio/__init__.py index 9db6424..7c102c7 100644 --- a/librespot/audio/__init__.py +++ b/librespot/audio/__init__.py @@ -545,18 +545,15 @@ class CdnManager: self.__expiration = expires_at * 1000 else: try: - i = token_url.query.index("_") + self.__expiration = int(re.search(r'16\d{8}', token_url.query).group(0)) * 1000 + return except ValueError: self.__expiration = -1 self.__cdn_manager.logger.warning( f"Couldn't extract expiration, invalid parameter in CDN url: {url}" ) return - try: - self.__expiration = int(token_url.query[:i]) * 1000 - except: - self.__expiration = int(re.search(r'\d{10}', token_url.query[:i]).group(0)) * 1000 - + else: self.__expiration = -1