mirror of
https://github.com/lidarr/Lidarr
synced 2025-01-03 05:25:10 +00:00
Improve CF calculation for files without scene name
Fixed: Use original filename instead of complete path when calculating CF for existing file without scene name (cherry picked from commit 997aabbc3cfc3c9c5c220786d1d08cfceec5e2f2) Closes #3359
This commit is contained in:
parent
0bdd5f3278
commit
a9b16d298f
1 changed files with 5 additions and 5 deletions
|
@ -58,7 +58,7 @@ public List<CustomFormat> ParseCustomFormat(Blocklist blocklist, Artist artist)
|
|||
{
|
||||
var parsed = Parser.Parser.ParseAlbumTitle(blocklist.SourceTitle);
|
||||
|
||||
var episodeInfo = new ParsedAlbumInfo
|
||||
var albumInfo = new ParsedAlbumInfo
|
||||
{
|
||||
ArtistName = artist.Name,
|
||||
ReleaseTitle = parsed?.ReleaseTitle ?? blocklist.SourceTitle,
|
||||
|
@ -68,7 +68,7 @@ public List<CustomFormat> ParseCustomFormat(Blocklist blocklist, Artist artist)
|
|||
|
||||
var input = new CustomFormatInput
|
||||
{
|
||||
AlbumInfo = episodeInfo,
|
||||
AlbumInfo = albumInfo,
|
||||
Artist = artist,
|
||||
Size = blocklist.Size ?? 0
|
||||
};
|
||||
|
@ -160,7 +160,7 @@ private List<CustomFormat> ParseCustomFormat(TrackFile trackFile, Artist artist,
|
|||
else if (trackFile.OriginalFilePath.IsNotNullOrWhiteSpace())
|
||||
{
|
||||
_logger.Trace("Using original file path for release title: {0}", Path.GetFileName(trackFile.OriginalFilePath));
|
||||
releaseTitle = trackFile.OriginalFilePath;
|
||||
releaseTitle = Path.GetFileName(trackFile.OriginalFilePath);
|
||||
}
|
||||
else if (trackFile.Path.IsNotNullOrWhiteSpace())
|
||||
{
|
||||
|
@ -168,7 +168,7 @@ private List<CustomFormat> ParseCustomFormat(TrackFile trackFile, Artist artist,
|
|||
releaseTitle = Path.GetFileName(trackFile.Path);
|
||||
}
|
||||
|
||||
var episodeInfo = new ParsedAlbumInfo
|
||||
var albumInfo = new ParsedAlbumInfo
|
||||
{
|
||||
ArtistName = artist.Name,
|
||||
ReleaseTitle = releaseTitle,
|
||||
|
@ -178,7 +178,7 @@ private List<CustomFormat> ParseCustomFormat(TrackFile trackFile, Artist artist,
|
|||
|
||||
var input = new CustomFormatInput
|
||||
{
|
||||
AlbumInfo = episodeInfo,
|
||||
AlbumInfo = albumInfo,
|
||||
Artist = artist,
|
||||
Size = trackFile.Size,
|
||||
Filename = Path.GetFileName(trackFile.Path)
|
||||
|
|
Loading…
Reference in a new issue