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

fix for loading Sony channel lists with channel numbers 10000 and higher (negative No values in the sdb.xml file)

Browse Source
This commit is contained in:
hbeham
2019-11-10 11:25:07 +01:00
parent 65600756da
commit 449dea8195
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/ChanSort.Api/Model/ChannelInfo.cs
View File

@@ -249,11 +249,19 @@ namespace ChanSort.Api
public void AddDebug(ushort val)
{
if (this.Debug == null)
this.Debug = val.ToString("x2");
this.Debug = val.ToString("x4");
else
this.Debug += " " + val.ToString("x4");
}
public void AddDebug(uint val)
{
if (this.Debug == null)
this.Debug = val.ToString("x8");
else
this.Debug += " " + val.ToString("x8");
}
public void AddDebug(byte[] data, int offset, int len)
{
for (int i = 0; i < len; i++)

10
source/ChanSort.Loader.Sony/Serializer.cs
View File

@@ -288,12 +288,16 @@ namespace ChanSort.Loader.Sony
{
var recId = int.Parse(svcData["ui2_svl_rec_id"][i]);
var chan = new Channel(signalSource, i, recId);
chan.OldProgramNr = (int) ((uint) ParseInt(svcData["No"][i]) >> 18);
chan.OldProgramNr = (ParseInt(svcData["No"][i]) >> 18) & 0x3FFFF;
chan.IsDeleted = svcData["b_deleted_by_user"][i] != "1";
var nwMask = uint.Parse(svcData["ui4_nw_mask"][i]);
chan.AddDebug("NW=");
chan.AddDebug(nwMask);
chan.AddDebug("OPT=");
chan.AddDebug(uint.Parse(svcData["ui4_nw_option_mask"][i]));
chan.Hidden = (nwMask & 8) == 0;
chan.Encrypted = (nwMask & 2048) != 0;
chan.Encrypted = dvbData["t_free_ca_mode"][i] == "1";
//chan.Encrypted = dvbData["t_free_ca_mode"][i] == "1";
chan.Favorites = (Favorites) ((nwMask & 0xF0) >> 4);
chan.ServiceId = int.Parse(svcData["ui2_prog_id"][i]);
chan.Name = svcData["Name"][i];
@@ -655,7 +659,7 @@ namespace ChanSort.Loader.Sony
if (field == "b_deleted_by_user")
return ch.IsDeleted ? "0" : "1"; // file seems to contain reverse logic (1 = not deleted)
if (field == "No")
return ((uint)(ch.NewProgramNr << 18) | (uint.Parse(value) & 0x3FFFF)).ToString();
return ((ch.NewProgramNr << 18) | (int.Parse(value) & 0x3FFFF)).ToString();
if (field == "ui4_nw_mask")
return (((uint)ch.Favorites << 4) | (ch.Hidden ? 0u : 8u) | (uint.Parse(value) & ~0xF8)).ToString();
}