mirror of
https://github.com/PredatH0r/ChanSort.git
synced 2026-05-07 06:27:40 +02:00
- removed superfluous parameter from SerializerBase.Save()
- added "Pooling=False" parameter to all Sqlite connection strings to prevent open file locks after closing the connection and to avoid extreme delays when using CloseAllPools()
- C# code refactoring "using var" instead of "using ( ) { }" where possible
This commit is contained in:
@@ -597,7 +597,7 @@ namespace ChanSort.Loader.Philips
|
||||
return;
|
||||
this.dataFilePaths.Add(dbPath);
|
||||
|
||||
using var conn = new SqliteConnection($"Data Source={dbPath}");
|
||||
using var conn = new SqliteConnection($"Data Source={dbPath};Pooling=False");
|
||||
conn.Open();
|
||||
using var cmd = conn.CreateCommand();
|
||||
|
||||
@@ -669,7 +669,7 @@ namespace ChanSort.Loader.Philips
|
||||
}
|
||||
}
|
||||
|
||||
using var conn = new SqliteConnection($"Data Source={tvDb}");
|
||||
using var conn = new SqliteConnection($"Data Source={tvDb};Pooling=False");
|
||||
conn.Open();
|
||||
using var cmd = conn.CreateCommand();
|
||||
cmd.CommandText = "select _id, display_number, display_name, original_network_id, transport_stream_id, service_id, service_type from channels";
|
||||
@@ -729,7 +729,7 @@ namespace ChanSort.Loader.Philips
|
||||
this.Features.FavoritesMode = FavoritesMode.OrderedPerSource;
|
||||
this.Features.MaxFavoriteLists = 4;
|
||||
|
||||
using var conn = new SqliteConnection($"Data Source={listDb}");
|
||||
using var conn = new SqliteConnection($"Data Source={listDb};Pooling=False");
|
||||
conn.Open();
|
||||
using var cmd = conn.CreateCommand();
|
||||
|
||||
@@ -787,7 +787,7 @@ namespace ChanSort.Loader.Philips
|
||||
this.Features.MaxFavoriteLists = 8;
|
||||
this.Features.AllowGapsInFavNumbers = false;
|
||||
|
||||
using var conn = new SqliteConnection($"Data Source={listDb}");
|
||||
using var conn = new SqliteConnection($"Data Source={listDb};Pooling=False");
|
||||
conn.Open();
|
||||
|
||||
// older versions of ChanSort wrote invalid "list_id" values starting at 0 instead of 1 and going past 8.
|
||||
@@ -842,7 +842,7 @@ namespace ChanSort.Loader.Philips
|
||||
// saving
|
||||
|
||||
#region Save()
|
||||
public override void Save(string tvOutputFile)
|
||||
public override void Save()
|
||||
{
|
||||
var dir = Path.GetDirectoryName(this.FileName) ?? "";
|
||||
var channellib = Path.Combine(dir, "channellib");
|
||||
@@ -1095,7 +1095,7 @@ namespace ChanSort.Loader.Philips
|
||||
if (!File.Exists(dbPath))
|
||||
return;
|
||||
|
||||
using var conn = new SqliteConnection($"Data Source={dbPath}");
|
||||
using var conn = new SqliteConnection($"Data Source={dbPath};Pooling=False");
|
||||
conn.Open();
|
||||
using var trans = conn.BeginTransaction();
|
||||
using var cmd = conn.CreateCommand();
|
||||
@@ -1134,7 +1134,7 @@ namespace ChanSort.Loader.Philips
|
||||
if (!File.Exists(tvDb))
|
||||
return;
|
||||
|
||||
using var conn = new SqliteConnection($"Data Source={tvDb}");
|
||||
using var conn = new SqliteConnection($"Data Source={tvDb};Pooling=False");
|
||||
conn.Open();
|
||||
using var trans = conn.BeginTransaction();
|
||||
using var cmd = conn.CreateCommand();
|
||||
@@ -1175,7 +1175,7 @@ namespace ChanSort.Loader.Philips
|
||||
if (!File.Exists(listDb) || this.channelsById.Count == 0)
|
||||
return;
|
||||
|
||||
using var conn = new SqliteConnection($"Data Source={listDb}");
|
||||
using var conn = new SqliteConnection($"Data Source={listDb};Pooling=False");
|
||||
conn.Open();
|
||||
using var trans = conn.BeginTransaction();
|
||||
using var cmd = conn.CreateCommand();
|
||||
@@ -1238,7 +1238,7 @@ namespace ChanSort.Loader.Philips
|
||||
if (!File.Exists(listDb))
|
||||
return;
|
||||
|
||||
using var conn = new SqliteConnection($"Data Source={listDb}");
|
||||
using var conn = new SqliteConnection($"Data Source={listDb};Pooling=False");
|
||||
conn.Open();
|
||||
using var trans = conn.BeginTransaction();
|
||||
using var cmd = conn.CreateCommand();
|
||||
|
||||
@@ -471,7 +471,7 @@ namespace ChanSort.Loader.Philips
|
||||
public override IEnumerable<string> GetDataFilePaths() => this.dbFileByList.Values.Union(this.flashFileByList.Values).Select(tup => tup.Item1);
|
||||
|
||||
#region Save()
|
||||
public override void Save(string tvOutputFile)
|
||||
public override void Save()
|
||||
{
|
||||
// update *.db files
|
||||
foreach (var listAndFile in this.dbFileByList)
|
||||
|
||||
@@ -268,10 +268,8 @@ namespace ChanSort.Loader.Philips
|
||||
var xml = fileData.textContent;
|
||||
if (fileData.formatVersion == FormatVersion.RepairXml)
|
||||
xml = xml.Replace("&", "&"); // Philips exports broken XML with unescaped & instead of &
|
||||
using (var reader = XmlReader.Create(new StringReader(xml), settings))
|
||||
{
|
||||
fileData.doc.Load(reader);
|
||||
}
|
||||
using var reader = XmlReader.Create(new StringReader(xml), settings);
|
||||
fileData.doc.Load(reader);
|
||||
}
|
||||
catch
|
||||
{
|
||||
@@ -580,10 +578,8 @@ namespace ChanSort.Loader.Philips
|
||||
|
||||
#region Save()
|
||||
|
||||
public override void Save(string tvOutputFile)
|
||||
public override void Save()
|
||||
{
|
||||
// "Save As..." is not supported by this loader
|
||||
|
||||
foreach (var list in this.DataRoot.ChannelLists)
|
||||
{
|
||||
if (list.IsMixedSourceFavoritesList)
|
||||
|
||||
Reference in New Issue
Block a user