diff --git a/source/ChanSort.Loader.Hisense/ChanSort.Loader.Hisense.csproj b/source/ChanSort.Loader.Hisense/ChanSort.Loader.Hisense.csproj
index 9992e1d..9845359 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 b9ea892..d96c981 100644
--- a/source/ChanSort.Loader.Hisense/ServicelistDb/DbSchema.cs
+++ b/source/ChanSort.Loader.Hisense/ServicelistDb/DbSchema.cs
@@ -54,7 +54,7 @@ left outer join Lcn l on l.ServiceId=fi.ServiceId and l.ServiceListId=fi.Service
";
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 6e28ebd..71b8601 100644
--- a/source/ChanSort.Loader.Hisense/ServicelistDb/ServicelistDbSerializer.cs
+++ b/source/ChanSort.Loader.Hisense/ServicelistDb/ServicelistDbSerializer.cs
@@ -416,9 +416,11 @@ left outer join {dbSchema.DvbServiceTable} digs on digs.ServiceId=s.Pid
#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 f10b4ac..58c0121 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 4df41be..993e482 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 78f67e6..1335b0e 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 f10b4ac..58c0121 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 4df41be..993e482 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 c13b1e8..a060c34 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 f10b4ac..58c0121 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 4df41be..993e482 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 8b9970d..e96fa48 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 f10b4ac..58c0121 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 4df41be..993e482 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 116a5ac..843535b 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 f10b4ac..58c0121 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 4df41be..993e482 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 f86a685..a1b116f 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 4100fcd..1e4fecf 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 4100fcd..1e4fecf 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 c498b0c..47ee564 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 4100fcd..58c0121 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 c147d0f..59ac755 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 913ec52..0f7e205 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 4100fcd..1e4fecf 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 cd65b03..c995111 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 4100fcd..58c0121 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 c147d0f..59ac755 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 64f651a..bd3a931 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 4100fcd..58c0121 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 c147d0f..59ac755 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 9ac8ebf..5e2a5fb 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}.
-
+
+