mirror of https://github.com/Radarr/Radarr
Fixed: Also scan media info when file is being imported (i.e. not an existing file)
Fixes #2956
This commit is contained in:
parent
253546ded0
commit
efb4127c35
|
@ -1,21 +1,24 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ContentModelStore">
|
<component name="ContentModelStore">
|
||||||
<e p="$PROJECT_DIR$/../_output" t="ExcludeRecursive">
|
<e p="E:\C++ Projects\Sonarr\_output" t="ExcludeRecursive">
|
||||||
<e p="NzbDrone.Update" t="ExcludeRecursive" />
|
<e p="NzbDrone.Update" t="ExcludeRecursive" />
|
||||||
</e>
|
</e>
|
||||||
<e p="$PROJECT_DIR$/../Logo/1024.png" t="Include" />
|
<e p="E:\C++ Projects\Sonarr\Logo\1024.png" t="Include" />
|
||||||
<e p="$PROJECT_DIR$/../Logo/64.png" t="Include" />
|
<e p="E:\C++ Projects\Sonarr\Logo\64.png" t="Include" />
|
||||||
<e p="$PROJECT_DIR$" t="IncludeFlat">
|
<e p="E:\C++ Projects\Sonarr\src" t="IncludeFlat">
|
||||||
<e p=".nuget" t="Include">
|
<e p=".nuget" t="Include">
|
||||||
<e p="NuGet.exe" t="Include" />
|
<e p="NuGet.exe" t="Include" />
|
||||||
</e>
|
</e>
|
||||||
<e p="_ReSharper.Caches/ReSharperHost12.NzbDrone.00" t="ExcludeRecursive" />
|
<e p="_ReSharper.Caches\ReSharperHost11.NzbDrone.00" t="ExcludeRecursive" />
|
||||||
<e p="Common/CommonAssemblyInfo.cs" t="Include" />
|
<e p="Common" t="Include">
|
||||||
<e p="Common/CommonVersionInfo.cs" t="Include" />
|
<e p="CodeAnalysisDictionary.xml" t="Include" />
|
||||||
<e p="Common/GlobalSuppressions.cs" t="Include" />
|
<e p="CommonAssemblyInfo.cs" t="Include" />
|
||||||
|
<e p="CommonVersionInfo.cs" t="Include" />
|
||||||
|
<e p="GlobalSuppressions.cs" t="Include" />
|
||||||
|
</e>
|
||||||
<e p="External" t="Include" />
|
<e p="External" t="Include" />
|
||||||
<e p="ExternalModules/CurlSharp/CurlSharp" t="IncludeRecursive">
|
<e p="ExternalModules\CurlSharp\CurlSharp" t="IncludeRecursive">
|
||||||
<e p="bin" t="ExcludeRecursive" />
|
<e p="bin" t="ExcludeRecursive" />
|
||||||
<e p="Callbacks" t="Include">
|
<e p="Callbacks" t="Include">
|
||||||
<e p="CurlEasyCallbacks.cs" t="Include" />
|
<e p="CurlEasyCallbacks.cs" t="Include" />
|
||||||
|
@ -67,10 +70,10 @@
|
||||||
</e>
|
</e>
|
||||||
</e>
|
</e>
|
||||||
<e p="Host" t="Include" />
|
<e p="Host" t="Include" />
|
||||||
<e p="Libraries/MediaInfo/libmediainfo.0.dylib" t="Include" />
|
<e p="Libraries\MediaInfo\libmediainfo.0.dylib" t="Include" />
|
||||||
<e p="Libraries/MediaInfo/MediaInfo.dll" t="Include" />
|
<e p="Libraries\MediaInfo\MediaInfo.dll" t="Include" />
|
||||||
<e p="Libraries/Sqlite/libsqlite3.0.dylib" t="Include" />
|
<e p="Libraries\Sqlite\libsqlite3.0.dylib" t="Include" />
|
||||||
<e p="Libraries/Sqlite/sqlite3.dll" t="Include" />
|
<e p="Libraries\Sqlite\sqlite3.dll" t="Include" />
|
||||||
<e p="LogentriesCore" t="IncludeRecursive">
|
<e p="LogentriesCore" t="IncludeRecursive">
|
||||||
<e p="AsyncLogger.cs" t="Include" />
|
<e p="AsyncLogger.cs" t="Include" />
|
||||||
<e p="bin" t="ExcludeRecursive" />
|
<e p="bin" t="ExcludeRecursive" />
|
||||||
|
@ -3325,7 +3328,7 @@
|
||||||
</e>
|
</e>
|
||||||
<e p="packages" t="ExcludeRecursive" />
|
<e p="packages" t="ExcludeRecursive" />
|
||||||
<e p="Platform" t="Include" />
|
<e p="Platform" t="Include" />
|
||||||
<e p="ServiceHelpers/ServiceInstall" t="IncludeRecursive">
|
<e p="ServiceHelpers\ServiceInstall" t="IncludeRecursive">
|
||||||
<e p="app.config" t="Include" />
|
<e p="app.config" t="Include" />
|
||||||
<e p="app.manifest" t="Include" />
|
<e p="app.manifest" t="Include" />
|
||||||
<e p="green_puzzle.ico" t="Include" />
|
<e p="green_puzzle.ico" t="Include" />
|
||||||
|
@ -3337,7 +3340,7 @@
|
||||||
<e p="ServiceHelper.cs" t="Include" />
|
<e p="ServiceHelper.cs" t="Include" />
|
||||||
<e p="ServiceInstall.csproj" t="IncludeRecursive" />
|
<e p="ServiceInstall.csproj" t="IncludeRecursive" />
|
||||||
</e>
|
</e>
|
||||||
<e p="ServiceHelpers/ServiceUninstall" t="IncludeRecursive">
|
<e p="ServiceHelpers\ServiceUninstall" t="IncludeRecursive">
|
||||||
<e p="app.config" t="Include" />
|
<e p="app.config" t="Include" />
|
||||||
<e p="app.manifest" t="Include" />
|
<e p="app.manifest" t="Include" />
|
||||||
<e p="obj" t="ExcludeRecursive" />
|
<e p="obj" t="ExcludeRecursive" />
|
||||||
|
|
|
@ -122,7 +122,7 @@ namespace NzbDrone.Core.MediaFiles.MovieImport
|
||||||
if (minimalInfo != null)
|
if (minimalInfo != null)
|
||||||
{
|
{
|
||||||
//TODO: make it so media info doesn't ruin the import process of a new movie
|
//TODO: make it so media info doesn't ruin the import process of a new movie
|
||||||
var mediaInfo = _config.EnableMediaInfo ? _videoFileInfoReader.GetMediaInfo(file) : null;
|
var mediaInfo = (_config.EnableMediaInfo || !movie.Path.IsParentPath(file)) ? _videoFileInfoReader.GetMediaInfo(file) : null;
|
||||||
var size = _diskProvider.GetFileSize(file);
|
var size = _diskProvider.GetFileSize(file);
|
||||||
var historyItems = _historyService.FindByDownloadId(downloadClientItem?.DownloadId ?? "");
|
var historyItems = _historyService.FindByDownloadId(downloadClientItem?.DownloadId ?? "");
|
||||||
var firstHistoryItem = historyItems.OrderByDescending(h => h.Date).FirstOrDefault();
|
var firstHistoryItem = historyItems.OrderByDescending(h => h.Date).FirstOrDefault();
|
||||||
|
|
Loading…
Reference in New Issue