[fix] hostname_replace.py: don't stop replace URL in fields

This is a rewrite of the hostname_replace.py that:

- don't stop to replace URL in fields ('data_src', 'audio_src') if there isn't a
  'parsed_url',
- adds a comment about keep or remove a result from the result list
- adds a loop over ['data_src', 'audio_src'] instead of doubling code lines

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2022-02-13 12:34:04 +01:00
parent 98cab4cf75
commit 795e8af61d

View file

@ -17,26 +17,30 @@ replacements = {re.compile(p): r for (p, r) in settings[plugin_id].items()} if p
logger = logger.getChild(plugin_id) logger = logger.getChild(plugin_id)
parsed = 'parsed_url' parsed = 'parsed_url'
_url_fields = ['data_src', 'audio_src']
def on_result(request, search, result): def on_result(request, search, result):
if parsed not in result:
return True
for (pattern, replacement) in replacements.items(): for (pattern, replacement) in replacements.items():
if pattern.search(result[parsed].netloc):
if not replacement: if parsed in result:
return False if pattern.search(result[parsed].netloc):
result[parsed] = result[parsed]._replace(netloc=pattern.sub(replacement, result[parsed].netloc)) # to keep or remove this result from the result list depends
result['url'] = urlunparse(result[parsed]) # (only) on the 'parsed_url'
if result.get('data_src', False): if not replacement:
parsed_data_src = urlparse(result['data_src']) return False
if pattern.search(parsed_data_src.netloc): result[parsed] = result[parsed]._replace(netloc=pattern.sub(replacement, result[parsed].netloc))
parsed_data_src = parsed_data_src._replace(netloc=pattern.sub(replacement, parsed_data_src.netloc)) result['url'] = urlunparse(result[parsed])
result['data_src'] = urlunparse(parsed_data_src)
if result.get('audio_src', False): for url_field in _url_fields:
parsed_audio_src = urlparse(result['audio_src']) if result.get(url_field):
if pattern.search(parsed_audio_src.netloc): url_src = urlparse(result[url_field])
parsed_audio_src = parsed_audio_src._replace(netloc=pattern.sub(replacement, parsed_audio_src.netloc)) if pattern.search(url_src.netloc):
result['audio_src'] = urlunparse(parsed_audio_src) if not replacement:
del result[url_field]
else:
url_src = url_src._replace(netloc=pattern.sub(replacement, url_src.netloc))
result[url_field] = urlunparse(url_src)
return True return True