diff --git a/source/ChanSort.Loader.Philips/ChanSort.Loader.Philips.ini b/source/ChanSort.Loader.Philips/ChanSort.Loader.Philips.ini index 5787eff..f945f39 100644 --- a/source/ChanSort.Loader.Philips/ChanSort.Loader.Philips.ini +++ b/source/ChanSort.Loader.Philips/ChanSort.Loader.Philips.ini @@ -391,22 +391,19 @@ allowDelete=false # No XML indentation, added element, uppercase hex, padded names, "Scrambled" attribute (with a "d" at the end) [Map105] -# satelliteListcopy: true|false|remove|(empty); when empty the original value is kept as-is; "remove" removes the XML element; default: empty -satelliteListcopy= padChannelName=true setFavoriteNumber=false setReorderedFavNumber=false reorderRecordsByChannelNumber=true # incrementFavListVersion: true|false; when true the Version attribute in the Favorite.xml file gets incremented every time the file is saved; default: false incrementFavListVersion=true -allowDelete=true +allowDelete=false ############################################################################ # ChannelMap_110: same as 105 with an additional "UserReorderChannel" attribute (which should probably left unchanged, even after reordering) [Map110] -satelliteListcopy= padChannelName=true setFavoriteNumber=false setReorderedFavNumber=false @@ -414,4 +411,16 @@ setReorderedFavNumber=false userReorderChannel=0 reorderRecordsByChannelNumber=true incrementFavListVersion=true -allowDelete=true +allowDelete=false + +############################################################################ +# ChannelMap_110: same as 110 + +[Map115] +padChannelName=true +setFavoriteNumber=false +setReorderedFavNumber=false +userReorderChannel=0 +reorderRecordsByChannelNumber=true +incrementFavListVersion=true +allowDelete=false diff --git a/source/ChanSort.Loader.Philips/XmlSerializer.cs b/source/ChanSort.Loader.Philips/XmlSerializer.cs index 922f02d..fc9d127 100644 --- a/source/ChanSort.Loader.Philips/XmlSerializer.cs +++ b/source/ChanSort.Loader.Philips/XmlSerializer.cs @@ -605,21 +605,6 @@ namespace ChanSort.Loader.Philips { if (reorderNodes && (file.formatVersion == FormatVersion.RepairXml || Path.GetFileName(file.path).ToLowerInvariant().StartsWith("dvb"))) this.ReorderNodes(file); - var satelliteListcopy = this.iniMapSection?.GetString("satelliteListcopy") ?? ""; - var nodeList = file.doc.GetElementsByTagName("SatelliteListcopy"); - var arr = new XmlNode[nodeList.Count]; - for (int i = 0; i < arr.Length; i++) - arr[i] = nodeList[i]; - if (satelliteListcopy == "" || satelliteListcopy == "delete" || satelliteListcopy == "remove") - { - foreach (XmlNode elem in arr) - elem.ParentNode.RemoveChild(elem); - } - else - { - foreach (XmlNode elem in arr) - elem.InnerText = satelliteListcopy; - } this.SaveFile(file); } diff --git a/source/changelog.md b/source/changelog.md index ccaae56..a520737 100644 --- a/source/changelog.md +++ b/source/changelog.md @@ -1,7 +1,9 @@ ChanSort Change Log =================== -TBD +2021-09-23_1945 +- Philips: disabled deleting of channels for ChannelMap\_100 - 115, except for version 100 without any .bin files. + (Lists with .bin files require that the .xml file contains all the same channels to override all channel numbers) - Panasonic: improved symbol rate and satellite position detection - startup window location and size are adjusted to fit on screen