Manual Import works now!

Also fixed a few bugs.

src/NzbDrone.Api/NetImport/ListImportModule.cs

@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Linq;
+using Nancy;
+using Nancy.Extensions;
+using NzbDrone.Api.Extensions;
+using NzbDrone.Api.Movie;
+using NzbDrone.Core.MetadataSource;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Api.NetImport
+{
+    public class ListImportModule : NzbDroneApiModule
+    {
+        private readonly IMovieService _movieService;
+        private readonly ISearchForNewMovie _movieSearch;
+
+        public ListImportModule(IMovieService movieService, ISearchForNewMovie movieSearch)
+            : base("/movie/import")
+        {
+            _movieService = movieService;
+            _movieSearch = movieSearch;
+            Put["/"] = Movie => SaveAll();
+        }
+
+        private Response SaveAll()
+        {
+            var resources = Request.Body.FromJson<List<MovieResource>>();
+
+            var Movies = resources.Select(MovieResource => _movieSearch.MapMovieToTmdbMovie(MovieResource.ToModel())).Where(m => m != null).DistinctBy(m => m.TmdbId).ToList();
+
+            return _movieService.AddMovies(Movies).ToResource().AsResponse(HttpStatusCode.Accepted);
+        }
+    }
+}

src/NzbDrone.Api/NzbDrone.Api.csproj

@@ -123,6 +123,7 @@
     <Compile Include="Movies\RenameMovieModule.cs" />
     <Compile Include="Movies\RenameMovieResource.cs" />
     <Compile Include="Movies\MovieEditorModule.cs" />
+    <Compile Include="NetImport\ListImportModule.cs" />
     <Compile Include="NetImport\NetImportModule.cs" />
     <Compile Include="NetImport\NetImportResource.cs" />
     <Compile Include="Parse\ParseModule.cs" />

src/NzbDrone.Api/Series/FetchMovieListModule.cs

@@ -28,7 +28,7 @@ namespace NzbDrone.Api.Movie
 
             List<Core.Tv.Movie> realResults = new List<Core.Tv.Movie>();
 
-            foreach (var movie in results)
+            /*foreach (var movie in results)
             {
                 var mapped = _movieSearch.MapMovieToTmdbMovie(movie);
 
@@ -36,9 +36,9 @@ namespace NzbDrone.Api.Movie
                 {
                     realResults.Add(mapped);
                 }
-            }
+            }*/
 
-            return MapToResource(realResults).AsResponse();
+            return MapToResource(results).AsResponse();
         }
 
 

src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TMDBResources.cs

@@ -42,6 +42,8 @@ namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
         public bool adult { get; set; }
         public string backdrop_path { get; set; }
         public Belongs_To_Collection belongs_to_collection { get; set; }
+        public int? status_code { get; set; }
+        public string status_message { get; set; }
         public int budget { get; set; }
         public Genre[] genres { get; set; }
         public string homepage { get; set; }

src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs

@@ -84,6 +84,18 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
 
             var resource = response.Resource;
 
+            if (resource.status_message != null)
+            {
+                if (resource.status_code == 34)
+                {
+                    _logger.Warn("Movie with TmdbId {0} could not be found. This is probably the case when the movie was deleted from TMDB.", TmdbId);
+                    return null;
+                }
+
+                _logger.Warn(resource.status_message);
+                return null;
+            }
+
             var movie = new Movie();
 
             movie.TmdbId = TmdbId;
@@ -567,10 +579,9 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
             Movie newMovie = movie;
             if (movie.TmdbId > 0)
             {
-                return newMovie;
+                newMovie = GetMovieInfo(movie.TmdbId);
             }
-
+            else if (movie.ImdbId.IsNotNullOrWhiteSpace())
-            if (movie.ImdbId.IsNotNullOrWhiteSpace())
             {
                 newMovie = GetMovieInfo(movie.ImdbId);
             }
@@ -586,7 +597,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
 
             if (newMovie == null)
             {
-                _logger.Warn("Couldn't map movie {0} to a movie on The Movie DB.");
+                _logger.Warn("Couldn't map movie {0} to a movie on The Movie DB. It will not be added :(", movie.Title);
                 return null;
             }
 

src/NzbDrone.Core/NetImport/NetImportSearchService.cs

@@ -25,7 +25,6 @@ namespace NzbDrone.Core.NetImport
         private readonly IMovieService _movieService;
         private readonly ISearchForNewMovie _movieSearch;
         private readonly IRootFolderService _rootFolder;
-        private string defaultRootFolder;
 
         public NetImportSearchService(INetImportFactory netImportFactory, IMovieService movieService,
             ISearchForNewMovie movieSearch, IRootFolderService rootFolder, Logger logger)
@@ -34,11 +33,6 @@ namespace NzbDrone.Core.NetImport
             _movieService = movieService;
             _movieSearch = movieSearch;
             _rootFolder = rootFolder;
-            var folder = _rootFolder.All().FirstOrDefault();
-            if (folder != null)
-            {
-                defaultRootFolder = folder.Path;
-            }
             _logger = logger;
         }
 

src/NzbDrone.Core/Tv/MovieService.cs

@@ -21,6 +21,7 @@ namespace NzbDrone.Core.Tv
         Movie GetMovie(int movieId);
         List<Movie> GetMovies(IEnumerable<int> movieIds);
         Movie AddMovie(Movie newMovie);
+        List<Movie> AddMovies(List<Movie> newMovies);
         Movie FindByImdbId(string imdbid);
         Movie FindByTitle(string title);
         Movie FindByTitle(string title, int year);
@@ -92,6 +93,35 @@ namespace NzbDrone.Core.Tv
             return newMovie;
         }
 
+        public List<Movie> AddMovies(List<Movie> newMovies)
+        {
+            _logger.Debug("Adding {0} movies", newMovies.Count);
+
+            newMovies.ForEach(m => Ensure.That(m, () => m).IsNotNull());
+
+            newMovies.ForEach(m =>
+            {
+                if (string.IsNullOrWhiteSpace(m.Path))
+                {
+                    var folderName = _fileNameBuilder.GetMovieFolder(m);
+                    m.Path = Path.Combine(m.RootFolderPath, folderName);
+                }
+
+                m.CleanTitle = m.Title.CleanSeriesTitle();
+                m.SortTitle = MovieTitleNormalizer.Normalize(m.Title, m.TmdbId);
+                m.Added = DateTime.UtcNow;
+            });
+
+            _movieRepository.InsertMany(newMovies);
+
+            newMovies.ForEach(m =>
+            {
+                _eventAggregator.PublishEvent(new MovieAddedEvent(m));
+            });
+
+            return newMovies;
+        }
+
         public Movie FindByTitle(string title)
         {
             return _movieRepository.FindByTitle(title.CleanSeriesTitle());

src/UI/AddMovies/List/AddFromListView.js

@@ -22,7 +22,8 @@ var MovieStatusCell = require('../../Cells/MovieStatusCell');
 var MovieDownloadStatusCell = require('../../Cells/MovieDownloadStatusCell');
 var DownloadedQualityCell = require('../../Cells/DownloadedQualityCell');
 var MoviesCollection = require('../../Movies/MoviesCollection');
-
+var Messenger = require('../../Shared/Messenger');
+require('jquery.dotdotdot');
 var SchemaModal = require('../../Settings/NetImport/Add/NetImportSchemaModal');
 
 module.exports = Marionette.Layout.extend({
@@ -35,7 +36,7 @@ module.exports = Marionette.Layout.extend({
 		ui : {
 				moviesSearch : '.x-movies-search',
 				listSelection : ".x-list-selection",
-
+				importSelected : ".x-import-selected"
 		},
 
 		columns : [
@@ -185,9 +186,24 @@ module.exports = Marionette.Layout.extend({
 		_importSelected : function() {
 			var selected = this.importGrid.getSelectedModels();
 			console.log(selected);
-			_.each(selected, function(elem){
+			var promise = MoviesCollection.importFromList(selected);
-				elem.save();
+			this.ui.importSelected.spinForPromise(promise);
-			})
+			this.ui.importSelected.addClass('disabled');
+
+			Messenger.show({
+				message : "Importing {0} movies. This can take multiple minutes depending on how many movies should be imported. Don't close this browser window until it is finished!".format(selected.length),
+				hideOnNavigate : false,
+				hideAfter : 30,
+				type : "error"
+			});
+
+			promise.done(function() {
+					Messenger.show({
+							message        : "Imported movies from list.",
+							hideAfter      : 8,
+							hideOnNavigate : true
+					});
+			});
 			/*for (m in selected) {
 				debugger;
 				m.save()

src/UI/AddMovies/List/AddFromListViewTemplate.hbs

@@ -9,7 +9,7 @@
 				<button class="btn x-fetch-list">Fetch List</button>
 			</div>
 			<div class="col-sm-2">
-				<button class="btn btn-success x-import-selected">Import Selected</button>
+				<button class="btn btn-success x-import-selected"><i class="icon-sonarr-add"></i> Import Selected</button>
 			</div>
 	</div>
 </div>

src/UI/Movies/MoviesCollection.js

@@ -47,6 +47,27 @@ var Collection = PageableCollection.extend({
 				return proxy.save();
 		},
 
+		importFromList : function(models) {
+			var self = this;
+
+			var proxy = _.extend(new Backbone.Model(), {
+				id : "",
+
+				url : self.url + "/import",
+
+				toJSON : function() {
+					return models;
+				}
+			});
+
+			this.listenTo(proxy, "sync", function(proxyModel, models) {
+				this.add(models, { merge : true});
+				this.trigger("save", this);
+			});
+
+			return proxy.save();
+		},
+
 		filterModes : {
 				'all'        : [
 						null,