Crunchy-DL
/
Crunchy-Downloader
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix - Fix crash caused by season sorting

This commit is contained in:
Elwador 2024-07-02 05:23:05 +02:00
parent 49270824f2
commit baf90f546b
1 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
CRD/Downloader/History.cs
View File

@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
using System.ComponentModel; using System.ComponentModel;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -55,7 +56,7 @@ public class History(){
} }
} }
var seasonData = await crunInstance.CrSeries.GetSeasonDataById(sId,string.IsNullOrEmpty(crunInstance.CrunOptions.HistoryLang) ? crunInstance.DefaultLocale : crunInstance.CrunOptions.HistoryLang,true); var seasonData = await crunInstance.CrSeries.GetSeasonDataById(sId, string.IsNullOrEmpty(crunInstance.CrunOptions.HistoryLang) ? crunInstance.DefaultLocale : crunInstance.CrunOptions.HistoryLang, true);
await UpdateWithSeasonData(seasonData); await UpdateWithSeasonData(seasonData);
} }
} }
@ -175,8 +176,6 @@ public class History(){
var newSeason = NewHistorySeason(episode); var newSeason = NewHistorySeason(episode);
historySeries.Seasons.Add(newSeason); historySeries.Seasons.Add(newSeason);
SortSeasons(historySeries);
} }
historySeries.UpdateNewEpisodes(); historySeries.UpdateNewEpisodes();
@ -196,6 +195,7 @@ public class History(){
} }
SortItems(); SortItems();
SortSeasons(historySeries);
MatchHistorySeriesWithSonarr(false); MatchHistorySeriesWithSonarr(false);
await MatchHistoryEpisodesWithSonarr(false, historySeries); await MatchHistoryEpisodesWithSonarr(false, historySeries);
@ -209,7 +209,7 @@ public class History(){
var historySeries = crunInstance.HistoryList.FirstOrDefault(series => series.SeriesId == seriesId); var historySeries = crunInstance.HistoryList.FirstOrDefault(series => series.SeriesId == seriesId);
if (historySeries != null){ if (historySeries != null){
var historySeason = historySeries.Seasons.FirstOrDefault(s => s.SeasonId == firstEpisode.SeasonId); var historySeason = historySeries.Seasons.FirstOrDefault(s => s.SeasonId == firstEpisode.SeasonId);
await RefreshSeriesData(seriesId, historySeries); await RefreshSeriesData(seriesId, historySeries);
if (historySeason != null){ if (historySeason != null){
@ -247,8 +247,6 @@ public class History(){
newSeason.EpisodesList.Sort(new NumericStringPropertyComparer()); newSeason.EpisodesList.Sort(new NumericStringPropertyComparer());
historySeries.Seasons.Add(newSeason); historySeries.Seasons.Add(newSeason);
SortSeasons(historySeries);
} }
historySeries.UpdateNewEpisodes(); historySeries.UpdateNewEpisodes();
@ -273,6 +271,7 @@ public class History(){
} }
SortItems(); SortItems();
SortSeasons(historySeries);
MatchHistorySeriesWithSonarr(false); MatchHistorySeriesWithSonarr(false);
await MatchHistoryEpisodesWithSonarr(false, historySeries); await MatchHistoryEpisodesWithSonarr(false, historySeries);
@ -281,7 +280,7 @@ public class History(){
} }
private async Task RefreshSeriesData(string seriesId, HistorySeries historySeries){ private async Task RefreshSeriesData(string seriesId, HistorySeries historySeries){
var series = await crunInstance.CrSeries.SeriesById(seriesId,string.IsNullOrEmpty(crunInstance.CrunOptions.HistoryLang) ? crunInstance.DefaultLocale : crunInstance.CrunOptions.HistoryLang,true); var series = await crunInstance.CrSeries.SeriesById(seriesId, string.IsNullOrEmpty(crunInstance.CrunOptions.HistoryLang) ? crunInstance.DefaultLocale : crunInstance.CrunOptions.HistoryLang, true);
if (series?.Data != null){ if (series?.Data != null){
historySeries.SeriesDescription = series.Data.First().Description; historySeries.SeriesDescription = series.Data.First().Description;
historySeries.ThumbnailImageUrl = GetSeriesThumbnail(series); historySeries.ThumbnailImageUrl = GetSeriesThumbnail(series);
@ -291,7 +290,12 @@ public class History(){
private void SortSeasons(HistorySeries series){ private void SortSeasons(HistorySeries series){
var sortedSeasons = series.Seasons var sortedSeasons = series.Seasons
.OrderBy(s => s.SeasonNum != null ? int.Parse(s.SeasonNum) : 0) .OrderBy(s => {
double seasonNum;
return double.TryParse(s.SeasonNum, NumberStyles.Any, CultureInfo.InvariantCulture, out seasonNum)
? seasonNum
: double.MaxValue;
})
.ToList(); .ToList();
series.Seasons.Clear(); series.Seasons.Clear();
@ -300,7 +304,7 @@ public class History(){
series.Seasons.Add(season); series.Seasons.Add(season);
} }
} }
public void SortItems(){ public void SortItems(){
var currentSortingType = Crunchyroll.Instance.CrunOptions.HistoryPageProperties?.SelectedSorting ?? SortingType.SeriesTitle; var currentSortingType = Crunchyroll.Instance.CrunOptions.HistoryPageProperties?.SelectedSorting ?? SortingType.SeriesTitle;
switch (currentSortingType){ switch (currentSortingType){
@ -348,7 +352,7 @@ public class History(){
return null; return null;
} }
private string GetSeriesThumbnail(CrSeriesBase series){ private string GetSeriesThumbnail(CrSeriesBase series){
// var series = await crunInstance.CrSeries.SeriesById(seriesId); // var series = await crunInstance.CrSeries.SeriesById(seriesId);
@ -438,10 +442,10 @@ public class History(){
} }
if (!string.IsNullOrEmpty(historySeries.SonarrSeriesId)){ if (!string.IsNullOrEmpty(historySeries.SonarrSeriesId)){
var episodes = await SonarrClient.Instance.GetEpisodes(int.Parse(historySeries.SonarrSeriesId)); List<SonarrEpisode>? episodes = await SonarrClient.Instance.GetEpisodes(int.Parse(historySeries.SonarrSeriesId));
historySeries.SonarrNextAirDate = GetNextAirDate(episodes); historySeries.SonarrNextAirDate = GetNextAirDate(episodes);
List<HistoryEpisode> allHistoryEpisodes =[]; List<HistoryEpisode> allHistoryEpisodes =[];
foreach (var historySeriesSeason in historySeries.Seasons){ foreach (var historySeriesSeason in historySeries.Seasons){
@ -450,13 +454,11 @@ public class History(){
List<HistoryEpisode> failedEpisodes =[]; List<HistoryEpisode> failedEpisodes =[];
Parallel.ForEach(allHistoryEpisodes, historyEpisode => Parallel.ForEach(allHistoryEpisodes, historyEpisode => {
{
if (updateAll || string.IsNullOrEmpty(historyEpisode.SonarrEpisodeId)){ if (updateAll || string.IsNullOrEmpty(historyEpisode.SonarrEpisodeId)){
// Create a copy of the episodes list for each thread // Create a copy of the episodes list for each thread
var episodesCopy = new List<SonarrEpisode>(episodes); var episodesCopy = new List<SonarrEpisode>(episodes);
var episode = FindClosestMatchEpisodes(episodesCopy, historyEpisode.EpisodeTitle); var episode = FindClosestMatchEpisodes(episodesCopy, historyEpisode.EpisodeTitle);
if (episode != null){ if (episode != null){
historyEpisode.SonarrEpisodeId = episode.Id + ""; historyEpisode.SonarrEpisodeId = episode.Id + "";
@ -471,9 +473,17 @@ public class History(){
} }
}); });
Parallel.ForEach(failedEpisodes, historyEpisode => Parallel.ForEach(failedEpisodes, historyEpisode => {
{ var episode = episodes.Find(ele => {
var episode = episodes.Find(ele => ele.EpisodeNumber + "" == historyEpisode.Episode && ele.SeasonNumber + "" == historyEpisode.EpisodeSeasonNum); if (ele == null){
return false;
}
var episodeNumberStr = ele.EpisodeNumber.ToString() ?? string.Empty;
var seasonNumberStr = ele.SeasonNumber.ToString() ?? string.Empty;
return episodeNumberStr == historyEpisode.Episode && seasonNumberStr == historyEpisode.EpisodeSeasonNum;
});
if (episode != null){ if (episode != null){
historyEpisode.SonarrEpisodeId = episode.Id + ""; historyEpisode.SonarrEpisodeId = episode.Id + "";
historyEpisode.SonarrEpisodeNumber = episode.EpisodeNumber + ""; historyEpisode.SonarrEpisodeNumber = episode.EpisodeNumber + "";
@ -482,8 +492,12 @@ public class History(){
historyEpisode.SonarrSeasonNumber = episode.SeasonNumber + ""; historyEpisode.SonarrSeasonNumber = episode.SeasonNumber + "";
episodes.Remove(episode); episodes.Remove(episode);
} else{ } else{
var episode1 = episodes.Find(ele => var episode1 = episodes.Find(ele => {
!string.IsNullOrEmpty(historyEpisode.EpisodeDescription) && !string.IsNullOrEmpty(ele.Overview) && Helpers.CalculateCosineSimilarity(ele.Overview, historyEpisode.EpisodeDescription) > 0.8); if (ele == null){
return false;
}
return !string.IsNullOrEmpty(historyEpisode.EpisodeDescription) && !string.IsNullOrEmpty(ele.Overview) && Helpers.CalculateCosineSimilarity(ele.Overview, historyEpisode.EpisodeDescription) > 0.8;
});
if (episode1 != null){ if (episode1 != null){
historyEpisode.SonarrEpisodeId = episode1.Id + ""; historyEpisode.SonarrEpisodeId = episode1.Id + "";
@ -493,7 +507,13 @@ public class History(){
historyEpisode.SonarrSeasonNumber = episode1.SeasonNumber + ""; historyEpisode.SonarrSeasonNumber = episode1.SeasonNumber + "";
episodes.Remove(episode1); episodes.Remove(episode1);
} else{ } else{
var episode2 = episodes.Find(ele => ele.AbsoluteEpisodeNumber + "" == historyEpisode.Episode); var episode2 = episodes.Find(ele => {
if (ele == null){
return false;
}
return ele.AbsoluteEpisodeNumber + "" == historyEpisode.Episode;
});
if (episode2 != null){ if (episode2 != null){
historyEpisode.SonarrEpisodeId = episode2.Id + ""; historyEpisode.SonarrEpisodeId = episode2.Id + "";
historyEpisode.SonarrEpisodeNumber = episode2.EpisodeNumber + ""; historyEpisode.SonarrEpisodeNumber = episode2.EpisodeNumber + "";
@ -554,12 +574,14 @@ public class History(){
object lockObject = new object(); // To synchronize access to shared variables object lockObject = new object(); // To synchronize access to shared variables
Parallel.ForEach(episodeList, episode => { Parallel.ForEach(episodeList, episode => {
double similarity = CalculateSimilarity(episode.Title, title); if (episode != null){
lock (lockObject) // Ensure thread-safe access to shared variables double similarity = CalculateSimilarity(episode.Title, title);
{ lock (lockObject) // Ensure thread-safe access to shared variables
if (similarity > highestSimilarity){ {
highestSimilarity = similarity; if (similarity > highestSimilarity){
closestMatch = episode; highestSimilarity = similarity;
closestMatch = episode;
}
} }
} }
}); });
@ -623,5 +645,4 @@ public class NumericStringPropertyComparer : IComparer<HistoryEpisode>{
// Fall back to string comparison if not parseable as integers // Fall back to string comparison if not parseable as integers
return String.Compare(x.Episode, y.Episode, StringComparison.Ordinal); return String.Compare(x.Episode, y.Episode, StringComparison.Ordinal);
} }
} }