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

- various improvements for Sony 1.1.0e format (handling deleted channels that need a unique number)

Browse Source 
- DX upgrade to 19.1.5
This commit is contained in:
hbeham
2019-08-11 10:04:29 +02:00
parent 25b2df7734
commit 8aee8a75d0
22 changed files with 417 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/ChanSort.Api/Controller/Editor.cs
View File

@@ -373,7 +373,7 @@ namespace ChanSort.Api
}
int progNr = this.GetNewProgramNr(appChannel, ref maxProgNr);
if (mode != UnsortedChannelMode.MarkDeleted)
if (mode != UnsortedChannelMode.MarkDeleted || this.DataRoot.DeletedChannelsNeedNumbers)
appChannel.NewProgramNr = progNr;
}
}
@@ -384,8 +384,9 @@ namespace ChanSort.Api
private string ChanSortCriteria(ChannelInfo channel)
{
// explicitly sorted
if (channel.GetPosition(this.SubListIndex) != -1)
return channel.GetPosition(this.SubListIndex).ToString("d5");
var pos = channel.GetPosition(this.SubListIndex);
if (pos != -1)
return pos.ToString("d5");
// eventually hide unsorted channels
if (this.unsortedChannelMode == UnsortedChannelMode.MarkDeleted)

9
source/ChanSort.Api/Model/DataRoot.cs
View File

@@ -25,6 +25,8 @@ namespace ChanSort.Api
public bool AllowGapsInFavNumbers { get; set; }
public bool ShowDeletedChannels { get; set; }
public bool DeletedChannelsNeedNumbers { get; set; }
public DataRoot()
{
this.SupportedFavorites = Favorites.A | Favorites.B | Favorites.C | Favorites.D;
@@ -118,8 +120,8 @@ namespace ChanSort.Api
{
foreach (var channel in list.Channels)
{
for (int i=0; i<=c; i++)
channel.SetPosition(i, channel.IsDeleted ? -1 : channel.GetOldPosition(i));
for (int i = 0; i <= c; i++)
channel.SetPosition(i, channel.IsDeleted && !this.DeletedChannelsNeedNumbers ? -1 : channel.GetOldPosition(i));
}
}
}
@@ -128,6 +130,9 @@ namespace ChanSort.Api
#region SetPrNrForDeletedChannels()
public void SetPrNrForDeletedChannels()
{
if (this.DeletedChannelsNeedNumbers)
return;
// make sure that deleted channels have OldProgramNr = -1
foreach (var list in this.ChannelLists)
{