parent
4ed4ca4804
commit
899d6ddbab
|
@ -220,6 +220,7 @@ namespace NzbDrone.Core.History
|
||||||
history.Data.Add("DownloadClient", message.DownloadClientInfo?.Type);
|
history.Data.Add("DownloadClient", message.DownloadClientInfo?.Type);
|
||||||
history.Data.Add("DownloadClientName", message.DownloadClientInfo?.Name);
|
history.Data.Add("DownloadClientName", message.DownloadClientInfo?.Name);
|
||||||
history.Data.Add("ReleaseGroup", message.EpisodeInfo.ReleaseGroup);
|
history.Data.Add("ReleaseGroup", message.EpisodeInfo.ReleaseGroup);
|
||||||
|
history.Data.Add("CustomFormatScore", message.EpisodeInfo.CustomFormatScore.ToString());
|
||||||
|
|
||||||
_historyRepository.Insert(history);
|
_historyRepository.Insert(history);
|
||||||
}
|
}
|
||||||
|
|
|
@ -140,6 +140,9 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
localEpisode.CustomFormats = _formatCalculator.ParseCustomFormat(localEpisode);
|
||||||
|
localEpisode.CustomFormatScore = localEpisode.Series.QualityProfile?.Value.CalculateCustomFormatScore(localEpisode.CustomFormats) ?? 0;
|
||||||
|
|
||||||
decision = GetDecision(localEpisode, downloadClientItem);
|
decision = GetDecision(localEpisode, downloadClientItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -487,6 +487,8 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
|
||||||
|
|
||||||
// Augment episode file so imported files have all additional information an automatic import would
|
// Augment episode file so imported files have all additional information an automatic import would
|
||||||
localEpisode = _aggregationService.Augment(localEpisode, trackedDownload?.DownloadItem);
|
localEpisode = _aggregationService.Augment(localEpisode, trackedDownload?.DownloadItem);
|
||||||
|
localEpisode.CustomFormats = _formatCalculator.ParseCustomFormat(localEpisode);
|
||||||
|
localEpisode.CustomFormatScore = localEpisode.Series.QualityProfile?.Value.CalculateCustomFormatScore(localEpisode.CustomFormats) ?? 0;
|
||||||
|
|
||||||
// Apply the user-chosen values.
|
// Apply the user-chosen values.
|
||||||
localEpisode.Series = series;
|
localEpisode.Series = series;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using NzbDrone.Common.Extensions;
|
using NzbDrone.Common.Extensions;
|
||||||
|
using NzbDrone.Core.CustomFormats;
|
||||||
using NzbDrone.Core.Languages;
|
using NzbDrone.Core.Languages;
|
||||||
using NzbDrone.Core.MediaFiles.MediaInfo;
|
using NzbDrone.Core.MediaFiles.MediaInfo;
|
||||||
using NzbDrone.Core.Qualities;
|
using NzbDrone.Core.Qualities;
|
||||||
|
@ -31,6 +32,8 @@ namespace NzbDrone.Core.Parser.Model
|
||||||
public string ReleaseGroup { get; set; }
|
public string ReleaseGroup { get; set; }
|
||||||
public string SceneName { get; set; }
|
public string SceneName { get; set; }
|
||||||
public bool OtherVideoFiles { get; set; }
|
public bool OtherVideoFiles { get; set; }
|
||||||
|
public List<CustomFormat> CustomFormats { get; set; }
|
||||||
|
public int CustomFormatScore { get; set; }
|
||||||
|
|
||||||
public int SeasonNumber
|
public int SeasonNumber
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue