mirror of
https://github.com/Sonarr/Sonarr.git
synced 2024-10-29 23:12:39 +01:00
Fixed: Importing files without media info available
This commit is contained in:
parent
9136ee4ad9
commit
53d8c9ba8d
@ -60,6 +60,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
|
||||
{
|
||||
var episodeFiles = Builder<EpisodeFile>.CreateListOfSize(3)
|
||||
.All()
|
||||
.With(v => v.Path = null)
|
||||
.With(v => v.RelativePath = "media.mkv")
|
||||
.TheFirst(1)
|
||||
.With(v => v.MediaInfo = new MediaInfoModel { SchemaRevision = VideoFileInfoReader.CURRENT_MEDIA_INFO_SCHEMA_REVISION })
|
||||
@ -86,6 +87,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
|
||||
{
|
||||
var episodeFiles = Builder<EpisodeFile>.CreateListOfSize(3)
|
||||
.All()
|
||||
.With(v => v.Path = null)
|
||||
.With(v => v.RelativePath = "media.mkv")
|
||||
.TheFirst(1)
|
||||
.With(v => v.MediaInfo = new MediaInfoModel { SchemaRevision = VideoFileInfoReader.MINIMUM_MEDIA_INFO_SCHEMA_REVISION })
|
||||
@ -112,6 +114,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
|
||||
{
|
||||
var episodeFiles = Builder<EpisodeFile>.CreateListOfSize(3)
|
||||
.All()
|
||||
.With(v => v.Path = null)
|
||||
.With(v => v.RelativePath = "media.mkv")
|
||||
.TheFirst(1)
|
||||
.With(v => v.MediaInfo = new MediaInfoModel())
|
||||
@ -161,6 +164,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
|
||||
{
|
||||
var episodeFiles = Builder<EpisodeFile>.CreateListOfSize(2)
|
||||
.All()
|
||||
.With(v => v.Path = null)
|
||||
.With(v => v.RelativePath = "media.mkv")
|
||||
.TheFirst(1)
|
||||
.With(v => v.RelativePath = "media2.mkv")
|
||||
@ -240,6 +244,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
|
||||
public void should_update_media_info()
|
||||
{
|
||||
var episodeFile = Builder<EpisodeFile>.CreateNew()
|
||||
.With(v => v.Path = null)
|
||||
.With(v => v.RelativePath = "media.mkv")
|
||||
.With(e => e.MediaInfo = new MediaInfoModel { SchemaRevision = 3 })
|
||||
.Build();
|
||||
@ -288,5 +293,26 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
|
||||
Mocker.GetMock<IMediaFileService>()
|
||||
.Verify(v => v.Update(episodeFile), Times.Never());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void should_not_update_media_info_if_file_does_not_support_media_info()
|
||||
{
|
||||
var path = Path.Combine(_series.Path, "media.iso");
|
||||
|
||||
var episodeFile = Builder<EpisodeFile>.CreateNew()
|
||||
.With(v => v.Path = path)
|
||||
.Build();
|
||||
|
||||
GivenFileExists();
|
||||
GivenFailedScan(path);
|
||||
|
||||
Subject.Update(episodeFile, _series);
|
||||
|
||||
Mocker.GetMock<IVideoFileInfoReader>()
|
||||
.Verify(v => v.GetMediaInfo(path), Times.Once());
|
||||
|
||||
Mocker.GetMock<IMediaFileService>()
|
||||
.Verify(v => v.Update(episodeFile), Times.Never());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2,6 +2,7 @@ using System.IO;
|
||||
using System.Linq;
|
||||
using NLog;
|
||||
using NzbDrone.Common.Disk;
|
||||
using NzbDrone.Common.Extensions;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.MediaFiles.Events;
|
||||
using NzbDrone.Core.Messaging.Events;
|
||||
@ -68,7 +69,7 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
|
||||
|
||||
public bool UpdateMediaInfo(EpisodeFile episodeFile, Series series)
|
||||
{
|
||||
var path = Path.Combine(series.Path, episodeFile.RelativePath);
|
||||
var path = episodeFile.Path.IsNotNullOrWhiteSpace() ? episodeFile.Path : Path.Combine(series.Path, episodeFile.RelativePath);
|
||||
|
||||
if (!_diskProvider.FileExists(path))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user