From a9031e8e7b6bfcf1b207c56a83cf376e627e9e4b Mon Sep 17 00:00:00 2001 From: Audionut Date: Fri, 1 Nov 2024 20:01:31 +1000 Subject: [PATCH 1/2] Revert only tacker timeout handling Was catching wait time editing descriptions and the like --- src/prep.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/prep.py b/src/prep.py index 01bad30dd..73910b163 100644 --- a/src/prep.py +++ b/src/prep.py @@ -552,7 +552,6 @@ async def gather_prep(self, meta, mode): if match: found_match = True else: - timeout_duration = 2 # seconds # Process all trackers with API = true if no specific tracker is set in meta default_trackers = self.config['TRACKERS'].get('default_trackers', "").split(", ") @@ -566,8 +565,6 @@ async def gather_prep(self, meta, mode): ) if match: found_match = True - except asyncio.TimeoutError: - print("PTP tracker request timed out.") except aiohttp.ClientSSLError: print("PTP tracker request failed due to SSL error.") except requests.exceptions.ConnectionError as conn_err: @@ -584,8 +581,6 @@ async def gather_prep(self, meta, mode): ) if match: found_match = True - except asyncio.TimeoutError: - print("BLU tracker request timed out.") except aiohttp.ClientSSLError: print("BLU tracker request failed due to SSL error.") except requests.exceptions.ConnectionError as conn_err: @@ -601,8 +596,6 @@ async def gather_prep(self, meta, mode): ) if match: found_match = True - except asyncio.TimeoutError: - print("AITHER tracker request timed out.") except aiohttp.ClientSSLError: print("AITHER tracker request failed due to SSL error.") except requests.exceptions.ConnectionError as conn_err: @@ -618,8 +611,6 @@ async def gather_prep(self, meta, mode): ) if match: found_match = True - except asyncio.TimeoutError: - print("LST tracker request timed out.") except aiohttp.ClientSSLError: print("LST tracker request failed due to SSL error.") except requests.exceptions.ConnectionError as conn_err: @@ -635,8 +626,6 @@ async def gather_prep(self, meta, mode): ) if match: found_match = True - except asyncio.TimeoutError: - print("OE tracker request timed out.") except aiohttp.ClientSSLError: print("OE tracker request failed due to SSL error.") except requests.exceptions.ConnectionError as conn_err: @@ -652,8 +641,6 @@ async def gather_prep(self, meta, mode): ) if match: found_match = True - except asyncio.TimeoutError: - print("TIK tracker request timed out.") except aiohttp.ClientSSLError: print("TIK tracker request failed due to SSL error.") except requests.exceptions.ConnectionError as conn_err: @@ -669,8 +656,6 @@ async def gather_prep(self, meta, mode): ) if match: found_match = True - except asyncio.TimeoutError: - print("HDB tracker request timed out.") except aiohttp.ClientSSLError: print("HDB tracker request failed due to SSL error.") except requests.exceptions.ConnectionError as conn_err: From 44c6492f3090e00688eeec75f17ba241023f9fbe Mon Sep 17 00:00:00 2001 From: Audionut Date: Fri, 1 Nov 2024 20:02:16 +1000 Subject: [PATCH 2/2] Remove definitions also --- src/prep.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/prep.py b/src/prep.py index 73910b163..f496b547e 100644 --- a/src/prep.py +++ b/src/prep.py @@ -561,7 +561,6 @@ async def gather_prep(self, meta, mode): try: meta, match = await asyncio.wait_for( self.update_metadata_from_tracker('PTP', ptp, meta, search_term, search_file_folder), - timeout=timeout_duration ) if match: found_match = True @@ -577,7 +576,6 @@ async def gather_prep(self, meta, mode): try: meta, match = await asyncio.wait_for( self.update_metadata_from_tracker('BLU', blu, meta, search_term, search_file_folder), - timeout=timeout_duration ) if match: found_match = True @@ -592,7 +590,6 @@ async def gather_prep(self, meta, mode): try: meta, match = await asyncio.wait_for( self.update_metadata_from_tracker('AITHER', aither, meta, search_term, search_file_folder), - timeout=timeout_duration ) if match: found_match = True @@ -607,7 +604,6 @@ async def gather_prep(self, meta, mode): try: meta, match = await asyncio.wait_for( self.update_metadata_from_tracker('LST', lst, meta, search_term, search_file_folder), - timeout=timeout_duration ) if match: found_match = True @@ -622,7 +618,6 @@ async def gather_prep(self, meta, mode): try: meta, match = await asyncio.wait_for( self.update_metadata_from_tracker('OE', oe, meta, search_term, search_file_folder), - timeout=timeout_duration ) if match: found_match = True @@ -637,7 +632,6 @@ async def gather_prep(self, meta, mode): try: meta, match = await asyncio.wait_for( self.update_metadata_from_tracker('TIK', tik, meta, search_term, search_file_folder), - timeout=timeout_duration ) if match: found_match = True @@ -652,7 +646,6 @@ async def gather_prep(self, meta, mode): try: meta, match = await asyncio.wait_for( self.update_metadata_from_tracker('HDB', hdb, meta, search_term, search_file_folder), - timeout=timeout_duration ) if match: found_match = True