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

- improved IniFile and Mapping to better handle missing settings

Browse Source 
- working on philips *.db/FLASH* file format (identified 3 different variations so far)
This commit is contained in:
Horst Beham
2021-09-15 10:59:05 +02:00
parent 44749acaf0
commit ece2cd7e66
15 changed files with 968 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
source/ChanSort.Api/Utils/DataMapping.cs
View File

@@ -6,14 +6,14 @@ namespace ChanSort.Api
public class DataMapping
{
protected readonly IniFile.Section settings;
private int baseOffset;
private byte[] data { get; set; }
public Encoding DefaultEncoding { get; set; }
public bool ThrowWhenAccessingUnknownSetting { get; set; } = false;
#region ctor()
public DataMapping(IniFile.Section settings)
public DataMapping(IniFile.Section settings, byte[] data = null)
{
this.settings = settings;
this.Data = data;
this.DefaultEncoding = Encoding.Default;
}
#endregion
@@ -21,19 +21,23 @@ namespace ChanSort.Api
#region SetDataPtr(), Data, BaseOffset
public void SetDataPtr(byte[] data, int baseOffset)
{
this.data = data;
this.baseOffset = baseOffset;
this.Data = data;
this.BaseOffset = baseOffset;
}
public byte[] Data { get { return this.data; } }
public int BaseOffset { get { return this.baseOffset; } set { this.baseOffset = value; } }
public byte[] Data { get; set; }
public int BaseOffset { get; set; }
#endregion
#region GetOffsets()
public int[] GetOffsets(string key)
{
return settings.GetIntList(key);
var list= settings.GetIntList(key);
if (list == null)
return DefaultValue(key, Array.Empty<int>());
return list;
}
#endregion
@@ -46,7 +50,7 @@ namespace ChanSort.Api
list = settings.GetIntList("mask" + key);
if (list != null && list.Length > 0)
return list[0];
return -1;
return DefaultValue(key, -1);
}
#endregion
@@ -61,22 +65,22 @@ namespace ChanSort.Api
#endregion
public IniFile.Section Settings { get { return this.settings; } }
public IniFile.Section Settings => this.settings;
#region Byte
public byte GetByte(string key)
{
var offsets = settings.GetIntList(key);
if (offsets.Length==0) return 0;
return this.data[baseOffset + offsets[0]];
if (offsets.Length==0) return DefaultValue(key, (byte)0);
return this.Data[BaseOffset + offsets[0]];
}
public void SetByte(string key, int value)
{
var offsets = settings.GetIntList(key);
foreach (int offset in offsets)
this.data[baseOffset + offset] = (byte)value;
this.Data[BaseOffset + offset] = (byte)value;
}
#endregion
@@ -84,8 +88,8 @@ namespace ChanSort.Api
public ushort GetWord(string key)
{
var offsets = settings.GetIntList(key);
if (offsets.Length == 0) return 0;
return BitConverter.ToUInt16(this.data, baseOffset + offsets[0]);
if (offsets.Length == 0) return DefaultValue(key, (ushort)0);
return BitConverter.ToUInt16(this.Data, BaseOffset + offsets[0]);
}
public void SetWord(string key, int value)
@@ -93,8 +97,8 @@ namespace ChanSort.Api
var offsets = settings.GetIntList(key);
foreach (int offset in offsets)
{
this.data[baseOffset + offset + 0] = (byte)value;
this.data[baseOffset + offset + 1] = (byte)(value>>8);
this.Data[BaseOffset + offset + 0] = (byte)value;
this.Data[BaseOffset + offset + 1] = (byte)(value>>8);
}
}
#endregion
@@ -103,8 +107,8 @@ namespace ChanSort.Api
public long GetDword(string key)
{
var offsets = settings.GetIntList(key);
if (offsets.Length == 0) return 0;
return BitConverter.ToUInt32(this.data, baseOffset + offsets[0]);
if (offsets.Length == 0) return DefaultValue(key, (uint)0);
return BitConverter.ToUInt32(this.Data, BaseOffset + offsets[0]);
}
public void SetDword(string key, long value)
@@ -112,10 +116,10 @@ namespace ChanSort.Api
var offsets = settings.GetIntList(key);
foreach (int offset in offsets)
{
this.data[baseOffset + offset + 0] = (byte)value;
this.data[baseOffset + offset + 1] = (byte)(value >> 8);
this.data[baseOffset + offset + 2] = (byte)(value >> 16);
this.data[baseOffset + offset + 3] = (byte)(value >> 24);
this.Data[BaseOffset + offset + 0] = (byte)value;
this.Data[BaseOffset + offset + 1] = (byte)(value >> 8);
this.Data[BaseOffset + offset + 2] = (byte)(value >> 16);
this.Data[BaseOffset + offset + 3] = (byte)(value >> 24);
}
}
#endregion
@@ -124,8 +128,8 @@ namespace ChanSort.Api
public float GetFloat(string key)
{
var offsets = settings.GetIntList(key);
if (offsets.Length == 0) return 0;
return BitConverter.ToSingle(this.data, baseOffset + offsets[0]);
if (offsets.Length == 0) return DefaultValue(key, 0f);
return BitConverter.ToSingle(this.Data, BaseOffset + offsets[0]);
}
public void SetFloat(string key, float value)
@@ -135,25 +139,25 @@ namespace ChanSort.Api
foreach (int offset in offsets)
{
for (int i = 0; i < 4; i++)
this.data[baseOffset + offset + i] = bytes[i];
this.Data[BaseOffset + offset + i] = bytes[i];
}
}
#endregion
#region GetFlag
public bool GetFlag(string key, bool defaultValue = false)
public bool GetFlag(string key, bool defaultValue)
{
return GetFlag("off" + key, "mask" + key, defaultValue);
}
public bool GetFlag(string valueKey, string maskKey, bool defaultValue = false)
public bool GetFlag(string valueKey, string maskKey, bool defaultValue)
{
int mask = settings.GetInt(maskKey);
return GetFlag(valueKey, mask, defaultValue);
}
public bool GetFlag(string valueKey, int mask, bool defaultValue = false)
public bool GetFlag(string valueKey, int mask, bool defaultValue)
{
if (mask == 0) return defaultValue;
@@ -165,7 +169,7 @@ namespace ChanSort.Api
}
var offsets = settings.GetIntList(valueKey);
if (offsets.Length == 0) return defaultValue;
bool isSet = (this.data[baseOffset + offsets[0]] & mask) == mask;
bool isSet = (this.Data[BaseOffset + offsets[0]] & mask) == mask;
return isSet != reverseLogic;
}
#endregion
@@ -195,9 +199,9 @@ namespace ChanSort.Api
foreach (var offset in offsets)
{
if (value != reverseLogic)
this.data[baseOffset + offset] |= (byte)mask;
this.Data[BaseOffset + offset] |= (byte)mask;
else
this.data[baseOffset + offset] &= (byte)~mask;
this.Data[BaseOffset + offset] &= (byte)~mask;
}
}
#endregion
@@ -207,12 +211,12 @@ namespace ChanSort.Api
public string GetString(string key, int maxLen)
{
var offsets = settings.GetIntList(key);
if (offsets.Length == 0) return null;
if (offsets.Length == 0) return DefaultValue(key, (string)null);
int length = this.GetByte(key + "Length");
if (length == 0)
length = maxLen;
var encoding = this.DefaultEncoding;
return encoding.GetString(this.data, baseOffset + offsets[0], length).TrimEnd('\0');
return encoding.GetString(this.Data, BaseOffset + offsets[0], length).TrimEnd('\0');
}
#endregion
@@ -223,13 +227,30 @@ namespace ChanSort.Api
int len = Math.Min(bytes.Length, maxLen);
foreach (var offset in settings.GetIntList(key))
{
Array.Copy(bytes, 0, this.data, baseOffset + offset, len);
Array.Copy(bytes, 0, this.Data, BaseOffset + offset, len);
for (int i = len; i < maxLen; i++)
this.data[baseOffset + offset + i] = 0;
this.Data[BaseOffset + offset + i] = 0;
}
return len;
}
#endregion
#region DefaultValue()
private T DefaultValue<T>(string key, T value)
{
if (this.ThrowWhenAccessingUnknownSetting)
throw new ArgumentException($"undefined setting \"{key}\" in {this.Settings}");
return value;
}
#endregion
#region HasValue()
public bool HasValue(string key)
{
var list = this.settings.GetIntList(key);
return list != null && list.Length > 0;
}
#endregion
}
}

26
source/ChanSort.Api/Utils/IniFile.cs
View File

@@ -12,11 +12,14 @@ namespace ChanSort.Api
{
private readonly Dictionary<string, string> data = new Dictionary<string, string>(StringComparer.CurrentCultureIgnoreCase);
public Section(string name)
public Section(string name, IniFile iniFile)
{
this.Name = name;
this.IniFile = iniFile;
}
public IniFile IniFile { get; }
#region Name
public string Name { get; }
#endregion
@@ -121,24 +124,31 @@ namespace ChanSort.Api
return intValue;
}
#endregion
public override string ToString() => $"{this.IniFile} [{this.Name}]";
}
#endregion
private readonly Dictionary<string, Section> sectionDict;
private readonly List<Section> sectionList;
private readonly string filePath;
public IniFile(string fileName)
public IniFile(string filePath)
{
this.filePath = filePath;
this.sectionDict = new Dictionary<string, Section>();
this.sectionList = new List<Section>();
this.ReadIniFile(fileName);
this.ReadIniFile(filePath);
}
public IEnumerable<Section> Sections => this.sectionList;
public Section GetSection(string sectionName)
public Section GetSection(string sectionName, bool throwException = false)
{
return sectionDict.TryGet(sectionName);
var sec = sectionDict.TryGet(sectionName);
if (sec == null && throwException)
throw new ArgumentException($"No [{sectionName}] in {this}");
return sec;
}
#region ReadIniFile()
@@ -152,14 +162,14 @@ namespace ChanSort.Api
while ((line = rdr.ReadLine()) != null)
{
string trimmedLine = line.Trim();
if (trimmedLine.StartsWith(";"))
if (trimmedLine.Length == 0 || trimmedLine.StartsWith(";") || trimmedLine.StartsWith("#") || trimmedLine.StartsWith("//"))
continue;
if (trimmedLine.StartsWith("["))
{
string sectionName = trimmedLine.EndsWith("]")
? trimmedLine.Substring(1, trimmedLine.Length - 2)
: trimmedLine.Substring(1);
currentSection = new Section(sectionName);
currentSection = new Section(sectionName, this);
this.sectionList.Add(currentSection);
this.sectionDict[sectionName] = currentSection;
continue;
@@ -186,5 +196,7 @@ namespace ChanSort.Api
}
}
#endregion
public override string ToString() => Path.GetFileName(this.filePath);
}
}