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

- W.I.P: Enigma2 lamedb / bouquets support for Linux based Set-Top-Boxes (Dreambox, VU+, Octagon, ...)

Browse Source 
- Toshiba settingsDB.db: support for lists without analog tuner data (missing TADTunerDataTable)
- Grunding: failed to load lists where the <Digital> element did not contain a <channels> child element
- W.I.P: reworking the reference list system so that a simple list of channels can be applied to the main channel numbers or a particular favorite list.
  (The "Automatically reorder all lists" options currently does not work)
This commit is contained in:
Horst Beham
2021-03-13 18:11:30 +01:00
parent 9d4467c868
commit f5010439cb
22 changed files with 158 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/ChanSort.Loader.Enigma2/Channel.cs
View File

@@ -7,7 +7,7 @@ namespace ChanSort.Loader.Enigma2
/// <summary>
/// first two fields of the lamedb entry
/// </summary>
public string Prefix { get; set; }
public string Prefix { get; set; } = "1:0";
/// <summary>
/// For DVB-S it is the orbital position * 10 (e.g. 192 for Astra 19.2E) * 65536
@@ -15,11 +15,11 @@ namespace ChanSort.Loader.Enigma2
public int DvbNamespace { get; set; }
public int ServiceNumber { get; set; }
/// <summary>
/// all fields after the DVB-namespace in the lamedb entry
/// </summary>
public string Suffix { get; set; }
public string Suffix { get; set; } = ":0:0:0:";
/// <summary>
/// #DESCRIPTION of the userbouquet entry

19
source/ChanSort.Loader.Enigma2/Serializer.cs
View File

@@ -84,14 +84,14 @@ namespace ChanSort.Loader.Enigma2
LoadBouquets(path, ref favIndex);
// load all unlisted userbouquet files
foreach (var file in Directory.GetFiles(Path.GetDirectoryName(this.FileName), "userbouquet.*"))
{
var ext = Path.GetExtension(file);
if (ext != ".tv" && ext != ".radio") // ignore .del, .bak and other irrelevant files
continue;
if (!this.favListFileNames.Contains(file))
this.LoadUserBouquet(file, ref favIndex);
}
//foreach (var file in Directory.GetFiles(Path.GetDirectoryName(this.FileName), "userbouquet.*"))
//{
// var ext = Path.GetExtension(file);
// if (ext != ".tv" && ext != ".radio") // ignore .del, .bak and other irrelevant files
// continue;
// if (!this.favListFileNames.Contains(file))
// this.LoadUserBouquet(file, ref favIndex);
//}
}
#endregion
@@ -188,7 +188,6 @@ namespace ChanSort.Loader.Enigma2
ch.RecordIndex = chanId;
ch.RecordOrder = chanId;
ch.OldProgramNr = ++chanId;
ch.NewProgramNr = chanId;
ch.IsDeleted = false;
ch.ServiceId = FromHex(parts[0]);
ch.DvbNamespace = FromHex(parts[1]);
@@ -254,7 +253,7 @@ namespace ChanSort.Loader.Enigma2
#region LoadUserBoquet
private void LoadUserBouquet(string file, ref int favIndex)
{
if (!File.Exists(file))
if (!File.Exists(file) || this.favListFileNames.Contains(file))
return;
using var r = new StreamReader(File.OpenRead(file), utf8WithoutBom);