From 7122962dc8af968c833be35e96349836c037cd88 Mon Sep 17 00:00:00 2001
From: Devin Buhl <onedr0p@users.noreply.github.com>
Date: Wed, 1 Mar 2017 18:45:12 -0500
Subject: [PATCH] Date added in Movie List & Possible Fix for Importing Movies.
 (#969)

* Is there a need to lazyload?

* Update dates in movie list

* additional check for moviefile lazy load

* lazyload not needed...
---
 .../MediaFiles/UpgradeMediaFileService.cs     | 35 ++++++-------------
 src/UI/Movies/Index/MoviesIndexLayout.js      | 14 +++++---
 .../SeriesOverviewItemViewTemplate.hbs        |  4 ++-
 3 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs b/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
index fb00c5c89..4e0d8322a 100644
--- a/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
+++ b/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
@@ -36,42 +36,29 @@ namespace NzbDrone.Core.MediaFiles
             _logger = logger;
         }
 
-        public MovieFileMoveResult UpgradeMovieFile(MovieFile episodeFile, LocalMovie localEpisode, bool copyOnly = false)
+        public MovieFileMoveResult UpgradeMovieFile(MovieFile movieFile, LocalMovie localMovie, bool copyOnly = false)
         {
-            _logger.Trace("Upgrading existing episode file.");
+            _logger.Trace("Upgrading existing movie file.");
             var moveFileResult = new MovieFileMoveResult();
-            localEpisode.Movie.MovieFile.LazyLoad();
-            var existingFile = localEpisode.Movie.MovieFile;
-            existingFile.LazyLoad();
 
-            if (existingFile.IsLoaded && existingFile.Value != null)
-            {
-                var file = existingFile.Value;
-                var episodeFilePath = Path.Combine(localEpisode.Movie.Path, file.RelativePath);
-
-                if (_diskProvider.FileExists(episodeFilePath))
-                {
-                    _logger.Debug("Removing existing episode file: {0}", file);
-                    _recycleBinProvider.DeleteFile(episodeFilePath);
-                }
+            var existingFile = localMovie.Movie.MovieFile.Value;
+            var movieFilePath = Path.Combine(localMovie.Movie.Path, existingFile.RelativePath);
 
-                moveFileResult.OldFiles.Add(file);
-                _mediaFileService.Delete(file, DeleteMediaFileReason.Upgrade);
-            }
-            else
+            if (_diskProvider.FileExists(movieFilePath))
             {
-                //_logger.Warn("The existing movie file was not lazy loaded.");
+                _logger.Debug("Removing existing movie file: {0}", existingFile);
+                _recycleBinProvider.DeleteFile(movieFilePath);
             }
 
-            
-
+            moveFileResult.OldFiles.Add(existingFile);
+            _mediaFileService.Delete(existingFile, DeleteMediaFileReason.Upgrade);
             if (copyOnly)
             {
-                moveFileResult.MovieFile = _movieFileMover.CopyMovieFile(episodeFile, localEpisode);
+                moveFileResult.MovieFile = _movieFileMover.CopyMovieFile(movieFile, localMovie);
             }
             else
             {
-                moveFileResult.MovieFile= _movieFileMover.MoveMovieFile(episodeFile, localEpisode);
+                moveFileResult.MovieFile = _movieFileMover.MoveMovieFile(movieFile, localMovie);
             }
 
             return moveFileResult;
diff --git a/src/UI/Movies/Index/MoviesIndexLayout.js b/src/UI/Movies/Index/MoviesIndexLayout.js
index 8efd0756c..38459e815 100644
--- a/src/UI/Movies/Index/MoviesIndexLayout.js
+++ b/src/UI/Movies/Index/MoviesIndexLayout.js
@@ -6,7 +6,8 @@ var ListCollectionView = require('./Overview/SeriesOverviewCollectionView');
 var EmptyView = require('./EmptyView');
 var MoviesCollection = require('../MoviesCollection');
 //var FullMovieCollection = require('../FullMovieCollection');
-var InCinemasCell = require('../../Cells/InCinemasCell');
+//var InCinemasCell = require('../../Cells/InCinemasCell');
+var RelativeDateCell = require('../../Cells/RelativeDateCell');
 var MovieTitleCell = require('../../Cells/MovieTitleCell');
 var TemplatedCell = require('../../Cells/TemplatedCell');
 var ProfileCell = require('../../Cells/ProfileCell');
@@ -52,6 +53,11 @@ module.exports = Marionette.Layout.extend({
             cell      : MovieTitleCell,
             cellValue : 'this',
         },
+        {
+            name  : 'added',
+            label : 'Date Added',
+            cell  : RelativeDateCell
+        },        
         {
           name : "downloadedQuality",
           label : "Downloaded",
@@ -66,7 +72,7 @@ module.exports = Marionette.Layout.extend({
         {
             name  : 'inCinemas',
             label : 'In Cinemas',
-            cell  : InCinemasCell
+            cell  : RelativeDateCell
         },
         {
             name      : 'this',
@@ -194,9 +200,9 @@ module.exports = Marionette.Layout.extend({
                     title : 'Title',
                     name  : 'title'
                 },
-                {
+                {
                     title: 'Downloaded',
-                    name: 'downloadedQuality'
+                    name: 'downloadedQuality'
                 },
                 {
                     title : 'Profile',
diff --git a/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs b/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs
index 18033cc04..f23658fa3 100644
--- a/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs
+++ b/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs
@@ -37,7 +37,9 @@
                 <div class="col-md-8 col-xs-8">
                     <span class="label label-default">{{GetStatus}}</span>
 
-                    <span class="label label-default">{{ShortDate inCinemas}}</span>
+                    {{#if inCinemas}}
+                      <span class="label label-default">{{RelativeDate inCinemas}}</span>
+                    {{/if}}
 
                     {{profile profileId}}