Nemcio/ChanSort
1
0
Fork 0
mirror of https://github.com/PredatH0r/ChanSort.git synced 2026-05-07 03:27:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fixed support for Dijitsu channel lists with missing atv\_cmdb\_2.bin file

Browse Source 
- experimental support for Metz channel\_list.xml lists
This commit is contained in:
Horst Beham
2024-02-25 17:59:34 +01:00
parent a10795285c
commit c609b9b40c
23 changed files with 397 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/ChanSort.Loader.Panasonic/IdtvChannelSerializer.cs
View File

@@ -392,7 +392,7 @@ internal class IdtvChannelSerializer : SerializerBase
//var progNr = chan.ProgNr;
//if (ch.OldProgramNr != progNr) // multiple .db rows with different display_number can reference the same .db row, so skip this check
// throw new LoaderException.Fail($"mismatching display_number between tv.db _id {ch.RecordIndex} ({ch.OldProgramNr}) and idtvChannel.bin record {i} ({progNr})");
if (ch.Name != name)
if (ch.Name != name && name.Length > 0) // if receiving DVB-C and DVB-S and then only rescanning DVB-S, the bin file will clear all DVB-C names
throw LoaderException.Fail($"mismatching name between tv.db _id {ch.RecordIndex} ({ch.Name}) and idtvChannel.bin record {i} ({name})");
if (Math.Abs(ch.FreqInMhz - freq) > 2)
throw LoaderException.Fail($"mismatching frequency between tv.db _id {ch.RecordIndex} ({ch.FreqInMhz}) and idtvChannel.bin record {i} ({freq})");

2
source/ChanSort.Loader.Panasonic/PanasonicPlugin.cs
View File

@@ -29,7 +29,7 @@ namespace ChanSort.Loader.Panasonic
if (ext == ".xml")
{
var data = File.ReadAllBytes(inputFile);
var header = Encoding.ASCII.GetBytes("<ChannelList>\n<ChannelInfo IsModified=");
var header = Encoding.ASCII.GetBytes("<ChannelList>\n<ChannelInfo");
for (int i = 0; i < header.Length; i++)
{
if (data[i] != header[i])

50
source/ChanSort.Loader.Panasonic/XmlSerializer.cs
View File

@@ -100,12 +100,14 @@ namespace ChanSort.Loader.Panasonic
if (fail || root == null || root.LocalName != "ChannelList" || !root.HasChildNodes || root.ChildNodes[0].LocalName != "ChannelInfo")
throw LoaderException.TryNext("File is not a supported Panasonic XML file");
string curListName = null;
int index = 0;
foreach (XmlNode child in root.ChildNodes)
{
switch (child.LocalName)
{
case "ChannelInfo":
this.ReadChannel(child);
this.ReadChannel(child, index++, ref curListName);
break;
}
}
@@ -137,11 +139,21 @@ namespace ChanSort.Loader.Panasonic
#endregion
#region ReadChannel()
private void ReadChannel(XmlNode node)
private void ReadChannel(XmlNode node, int index, ref string curListName)
{
var channelType = node.Attributes?["ChannelType"]?.InnerText;
var list = this.GetOrCreateList(channelType);
var chan = new XmlChannel(list.Count, node);
curListName ??= GetXmlValue(node, "ChannelType");
var chan = new XmlChannel(index, node);
// There is no clean indicator that distinguishes between Analog, DVB-C, DVB-T and DVB-S channel list. All nodes are in one flat list
// The best guess is to start a new list when the number sequence resets
var list = this.GetOrCreateList(curListName);
if (list.Count > 0 && chan.OldProgramNr < list.Channels[list.Count - 1].OldProgramNr)
{
curListName = GetXmlValue(node, "ChannelType") + " " + (DataRoot.ChannelLists.Count() + 1);
list = GetOrCreateList(curListName);
}
DataRoot.AddChannel(list, chan);
}
#endregion
@@ -252,6 +264,23 @@ namespace ChanSort.Loader.Panasonic
}
#endregion
#region GetXmlValue()
static string GetXmlValue(XmlNode node, string field)
{
// old format stored all values as attributes of <ChannelInfo ...>
if (node.Attributes != null && node.Attributes.Count > 0)
return node.Attributes[field]?.InnerText;
// new format with meaningful channel names stores all values as child elements
foreach (XmlNode child in node.ChildNodes)
{
if (child is XmlElement elem && elem.LocalName == field)
return elem.InnerText;
}
return "";
}
#endregion
#region class XmlChannel
@@ -263,12 +292,15 @@ namespace ChanSort.Loader.Panasonic
{
this.Node = node;
this.OldProgramNr = int.Parse(node.Attributes["ChannelNumber"]?.InnerText);
this.Name = node.Attributes["ChannelName"].InnerText;
var svlId = node.Attributes["SvlId"].InnerText;
this.OldProgramNr = int.Parse(GetXmlValue(node, "ChannelNumber"));
this.Name = GetXmlValue(node, "ChannelName");
var svlId = GetXmlValue(node, "SvlId");
if (svlId == "")
svlId = GetXmlValue(node, "SvlRecId");
this.ShortName = $"SvlId: {svlId}";
if (int.TryParse(svlId, out var id))
this.RecordOrder = id;
}
}
#endregion
}