Separate warnings

main
Bob Mottram 2023-08-05 11:36:09 +01:00
parent 2dbac791f5
commit b72bce31d0
1 changed files with 4 additions and 4 deletions

View File

@ -1372,8 +1372,9 @@ def get_rss(base_dir: str, domain: str, session, url: str,
timeout=timeout_sec, timeout=timeout_sec,
allow_redirects=False) allow_redirects=False)
if result: if result:
if int(len(result.text) / 1024) < max_feed_size_kb and \ if int(len(result.text) / 1024) >= max_feed_size_kb:
not contains_invalid_chars(result.text): print('WARN: feed is too large: ' + url)
elif not contains_invalid_chars(result.text):
return _xml_str_to_dict(base_dir, domain, result.text, return _xml_str_to_dict(base_dir, domain, result.text,
moderated, mirrored, moderated, mirrored,
max_posts_per_source, max_posts_per_source,
@ -1382,8 +1383,7 @@ def get_rss(base_dir: str, domain: str, session, url: str,
session, debug, session, debug,
preferred_podcast_formats, preferred_podcast_formats,
system_language) system_language)
print('WARN: feed is too large, ' + print('WARN: feed contains invalid characters: ' + url)
'or contains invalid characters: ' + url)
else: else:
print('WARN: no result returned for feed ' + url) print('WARN: no result returned for feed ' + url)
except requests.exceptions.RequestException as ex: except requests.exceptions.RequestException as ex: