Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow remuxed files in script import

This commit is contained in:
Jendrik Weise 2023-08-21 17:57:33 +02:00
parent 7986488c6d
commit e00c74af24
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/NzbDrone.Core/MediaFiles/ScriptImportDecider.cs
View File

@ -10,6 +10,7 @@ using NzbDrone.Core.MediaFiles.MediaInfo;
using NzbDrone.Core.Parser; using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Tags; using NzbDrone.Core.Tags;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.MediaFiles namespace NzbDrone.Core.MediaFiles
{ {
@ -42,6 +43,31 @@ namespace NzbDrone.Core.MediaFiles
_logger = logger; _logger = logger;
} }
private bool CheckExtensions(ref string destinationFilePath, EpisodeFile episodeFile, Series series)
{
if (!File.Exists(destinationFilePath))
{
_logger.Debug("Destination file does not exist after script execution, checking for other extensions.");
foreach (var extension in MediaFileExtensions.Extensions)
{
var pathWithExtension = Path.ChangeExtension(destinationFilePath, extension);
if (File.Exists(pathWithExtension))
{
_logger.Debug("Found file with extension: {0}", extension);
destinationFilePath = pathWithExtension;
episodeFile.RelativePath = series.Path.GetRelativePath(destinationFilePath);
return true;
}
}
return false;
}
return true;
}
public ScriptImportDecision TryImport(string sourcePath, string destinationFilePath, LocalEpisode localEpisode, EpisodeFile episodeFile, TransferMode mode) public ScriptImportDecision TryImport(string sourcePath, string destinationFilePath, LocalEpisode localEpisode, EpisodeFile episodeFile, TransferMode mode)
{ {
var series = localEpisode.Series; var series = localEpisode.Series;
@ -123,6 +149,11 @@ namespace NzbDrone.Core.MediaFiles
case 0: // Copy complete case 0: // Copy complete
return ScriptImportDecision.MoveComplete; return ScriptImportDecision.MoveComplete;
case 2: // Copy complete, file potentially changed, should try renaming again case 2: // Copy complete, file potentially changed, should try renaming again
if (!CheckExtensions(ref destinationFilePath, episodeFile, series))
{
throw new ScriptImportException("File not found at destination when moving with script.");
}
episodeFile.MediaInfo = _videoFileInfoReader.GetMediaInfo(destinationFilePath); episodeFile.MediaInfo = _videoFileInfoReader.GetMediaInfo(destinationFilePath);
episodeFile.Path = null; episodeFile.Path = null;
return ScriptImportDecision.RenameRequested; return ScriptImportDecision.RenameRequested;