- upgrade to DX 21.2.4

- added cmdb .bin configuration for a ChangHong TV
- added support for Encrypted-flag in some Philips binary files

source/ChanSort.Loader.CmdbBin/ChanSort.Loader.CmdbBin.ini

@@ -124,6 +124,60 @@ offName=144
 lenName=50
 
 
+# ChangHong 1489 KB
+
+[dtv_cmdb_2.bin:1524001]
+offChannelBitmap=8
+lenChannelBitmap=628
+offChannelRecord=0x27c
+lenChannelRecord=268
+numChannelRecord=5000
+offTransponderBitmap=0x001474dc
+lenTransponderBitmap=376
+offTransponderRecord=0x147654
+lenTransponderRecord=52
+numTransponderRecord=3000
+offSatelliteBitmap=0x00170d68
+lenSatelliteBitmap=32
+offSatelliteRecord=0x170d88
+lenSatelliteRecord=52
+numSatelliteRecord=254
+
+[dvbsSatellite:52]
+offName=2
+lenName=22
+offOrbitalPos=38
+
+[dvbsTransponder:52]
+offSatelliteIndex=0
+offTransportStreamId=6
+offOriginalNetworkId=8
+offNetworkId=10
+offTransponderIndex=14
+offFreqInMhz=16
+offSymbolRate=28
+
+[dvbsChannel:268]
+offEncrypted=11
+maskEncrypted=0x10
+offSkip=11
+maskSkip=0x20
+offLocked=11
+maskLocked=0x40
+offChannelType=13
+offServiceType=14
+offTransponderIndex=20
+offPmtPid=22
+offPcrPid=24
+offVideoPid=26
+offProgramNr=32
+offServiceId=34
+offAudioPid=50
+offName=142
+lenName=50
+
+
+
 # SetEdit Toshiba - dtv_cmdb_2.bin with 1684 KB
 
 [dtv_cmdb_2.bin:1724189]
@@ -143,15 +197,6 @@ offSatelliteRecord=0x1a0ba4
 lenSatelliteRecord=68
 numSatelliteRecord=254
 
-[dvbsTransponder:52]
-offSatelliteIndex=0
-offTransportStreamId=6
-offOriginalNetworkId=8
-offNetworkId=10
-offTransponderIndex=20
-offFreqInMhz=16
-offSymbolRate=28
-
 [dvbsChannel:256]
 offEncrypted=13
 maskEncrypted=0x10

source/ChanSort.Loader.CmdbBin/CmdbFileSerializer.cs

@@ -56,7 +56,7 @@ namespace ChanSort.Loader.CmdbBin
       }
 
       if (!this.loaded)
-        throw new FileLoadException("\"" + this.FileName + "\" does not belong to a dtv_cmdb_* file system");
+        throw new FileLoadException("\"" + this.FileName + "\" does not belong to a supported dtv_cmdb_* file system");
     }
     #endregion
 
@@ -65,7 +65,13 @@ namespace ChanSort.Loader.CmdbBin
     {
       var data = File.ReadAllBytes(file);
       var fileName = Path.GetFileName(file).ToLowerInvariant();
-      var sec = this.ini.GetSection($"{fileName}:{data.Length}");
+      var secId = $"{fileName}:{data.Length}";
+      var sec = this.ini.GetSection(secId);
+      if (sec == null)
+      {
+        protocol.AppendLine("Skipped file with unknown data size: " + secId);
+        return;
+      }
 
       LoadBitmappedRecords(data, sec, "Satellite", ReadSatellite);
       LoadBitmappedRecords(data, sec, "Transponder", ReadTransponder);