From 62d244719aaaa7d7729b53bf040c50bdffa33da0 Mon Sep 17 00:00:00 2001
From: Huevos <rowland@moralet.com>
Date: Thu, 31 Oct 2019 02:47:31 +0100
Subject: [PATCH] [frequencyfinder.py] avoid unencoded ampersands in
 network_name, attempt 2

---
 AutoBouquetsMaker/src/scanner/frequencyfinder.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AutoBouquetsMaker/src/scanner/frequencyfinder.py b/AutoBouquetsMaker/src/scanner/frequencyfinder.py
index 3a4804a9..479c27ac 100644
--- a/AutoBouquetsMaker/src/scanner/frequencyfinder.py
+++ b/AutoBouquetsMaker/src/scanner/frequencyfinder.py
@@ -502,7 +502,7 @@ def readNIT(self):
 					nit_current_content += section["content"]
 
 					if 'network_name' in section["header"] and section["header"]["network_name"] != "Unknown":
-						self.network_name = section["header"]["network_name"]
+						self.network_name = re.sub(r'&(?![A-Za-z]+[0-9]*;|#[0-9]+;|#x[0-9a-fA-F]+;)', r'&amp;', section["header"]["network_name"])  # regex to avoid unencoded ampersands that are not entities
 
 					if len(nit_current_sections_read) == nit_current_sections_count:
 						nit_current_completed = True
@@ -561,7 +561,7 @@ def saveProviderFile(self):
 				break
 		network_name = self.strongestTransponder["network_name"]
 		customProviderList.append('<provider>\n')
-		customProviderList.append('\t<name>%s terrestrial</name>\n' % re.sub(r'&(?![A-Za-z]+[0-9]*;|#[0-9]+;|#x[0-9a-fA-F]+;)', r'&amp;', network_name)) # regex to avoid unencoded ampersands that are not entities
+		customProviderList.append('\t<name>%s terrestrial</name>\n' % network_name)
 		customProviderList.append('\t<streamtype>dvbt</streamtype>\n')
 		customProviderList.append('\t<protocol>lcn</protocol>\n')
 		customProviderList.append('\t<dvbtconfigs>\n')