added more import code in ui.

some jshint cleanup.

NzbDrone.Core/Providers/ExternalNotification/ExternalNotificationBase.cs

@@ -1,6 +1,4 @@
-using System;
+using NLog;
-using NLog;
-using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 

NzbDrone.Core/Providers/RootDirProvider.cs

@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using NLog;
 using NzbDrone.Common;
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using PetaPoco;
 
@@ -70,7 +68,7 @@ namespace NzbDrone.Core.Providers
             {
                 if (!_seriesProvider.SeriesPathExists(seriesFolder))
                 {
-                    results.Add(seriesFolder.Normalize());
+                    results.Add(new DirectoryInfo(seriesFolder.Normalize()).Name);
                 }
             }
 

NzbDrone.Web/NzbDrone.Web.csproj

@@ -25,6 +25,7 @@
     <OldToolsVersion>4.0</OldToolsVersion>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <JSLintSkip>\_backboneApp\JsLibraries\|\Scripts\</JSLintSkip>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/AddNewSeriesView.js

@@ -1,27 +1,28 @@
-/// <reference path="../../app.js" />
+'use strict;'
+/// <reference path="../../app.js" />
 /// <reference path="SearchResultView.js" />
 
 NzbDrone.AddSeries.AddNewSeriesView = Backbone.Marionette.Layout.extend({
-    template: "AddSeries/AddNewSeries/AddNewSeriesTemplate",
+    template: 'AddSeries/AddNewSeries/AddNewSeriesTemplate',
-    route: "Series/add/new",
+    route: 'Series/add/new',
 
     ui: {
         seriesSearch: '.search input'
     },
 
     regions: {
-        searchResult: "#search-result",
+        searchResult: '#search-result',
     },
 
     collection: new NzbDrone.AddSeries.SearchResultCollection(),
 
     initialize: function (options) {
         if (options.rootFolders === undefined) {
-            throw "rootFolder arg is required.";
+            throw 'rootFolder arg. is required.';
         }
 
         if (options.qualityProfiles === undefined) {
-            throw "qualityProfiles arg is required.";
+            throw 'qualityProfiles arg. is required.';
         }
 
         this.rootFoldersCollection = options.rootFolders;
@@ -35,8 +36,8 @@ NzbDrone.AddSeries.AddNewSeriesView = Backbone.Marionette.Layout.extend({
         this.ui.seriesSearch
             .data('timeout', null)
             .keyup(function () {
-                clearTimeout(self.$el.data('timeout'));
+                window.clearTimeout(self.$el.data('timeout'));
-                self.$el.data('timeout', setTimeout(self.search, 500, self));
+                self.$el.data('timeout', window.setTimeout(self.search, 500, self));
             });
 
         this.resultView = new NzbDrone.AddSeries.SearchResultView({ collection: this.collection });
@@ -48,7 +49,7 @@ NzbDrone.AddSeries.AddNewSeriesView = Backbone.Marionette.Layout.extend({
         var term = context.ui.seriesSearch.val();
         context.collection.reset();
 
-        if (term != "") {
+        if (term !== '') {
             context.searchResult.show(new NzbDrone.Shared.SpinnerView());
 
             context.collection.fetch({

NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/SearchResultTemplate.html

@@ -1,4 +1,5 @@
-<div class="accordion-heading">
+<div class="accordion-group">
+    <div class="accordion-heading">
         <a href="http://thetvdb.com/?tab=series&id={{id}}" target="_blank" class="icon-info-sign pull-left"></a>
         <a class="accordion-toggle" data-toggle="collapse" href="#{{id}}">{{seriesName}} {{seriesYear}}</a>
     </div>
@@ -17,5 +18,5 @@
             <div class="btn btn-success pull-right icon-plus x-add">
             </div>
         </div>
-    <div name="overview"></div>
+    </div>
 </div>

NzbDrone.Web/_backboneApp/AddSeries/AddNewSeries/SearchResultView.js

@@ -1,4 +1,6 @@
-/// <reference path="../../app.js" />
+'use strict';
+/*global NzbDrone, Backbone*/
+/// <reference path="../../app.js" />
 /// <reference path="../SearchResultModel.js" />
 /// <reference path="../../Series/SeriesModel.js" />
 /// <reference path="../SearchResultCollection.js" />
@@ -6,11 +8,12 @@
 NzbDrone.AddSeries.SearchItemView = Backbone.Marionette.ItemView.extend({
 
     template: "AddSeries/AddNewSeries/SearchResultTemplate",
-    className: 'search-item accordion-group',
+    className: 'search-item',
 
     ui: {
         qualityProfile: '.x-quality-profile',
-        rootFolder: '.x-root-folder'
+        rootFolder: '.x-root-folder',
+        addButton: '.x-add'
     },
 
     events: {
@@ -38,6 +41,8 @@ NzbDrone.AddSeries.SearchItemView = Backbone.Marionette.ItemView.extend({
             path: path
         });
 
+        var self = this;
+
         model.save(undefined, {
             success: function () {
                 var notificationModel = new NzbDrone.Shared.NotificationModel({
@@ -47,6 +52,7 @@ NzbDrone.AddSeries.SearchItemView = Backbone.Marionette.ItemView.extend({
                 });
 
                 NzbDrone.Shared.NotificationCollectionView.Instance.collection.add(notificationModel);
+                self.close();
             }
         });
     }
@@ -62,8 +68,5 @@ NzbDrone.AddSeries.SearchResultView = Backbone.Marionette.CollectionView.extend(
 
     initialize: function () {
         this.listenTo(this.collection, 'reset', this.render);
-    },
+    }
-
-
-
 });

NzbDrone.Web/_backboneApp/AddSeries/AddSeriesLayout.js

@@ -6,29 +6,31 @@
 /// <reference path="ImportExistingSeries/ImportSeriesView.js" />
 
 NzbDrone.AddSeries.AddSeriesLayout = Backbone.Marionette.Layout.extend({
-    template: "AddSeries/addSeriesLayoutTemplate",
+    template: 'AddSeries/addSeriesLayoutTemplate',
 
     regions: {
-        addNew: "#add-new",
+        addNew: '#add-new',
-        importExisting: "#import-existing",
+        importExisting: '#import-existing',
-        rootFolders: "#root-folders"
+        rootFolders: '#root-folders'
     },
 
     ui: {
-        addNewTab: ".x-add-new-tab",
+        addNewTab: '.x-add-new-tab',
-        importExistingTab: ".x-import-existing-tab",
+        importExistingTab: '.x-import-existing-tab',
-        rootFoldersTab: ".x-root-folders-tab",
+        rootFoldersTab: '.x-root-folders-tab'
     },
 
 
     events: {
-        "click .x-add-new-tab": 'showAddNew',
+        'click .x-add-new-tab': 'showAddNew',
-        "click .x-import-existing-tab": 'showImport',
+        'click .x-import-existing-tab': 'showImport',
-        "click .x-root-folders-tab": 'showRootFolders',
+        'click .x-root-folders-tab': 'showRootFolders'
     },
 
     showAddNew: function (e) {
-        if (e) e.preventDefault();
+        if (e) {
+            e.preventDefault();
+        }
 
         this.ui.addNewTab.tab('show');
         NzbDrone.Router.navigate('series/add/new');
@@ -36,14 +38,18 @@ NzbDrone.AddSeries.AddSeriesLayout = Backbone.Marionette.Layout.extend({
     },
 
     showImport: function (e) {
-        if (e) e.preventDefault();
+        if (e) {
+            e.preventDefault();
+        }
 
         this.ui.importExistingTab.tab('show');
         NzbDrone.Router.navigate('series/add/import');
     },
 
     showRootFolders: function (e) {
-        if (e) e.preventDefault();
+        if (e) {
+            e.preventDefault();
+        }
 
         this.ui.rootFoldersTab.tab('show');
         NzbDrone.Router.navigate('series/add/rootfolders');
@@ -90,7 +96,7 @@ NzbDrone.AddSeries.AddSeriesLayout = Backbone.Marionette.Layout.extend({
     },
 
     evaluateActions: function () {
-        if (this.rootFolderCollection.length == 0) {
+        if (this.rootFolderCollection.length === 0) {
             this.ui.addNewTab.hide();
             this.ui.importExistingTab.hide();
             this.showRootFolders();

NzbDrone.Web/_backboneApp/AddSeries/ImportExistingSeries/ImportSeriesTemplate.html

@@ -1,5 +1,15 @@
-{{#each unmappedFolders}}
+<div class="accordion result-list span12 offset4 ">
-<div>
+    <h2>{{path}}</h2>
+    {{#each unmappedFolders}}
+    <div class="accordion-group">
+        <div class="accordion-heading">
+            <a class="accordion-toggle" data-toggle="collapse" href="#{{../id}}_{{@index}}">{{this}}</a>
+        </div>
+        <div id="{{../id}}_{{@index}}" class="accordion-body collapse">
+            <div class="accordion-inner">
                 {{this}} 
             </div>
+        </div>
+    </div>
     {{/each}}
+</div>

NzbDrone.Web/_backboneApp/AddSeries/ImportExistingSeries/ImportSeriesView.js

@@ -1,28 +1,28 @@
-/// <reference path="../../app.js" />
+'use strict';
+/*global NzbDrone, Backbone*/
+
+/// <reference path="../../app.js" />
 /// <reference path="../../Series/SeriesModel.js" />
 /// <reference path="../SearchResultCollection.js" />
-
 NzbDrone.AddSeries.ExistingFolderItemView = Backbone.Marionette.ItemView.extend({
 
     template: "AddSeries/ImportExistingSeries/ImportSeriesTemplate",
 
     events: {
         //'click .x-add': 'add'
-    },
+    }
-
 });
 
 NzbDrone.AddSeries.ExistingFolderListView = Backbone.Marionette.CollectionView.extend({
 
     itemView: NzbDrone.AddSeries.ExistingFolderItemView,
 
-    initialize: function (options) {
+    initialize: function () {
 
         if (this.collection === undefined) {
             throw "root folder collection is required.";
         }
 
         this.listenTo(this.collection, 'reset', this.render, this);
-    },
+    }
-    
 });

NzbDrone.Web/_backboneApp/AddSeries/RootDir/RootDirView.js

@@ -1,10 +1,11 @@
-/// <reference path="../../app.js" />
+'use strict;'
+/// <reference path="../../app.js" />
 /// <reference path="RootDirModel.js" />
 /// <reference path="RootDirCollection.js" />
 
 NzbDrone.AddSeries.RootDirItemView = Backbone.Marionette.ItemView.extend({
 
-    template: "AddSeries/RootDir/RootDirItemTemplate",
+    template: 'AddSeries/RootDir/RootDirItemTemplate',
     tagName: 'tr',
 
     events: {
@@ -30,15 +31,15 @@ NzbDrone.AddSeries.RootDirListView = Backbone.Marionette.CollectionView.extend({
 });
 
 NzbDrone.AddSeries.RootDirView = Backbone.Marionette.Layout.extend({
-    template: "AddSeries/RootDir/RootDirTemplate",
+    template: 'AddSeries/RootDir/RootDirTemplate',
-    route: "series/add/rootdir",
+    route: 'series/add/rootdir',
 
     ui: {
         pathInput: '.x-path input'
     },
 
     regions: {
-        currentDirs: "#current-dirs",
+        currentDirs: '#current-dirs',
     },
 
     events: {
@@ -74,7 +75,7 @@ NzbDrone.AddSeries.RootDirView = Backbone.Marionette.Layout.extend({
 
         var term = context.ui.seriesSearch.val();
 
-        if (term == "") {
+        if (term === "") {
             context.collection.reset();
         } else {
             console.log(term);

NzbDrone.Web/_backboneApp/Quality/qualityProfileModel.js

@@ -13,7 +13,7 @@ NzbDrone.Quality.QualityProfileModel = Backbone.Model.extend({
         //};
         //Todo: Cutoff should be something that is allowed (double check)
         this.validators.cutoff = function (value) {
-            return value != null ? { isValid: true } : { isValid: false, message: 'You must have a valid cutoff' };
+            return value !== null ? { isValid: true } : { isValid: false, message: 'You must have a valid cutoff' };
         };
     },
 

NzbDrone.Web/_backboneApp/Shared/NotificationModel.js

@@ -19,13 +19,13 @@ NzbDrone.Shared.NotificationModel = Backbone.Model.extend({
                 return "icon";
             }
 
-            if (this.get('level') == 'info') {
+            if (this.get('level') === 'info') {
                 return "icon-info-sign";
             }
-            else if (this.get('level') == 'success') {
+            else if (this.get('level') === 'success') {
                 return 'icon-ok-sign';
             }
-            else if (this.get('level') == 'error') {
+            else if (this.get('level') === 'error') {
                 return 'icon-warning-sign';
             }
 

NzbDrone.Web/_backboneApp/Shared/NotificationView.js

@@ -46,12 +46,12 @@ window.onerror = function (msg, url, line) {
         var a = document.createElement('a');
         a.href = url;
 
-        model.set('title', a.pathname.split('/').pop() + " : " + line);
+        model.set('title', a.pathname.split('/').pop() + ' : ' + line);
         model.set('message', msg);
         model.set('level', 'error');
         NzbDrone.Shared.NotificationCollectionView.Instance.collection.add(model);
     } catch (error) {
-        alert("Couldn't report JS error. " + error);
+        alert('Couldn\'t report JS error. ' + error);
     }
 
     var suppressErrorAlert = false;
@@ -60,7 +60,9 @@ window.onerror = function (msg, url, line) {
 
 $(document).ajaxError(function (event, xmlHttpRequest, ajaxOptions) {
 
-    if (xmlHttpRequest.status >= 200 && xmlHttpRequest.status <= 300) return;
+    if (xmlHttpRequest.status >= 200 && xmlHttpRequest.status <= 300) {
+        return;
+    }
     var model = new NzbDrone.Shared.NotificationModel();
     model.set('title', ajaxOptions.type + " " + ajaxOptions.url + " : " + xmlHttpRequest.statusText);
     model.set('message', xmlHttpRequest.responseText);

NzbDrone.Web/_backboneApp/Shared/SpinnerView.js

@@ -2,7 +2,7 @@
 
 NzbDrone.Shared.SpinnerView = Backbone.Marionette.ItemView.extend({
 
-    template: "Shared/SpinnerTemplate",
+    template: 'Shared/SpinnerTemplate',
     className: 'nz-spinner row',
    
 });

NzbDrone.Web/_backboneApp/app.js

@@ -12,15 +12,15 @@
 /// <reference path="JsLibraries/backbone.modelbinder.js" />
 /// <reference path="JsLibraries/bootstrap.js" />
 
-if (typeof console == "undefined") {
+if (typeof console === undefined) {
     window.console = { log: function () { } };
 }
 
 NzbDrone = new Backbone.Marionette.Application();
-NzbDrone.Series = NzbDrone.module("Series");
+NzbDrone.Series = NzbDrone.module('Series');
-NzbDrone.AddSeries = NzbDrone.module("AddSeries");
+NzbDrone.AddSeries = NzbDrone.module('AddSeries');
-NzbDrone.Quality = NzbDrone.module("Quality");
+NzbDrone.Quality = NzbDrone.module('Quality');
-NzbDrone.Shared = NzbDrone.module("Shared");
+NzbDrone.Shared = NzbDrone.module('Shared');
 
 /*
 _.templateSettings = {
@@ -36,7 +36,7 @@ NzbDrone.Constants = {
 };
 
 NzbDrone.Events = {
-    DisplayInMainRegion: "DisplayInMainRegion"
+    DisplayInMainRegion: 'DisplayInMainRegion'
 };
 
 
@@ -58,9 +58,9 @@ NzbDrone.Router = Backbone.Marionette.AppRouter.extend({
     controller: new NzbDrone.Controller(),
     // "someMethod" must exist at controller.someMethod
     appRoutes: {
-        "series/add": "addSeries",
+        'series/add': 'addSeries',
-        "series/add/:action(/:query)": "addSeries",
+        'series/add/:action(/:query)': 'addSeries',
-        ":whatever": "notFound"
+        ':whatever': 'notFound'
 
     }
 
@@ -68,12 +68,12 @@ NzbDrone.Router = Backbone.Marionette.AppRouter.extend({
 
 NzbDrone.addInitializer(function (options) {
 
-    console.log("starting application");
+    console.log('starting application');
 
 
     NzbDrone.addRegions({
-        mainRegion: "#main-region",
+        mainRegion: '#main-region',
-        notificationRegion: "#notification-region"
+        notificationRegion: '#notification-region'
     });
 
     NzbDrone.Router = new NzbDrone.Router();