From 5a6e8d9082f4287d14303820becea75925bdf915 Mon Sep 17 00:00:00 2001 From: Horst Beham Date: Sun, 18 Jul 2021 12:24:51 +0200 Subject: [PATCH] - using AnyCPU to support x64 and ARM based CPUs (e.g. running on Win10-arm on a Mac Pro with M1 CPU) - upgraded to latest Sqlite libraries to support ARM - finished implementation for Hisense Vidaa U5.2 file format (using servicelist.db with renamed tables and columns) --- .../ChanSort.Loader.Hisense.csproj | 4 ++-- .../ServicelistDb/DbSchema.cs | 2 +- .../ServicelistDb/ServicelistDbSerializer.cs | 8 +++++--- source/ChanSort.Loader.Hisense/app.config | 4 ---- source/ChanSort.Loader.Hisense/packages.config | 4 ++-- .../ChanSort.Loader.Panasonic.csproj | 4 ++-- source/ChanSort.Loader.Panasonic/app.config | 4 ---- source/ChanSort.Loader.Panasonic/packages.config | 4 ++-- .../ChanSort.Loader.Philips.csproj | 4 ++-- source/ChanSort.Loader.Philips/app.config | 4 ---- source/ChanSort.Loader.Philips/packages.config | 4 ++-- .../ChanSort.Loader.Samsung.csproj | 4 ++-- source/ChanSort.Loader.Samsung/app.config | 4 ---- source/ChanSort.Loader.Samsung/packages.config | 4 ++-- .../ChanSort.Loader.Toshiba.csproj | 4 ++-- source/ChanSort.Loader.Toshiba/app.config | 4 ---- source/ChanSort.Loader.Toshiba/packages.config | 4 ++-- source/ChanSort/app.config | 12 ------------ source/Test.Loader.Enigma2/app.config | 8 ++++++++ source/Test.Loader.Grundig/app.config | 8 ++++++++ .../Test.Loader.Hisense/Test.Loader.Hisense.csproj | 12 ++++-------- source/Test.Loader.Hisense/app.config | 12 ------------ source/Test.Loader.Hisense/packages.config | 4 ++-- source/Test.Loader.LG/app.config | 8 ++++++++ source/Test.Loader.M3u/app.config | 8 ++++++++ .../Test.Loader.Panasonic.csproj | 12 ++++-------- source/Test.Loader.Panasonic/app.config | 12 ------------ source/Test.Loader.Panasonic/packages.config | 4 ++-- .../Test.Loader.Philips/Test.Loader.Philips.csproj | 12 ++++-------- source/Test.Loader.Philips/app.config | 12 ------------ source/Test.Loader.Philips/packages.config | 4 ++-- .../Test.Loader.Samsung/Test.Loader.Samsung.csproj | 8 ++++---- source/Test.Loader.Samsung/app.config | 12 ------------ source/Test.Loader.Samsung/packages.config | 4 ++-- source/Test.Loader.SatcoDX/app.config | 8 ++++++++ source/Test.Loader.Sharp/app.config | 8 ++++++++ source/Test.Loader.Sony/app.config | 8 ++++++++ .../Test.Loader.Toshiba/Test.Loader.Toshiba.csproj | 12 ++++-------- source/Test.Loader.Toshiba/app.config | 12 ------------ source/Test.Loader.Toshiba/packages.config | 4 ++-- source/Test.Loader.VDR/app.config | 8 ++++++++ source/Test.Loader/app.config | 8 ++++++++ source/changelog.md | 7 ++++--- 43 files changed, 132 insertions(+), 165 deletions(-) diff --git a/source/ChanSort.Loader.Hisense/ChanSort.Loader.Hisense.csproj b/source/ChanSort.Loader.Hisense/ChanSort.Loader.Hisense.csproj index 9992e1d2..98453597 100644 --- a/source/ChanSort.Loader.Hisense/ChanSort.Loader.Hisense.csproj +++ b/source/ChanSort.Loader.Hisense/ChanSort.Loader.Hisense.csproj @@ -61,8 +61,8 @@ latest - - ..\packages\Microsoft.Data.Sqlite.Core.5.0.7\lib\netstandard2.0\Microsoft.Data.Sqlite.dll + + ..\packages\Microsoft.Data.Sqlite.Core.5.0.8\lib\netstandard2.0\Microsoft.Data.Sqlite.dll ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll diff --git a/source/ChanSort.Loader.Hisense/ServicelistDb/DbSchema.cs b/source/ChanSort.Loader.Hisense/ServicelistDb/DbSchema.cs index b9ea8926..d96c9819 100644 --- a/source/ChanSort.Loader.Hisense/ServicelistDb/DbSchema.cs +++ b/source/ChanSort.Loader.Hisense/ServicelistDb/DbSchema.cs @@ -54,7 +54,7 @@ from ServiceItem fi "; public string ShortName => "Service9"; - public string ParentalLock => "0"; // supposedly "Service11", but that's not plausible + public string ParentalLock => "Service11"; public string UpdateService => "update Service set Name=@name, Service9=@sname, Service11=@lock, Visible=@vis, Selectable=@sel, Service16=@fav1, Service17=@fav2, Service18=@fav3, Service19=@fav4 where Pid=@servId"; public string UpdateChannelItem => "update ServiceItem set ChannelNumber=@ch, ServiceItem6=@del, ServiceItem7=@prot, ServiceItem3=@sel, ServiceItem4=@vis where ServiceListId=@favId and ServiceId=@servId"; diff --git a/source/ChanSort.Loader.Hisense/ServicelistDb/ServicelistDbSerializer.cs b/source/ChanSort.Loader.Hisense/ServicelistDb/ServicelistDbSerializer.cs index 6e28ebd5..71b8601f 100644 --- a/source/ChanSort.Loader.Hisense/ServicelistDb/ServicelistDbSerializer.cs +++ b/source/ChanSort.Loader.Hisense/ServicelistDb/ServicelistDbSerializer.cs @@ -416,9 +416,11 @@ private void LoadFavorites(SqliteCommand cmd) #endif } - ci.Skip = r.GetInt32(3) == 0; - ci.Lock = r.GetInt32(6) != 0; - ci.Hidden = r.GetInt32(4) == 0; + // for skip/lock/hide (selectable/protected/visible) the TV supports values in the service table directly and overrides in each favorite-list + // ChanSort only supports per-channel values and not per-list, so they are combined here + ci.Skip |= r.GetInt32(3) == 0; // -1 = use "Selectable" from Service table, 0=skip, 1=selectable + ci.Lock |= r.GetInt32(6) == 1; // -1 = use "ParentalLock/Service11" from Service table, 0=not locked, 1=locked + ci.Hidden |= r.GetInt32(4) == 0; // -1 = use "Visible" from Service table, 0=hidden, 1=visible ci.IsDeleted = r.GetInt32(5) != 0; if (list.ShortCaption != "$all") ci.Source = list.ShortCaption; diff --git a/source/ChanSort.Loader.Hisense/app.config b/source/ChanSort.Loader.Hisense/app.config index f10b4ac0..58c01219 100644 --- a/source/ChanSort.Loader.Hisense/app.config +++ b/source/ChanSort.Loader.Hisense/app.config @@ -2,10 +2,6 @@ - - - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Hisense/packages.config b/source/ChanSort.Loader.Hisense/packages.config index 4df41be3..993e4827 100644 --- a/source/ChanSort.Loader.Hisense/packages.config +++ b/source/ChanSort.Loader.Hisense/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/source/ChanSort.Loader.Panasonic/ChanSort.Loader.Panasonic.csproj b/source/ChanSort.Loader.Panasonic/ChanSort.Loader.Panasonic.csproj index 78f67e6d..1335b0ea 100644 --- a/source/ChanSort.Loader.Panasonic/ChanSort.Loader.Panasonic.csproj +++ b/source/ChanSort.Loader.Panasonic/ChanSort.Loader.Panasonic.csproj @@ -60,8 +60,8 @@ latest - - ..\packages\Microsoft.Data.Sqlite.Core.5.0.7\lib\netstandard2.0\Microsoft.Data.Sqlite.dll + + ..\packages\Microsoft.Data.Sqlite.Core.5.0.8\lib\netstandard2.0\Microsoft.Data.Sqlite.dll ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll diff --git a/source/ChanSort.Loader.Panasonic/app.config b/source/ChanSort.Loader.Panasonic/app.config index f10b4ac0..58c01219 100644 --- a/source/ChanSort.Loader.Panasonic/app.config +++ b/source/ChanSort.Loader.Panasonic/app.config @@ -2,10 +2,6 @@ - - - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Panasonic/packages.config b/source/ChanSort.Loader.Panasonic/packages.config index 4df41be3..993e4827 100644 --- a/source/ChanSort.Loader.Panasonic/packages.config +++ b/source/ChanSort.Loader.Panasonic/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/source/ChanSort.Loader.Philips/ChanSort.Loader.Philips.csproj b/source/ChanSort.Loader.Philips/ChanSort.Loader.Philips.csproj index c13b1e8e..a060c349 100644 --- a/source/ChanSort.Loader.Philips/ChanSort.Loader.Philips.csproj +++ b/source/ChanSort.Loader.Philips/ChanSort.Loader.Philips.csproj @@ -56,8 +56,8 @@ MinimumRecommendedRules.ruleset - - ..\packages\Microsoft.Data.Sqlite.Core.5.0.7\lib\netstandard2.0\Microsoft.Data.Sqlite.dll + + ..\packages\Microsoft.Data.Sqlite.Core.5.0.8\lib\netstandard2.0\Microsoft.Data.Sqlite.dll ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll diff --git a/source/ChanSort.Loader.Philips/app.config b/source/ChanSort.Loader.Philips/app.config index f10b4ac0..58c01219 100644 --- a/source/ChanSort.Loader.Philips/app.config +++ b/source/ChanSort.Loader.Philips/app.config @@ -2,10 +2,6 @@ - - - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Philips/packages.config b/source/ChanSort.Loader.Philips/packages.config index 4df41be3..993e4827 100644 --- a/source/ChanSort.Loader.Philips/packages.config +++ b/source/ChanSort.Loader.Philips/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/source/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.csproj b/source/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.csproj index 8b9970d8..e96fa488 100644 --- a/source/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.csproj +++ b/source/ChanSort.Loader.Samsung/ChanSort.Loader.Samsung.csproj @@ -68,8 +68,8 @@ latest - - ..\packages\Microsoft.Data.Sqlite.Core.5.0.7\lib\netstandard2.0\Microsoft.Data.Sqlite.dll + + ..\packages\Microsoft.Data.Sqlite.Core.5.0.8\lib\netstandard2.0\Microsoft.Data.Sqlite.dll ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll diff --git a/source/ChanSort.Loader.Samsung/app.config b/source/ChanSort.Loader.Samsung/app.config index f10b4ac0..58c01219 100644 --- a/source/ChanSort.Loader.Samsung/app.config +++ b/source/ChanSort.Loader.Samsung/app.config @@ -2,10 +2,6 @@ - - - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Samsung/packages.config b/source/ChanSort.Loader.Samsung/packages.config index 4df41be3..993e4827 100644 --- a/source/ChanSort.Loader.Samsung/packages.config +++ b/source/ChanSort.Loader.Samsung/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/source/ChanSort.Loader.Toshiba/ChanSort.Loader.Toshiba.csproj b/source/ChanSort.Loader.Toshiba/ChanSort.Loader.Toshiba.csproj index 116a5acf..843535b2 100644 --- a/source/ChanSort.Loader.Toshiba/ChanSort.Loader.Toshiba.csproj +++ b/source/ChanSort.Loader.Toshiba/ChanSort.Loader.Toshiba.csproj @@ -64,8 +64,8 @@ latest - - ..\packages\Microsoft.Data.Sqlite.Core.5.0.7\lib\netstandard2.0\Microsoft.Data.Sqlite.dll + + ..\packages\Microsoft.Data.Sqlite.Core.5.0.8\lib\netstandard2.0\Microsoft.Data.Sqlite.dll ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll diff --git a/source/ChanSort.Loader.Toshiba/app.config b/source/ChanSort.Loader.Toshiba/app.config index f10b4ac0..58c01219 100644 --- a/source/ChanSort.Loader.Toshiba/app.config +++ b/source/ChanSort.Loader.Toshiba/app.config @@ -2,10 +2,6 @@ - - - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Toshiba/packages.config b/source/ChanSort.Loader.Toshiba/packages.config index 4df41be3..993e4827 100644 --- a/source/ChanSort.Loader.Toshiba/packages.config +++ b/source/ChanSort.Loader.Toshiba/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/source/ChanSort/app.config b/source/ChanSort/app.config index f86a685b..a1b116fa 100644 --- a/source/ChanSort/app.config +++ b/source/ChanSort/app.config @@ -53,18 +53,6 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Test.Loader.Enigma2/app.config b/source/Test.Loader.Enigma2/app.config index 4100fcde..1e4fecf4 100644 --- a/source/Test.Loader.Enigma2/app.config +++ b/source/Test.Loader.Enigma2/app.config @@ -14,6 +14,14 @@ + + + + + + + + \ No newline at end of file diff --git a/source/Test.Loader.Grundig/app.config b/source/Test.Loader.Grundig/app.config index 4100fcde..1e4fecf4 100644 --- a/source/Test.Loader.Grundig/app.config +++ b/source/Test.Loader.Grundig/app.config @@ -14,6 +14,14 @@ + + + + + + + + \ No newline at end of file diff --git a/source/Test.Loader.Hisense/Test.Loader.Hisense.csproj b/source/Test.Loader.Hisense/Test.Loader.Hisense.csproj index c498b0c9..47ee564a 100644 --- a/source/Test.Loader.Hisense/Test.Loader.Hisense.csproj +++ b/source/Test.Loader.Hisense/Test.Loader.Hisense.csproj @@ -58,8 +58,8 @@ MinimumRecommendedRules.ruleset - - ..\packages\Microsoft.Data.Sqlite.Core.5.0.7\lib\netstandard2.0\Microsoft.Data.Sqlite.dll + + ..\packages\Microsoft.Data.Sqlite.Core.5.0.8\lib\netstandard2.0\Microsoft.Data.Sqlite.dll ..\packages\Microsoft.TestPlatform.AdapterUtilities.16.10.0\lib\net45\Microsoft.TestPlatform.AdapterUtilities.dll @@ -77,19 +77,15 @@ ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll - True ..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll - True ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll - True ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll - True @@ -268,11 +264,11 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - + \ No newline at end of file diff --git a/source/Test.Loader.Hisense/app.config b/source/Test.Loader.Hisense/app.config index 4100fcde..58c01219 100644 --- a/source/Test.Loader.Hisense/app.config +++ b/source/Test.Loader.Hisense/app.config @@ -2,18 +2,6 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Test.Loader.Hisense/packages.config b/source/Test.Loader.Hisense/packages.config index c147d0f0..59ac7551 100644 --- a/source/Test.Loader.Hisense/packages.config +++ b/source/Test.Loader.Hisense/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/source/Test.Loader.LG/app.config b/source/Test.Loader.LG/app.config index 913ec52d..0f7e2058 100644 --- a/source/Test.Loader.LG/app.config +++ b/source/Test.Loader.LG/app.config @@ -15,6 +15,14 @@ + + + + + + + + diff --git a/source/Test.Loader.M3u/app.config b/source/Test.Loader.M3u/app.config index 4100fcde..1e4fecf4 100644 --- a/source/Test.Loader.M3u/app.config +++ b/source/Test.Loader.M3u/app.config @@ -14,6 +14,14 @@ + + + + + + + + \ No newline at end of file diff --git a/source/Test.Loader.Panasonic/Test.Loader.Panasonic.csproj b/source/Test.Loader.Panasonic/Test.Loader.Panasonic.csproj index cd65b035..c9951110 100644 --- a/source/Test.Loader.Panasonic/Test.Loader.Panasonic.csproj +++ b/source/Test.Loader.Panasonic/Test.Loader.Panasonic.csproj @@ -58,8 +58,8 @@ MinimumRecommendedRules.ruleset - - ..\packages\Microsoft.Data.Sqlite.Core.5.0.7\lib\netstandard2.0\Microsoft.Data.Sqlite.dll + + ..\packages\Microsoft.Data.Sqlite.Core.5.0.8\lib\netstandard2.0\Microsoft.Data.Sqlite.dll ..\packages\Microsoft.TestPlatform.AdapterUtilities.16.10.0\lib\net45\Microsoft.TestPlatform.AdapterUtilities.dll @@ -77,19 +77,15 @@ ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll - True ..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll - True ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll - True ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll - True @@ -266,11 +262,11 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - + \ No newline at end of file diff --git a/source/Test.Loader.Panasonic/app.config b/source/Test.Loader.Panasonic/app.config index 4100fcde..58c01219 100644 --- a/source/Test.Loader.Panasonic/app.config +++ b/source/Test.Loader.Panasonic/app.config @@ -2,18 +2,6 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Test.Loader.Panasonic/packages.config b/source/Test.Loader.Panasonic/packages.config index c147d0f0..59ac7551 100644 --- a/source/Test.Loader.Panasonic/packages.config +++ b/source/Test.Loader.Panasonic/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/source/Test.Loader.Philips/Test.Loader.Philips.csproj b/source/Test.Loader.Philips/Test.Loader.Philips.csproj index 64f651a1..bd3a931c 100644 --- a/source/Test.Loader.Philips/Test.Loader.Philips.csproj +++ b/source/Test.Loader.Philips/Test.Loader.Philips.csproj @@ -78,8 +78,8 @@ - - ..\packages\Microsoft.Data.Sqlite.Core.5.0.7\lib\netstandard2.0\Microsoft.Data.Sqlite.dll + + ..\packages\Microsoft.Data.Sqlite.Core.5.0.8\lib\netstandard2.0\Microsoft.Data.Sqlite.dll ..\packages\Microsoft.TestPlatform.AdapterUtilities.16.10.0\lib\net45\Microsoft.TestPlatform.AdapterUtilities.dll @@ -97,19 +97,15 @@ ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll - True ..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll - True ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll - True ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll - True @@ -450,11 +446,11 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - + \ No newline at end of file diff --git a/source/Test.Loader.Philips/app.config b/source/Test.Loader.Philips/app.config index 4100fcde..58c01219 100644 --- a/source/Test.Loader.Philips/app.config +++ b/source/Test.Loader.Philips/app.config @@ -2,18 +2,6 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/source/Test.Loader.Philips/packages.config b/source/Test.Loader.Philips/packages.config index c147d0f0..59ac7551 100644 --- a/source/Test.Loader.Philips/packages.config +++ b/source/Test.Loader.Philips/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/source/Test.Loader.Samsung/Test.Loader.Samsung.csproj b/source/Test.Loader.Samsung/Test.Loader.Samsung.csproj index 9ac8ebfe..5e2a5fbe 100644 --- a/source/Test.Loader.Samsung/Test.Loader.Samsung.csproj +++ b/source/Test.Loader.Samsung/Test.Loader.Samsung.csproj @@ -57,8 +57,8 @@ MinimumRecommendedRules.ruleset - - ..\packages\Microsoft.Data.Sqlite.Core.5.0.7\lib\netstandard2.0\Microsoft.Data.Sqlite.dll + + ..\packages\Microsoft.Data.Sqlite.Core.5.0.8\lib\netstandard2.0\Microsoft.Data.Sqlite.dll ..\packages\Microsoft.TestPlatform.AdapterUtilities.16.9.4\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll @@ -294,16 +294,16 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + +