Added support for custom UI folder

gulp/build.js

@@ -7,6 +7,12 @@ require('./handlebars');
 require('./copy');
 
 gulp.task('build', function() {
-    return  runSequence('clean',
-        ['webpack', 'less', 'handlebars', 'copyHtml', 'copyContent', 'copyJs']);
+    return runSequence('clean', [
+            'webpack',
+            'less',
+            'handlebars',
+            'copyHtml',
+            'copyContent',
+            'copyJs'
+        ]);
 });

gulp/errorHandler.js

@@ -4,4 +4,4 @@ module.exports = {
         console.log(error.toString());
         this.emit('end');
     }
-} 
+};

gulp/handlebars.js

@@ -12,7 +12,10 @@ var paths = require('./paths.js');
 
 gulp.task('handlebars', function() {
 
-    var coreStream = gulp.src([paths.src.templates, '!*/**/*Partial.*'])
+    var coreStream = gulp.src([
+        paths.src.templates,
+        '!*/**/*Partial.*'
+    ])
         .pipe(stripbom({ showLog : false }))
         .pipe(handlebars())
         .pipe(declare({
@@ -43,7 +46,6 @@ gulp.task('handlebars', function () {
             }
         }));
 
-
     return streamqueue({ objectMode : true },
         partialStream,
         coreStream

gulp/imageMin.js

@@ -2,7 +2,6 @@ var gulp = require('gulp');
 var print = require('gulp-print');
 var paths = require('./paths.js');
 
-
 gulp.task('imageMin', function() {
     var imagemin = require('gulp-imagemin');
     return gulp.src(paths.src.images)

gulp/jshint.js

@@ -4,9 +4,11 @@ var stylish = require('jshint-stylish');
 var cache = require('gulp-cached');
 var paths = require('./paths.js');
 
-
 gulp.task('jshint', function() {
-    return gulp.src([paths.src.scripts, paths.src.exclude.libs])
+    return gulp.src([
+        paths.src.scripts,
+        paths.src.exclude.libs
+    ])
         .pipe(cache('jshint'))
         .pipe(jshint())
         .pipe(jshint.reporter(stylish));

gulp/less.js

@@ -1,13 +1,15 @@
 var gulp = require('gulp');
 var less = require('gulp-less');
 var print = require('gulp-print');
+var phantom = require('./phantom');
 var livereload = require('gulp-livereload');
 
 var paths = require('./paths');
 var errorHandler = require('./errorHandler');
 
 gulp.task('less', function() {
-    return  gulp.src([
+
+    var src = [
         paths.src.content + 'bootstrap.less',
         paths.src.content + 'theme.less',
         paths.src.content + 'overrides.less',
@@ -21,7 +23,28 @@ gulp.task('less', function () {
         paths.src.root + 'System/Logs/logs.less',
         paths.src.root + 'System/Update/update.less',
         paths.src.root + 'System/Info/info.less',
-    ])
+    ];
+
+    if (phantom) {
+        src = [
+            paths.src.content + 'bootstrap.less',
+            paths.src.content + 'angle.less',
+            paths.src.content + 'sonarr.less',
+            paths.src.content + 'overrides.less',
+            paths.src.root + 'Series/series.less',
+            paths.src.root + 'Activity/activity.less',
+            paths.src.root + 'AddSeries/addSeries.less',
+            paths.src.root + 'Calendar/calendar.less',
+            paths.src.root + 'Cells/cells.less',
+            paths.src.root + 'ManualImport/manualimport.less',
+            paths.src.root + 'Settings/settings.less',
+            paths.src.root + 'System/Logs/logs.less',
+            paths.src.root + 'System/Update/update.less',
+            paths.src.root + 'System/Info/info.less',
+        ]
+    }
+
+    return gulp.src(src)
         .pipe(print())
         .pipe(less({
             dumpLineNumbers : 'false',

gulp/phantom.js

@@ -9,4 +9,6 @@ process.argv.forEach(function (val, index, array) {
   }
 });
 
+console.log('Phantom:', phantom);
+
 module.exports = phantom;

gulp/start.js

@@ -84,7 +84,7 @@ gulp.task('getSonarr', function () {
     download(package.url, packagePath, function () {
       extract(packagePath, dirName, function () {
         // clean old binaries
-        console.log('Cleaning old binaries')
+        console.log('Cleaning old binaries');
         del.sync(['./_output/*', '!./_output/UI/']);
         console.log('copying binaries to target');
         gulp.src(dirName + '/NzbDrone/*.*')

src/NzbDrone.Api/Frontend/Mappers/FaviconMapper.cs

@@ -3,17 +3,20 @@ using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Api.Frontend.Mappers
 {
     public class FaviconMapper : StaticResourceMapperBase
     {
         private readonly IAppFolderInfo _appFolderInfo;
+        private readonly IConfigFileProvider _configFileProvider;
 
-        public FaviconMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, Logger logger)
+        public FaviconMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider,IConfigFileProvider configFileProvider, Logger logger)
             : base(diskProvider, logger)
         {
             _appFolderInfo = appFolderInfo;
+            _configFileProvider = configFileProvider;
         }
 
         public override string Map(string resourceUrl)
@@ -27,7 +30,7 @@ namespace NzbDrone.Api.Frontend.Mappers
 
             var path = Path.Combine("Content", "Images", fileName);
 
-            return Path.Combine(_appFolderInfo.StartUpFolder, "UI", path);
+            return Path.Combine(_appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, path);
         }
 
         public override bool CanHandle(string resourceUrl)

src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs

@@ -36,7 +36,7 @@ namespace NzbDrone.Api.Frontend.Mappers
             _configFileProvider = configFileProvider;
             _analyticsService = analyticsService;
             _cacheBreakProviderFactory = cacheBreakProviderFactory;
-            _indexPath = Path.Combine(appFolderInfo.StartUpFolder, "UI", "index.html");
+            _indexPath = Path.Combine(appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, "index.html");
 
             API_KEY = configFileProvider.ApiKey;
             URL_BASE = configFileProvider.UrlBase;

src/NzbDrone.Api/Frontend/Mappers/LoginHtmlMapper.cs

@@ -12,6 +12,7 @@ namespace NzbDrone.Api.Frontend.Mappers
     public class LoginHtmlMapper : StaticResourceMapperBase
     {
         private readonly IDiskProvider _diskProvider;
+        private readonly IConfigFileProvider _configFileProvider;
         private readonly Func<ICacheBreakerProvider> _cacheBreakProviderFactory;
         private readonly string _indexPath;
         private static readonly Regex ReplaceRegex = new Regex("(?<=(?:href|src|data-main)=\").*?(?=\")", RegexOptions.Compiled | RegexOptions.IgnoreCase);
@@ -27,8 +28,9 @@ namespace NzbDrone.Api.Frontend.Mappers
             : base(diskProvider, logger)
         {
             _diskProvider = diskProvider;
+            _configFileProvider = configFileProvider;
             _cacheBreakProviderFactory = cacheBreakProviderFactory;
-            _indexPath = Path.Combine(appFolderInfo.StartUpFolder, "UI", "login.html");
+            _indexPath = Path.Combine(appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, "login.html");
 
             URL_BASE = configFileProvider.UrlBase;
         }

src/NzbDrone.Api/Frontend/Mappers/RobotsTxtMapper.cs

@@ -3,24 +3,27 @@ using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Api.Frontend.Mappers
 {
     public class RobotsTxtMapper : StaticResourceMapperBase
     {
         private readonly IAppFolderInfo _appFolderInfo;
+        private readonly IConfigFileProvider _configFileProvider;
 
-        public RobotsTxtMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, Logger logger)
+        public RobotsTxtMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IConfigFileProvider configFileProvider, Logger logger)
             : base(diskProvider, logger)
         {
             _appFolderInfo = appFolderInfo;
+            _configFileProvider = configFileProvider;
         }
 
         public override string Map(string resourceUrl)
         {
             var path = Path.Combine("Content", "robots.txt");
 
-            return Path.Combine(_appFolderInfo.StartUpFolder, "UI", path);
+            return Path.Combine(_appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, path);
         }
 
         public override bool CanHandle(string resourceUrl)

src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapper.cs

@@ -2,17 +2,20 @@ using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Api.Frontend.Mappers
 {
     public class StaticResourceMapper : StaticResourceMapperBase
     {
         private readonly IAppFolderInfo _appFolderInfo;
+        private readonly IConfigFileProvider _configFileProvider;
 
-        public StaticResourceMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, Logger logger)
+        public StaticResourceMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IConfigFileProvider configFileProvider, Logger logger)
             : base(diskProvider, logger)
         {
             _appFolderInfo = appFolderInfo;
+            _configFileProvider = configFileProvider;
         }
 
         public override string Map(string resourceUrl)
@@ -20,7 +23,7 @@ namespace NzbDrone.Api.Frontend.Mappers
             var path = resourceUrl.Replace('/', Path.DirectorySeparatorChar);
             path = path.Trim(Path.DirectorySeparatorChar);
 
-            return Path.Combine(_appFolderInfo.StartUpFolder, "UI", path);
+            return Path.Combine(_appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, path);
         }
 
         public override bool CanHandle(string resourceUrl)

src/NzbDrone.Core/Configuration/ConfigFileProvider.cs

@@ -37,6 +37,7 @@ namespace NzbDrone.Core.Configuration
         string ApiKey { get; }
         string SslCertHash { get; }
         string UrlBase { get; }
+        string UiFolder { get; }
         Boolean UpdateAutomatically { get; }
         UpdateMechanism UpdateMechanism { get; }
         String UpdateScriptPath { get; }
@@ -215,6 +216,14 @@ namespace NzbDrone.Core.Configuration
             }
         }
 
+        public string UiFolder
+        {
+            get
+            {
+                return GetValue("UiFolder", "UI", false);
+            }
+        }
+
         public bool UpdateAutomatically
         {
             get { return GetValueBoolean("UpdateAutomatically", false, false); }

webpack.config.js

@@ -1,16 +1,23 @@
 var path = require('path');
 var stylish = require('jshint-stylish');
 var webpack = require('webpack');
+var phantom = require('./gulp/phantom');
 
 var uglifyJsPlugin = new webpack.optimize.UglifyJsPlugin();
 
+var uiFolder = 'UI';
+
+if (phantom) {
+  uiFolder = 'UI.Phantom';
+}
+
 module.exports = {
   entry: {
     vendor: 'vendor.js',
     main: 'main.js'
   },
   resolve: {
-  root : path.join(__dirname, 'src', 'UI'),
+    root: path.join(__dirname, 'src', uiFolder),
     alias: {
       'vent': 'vent',
       'backbone': 'Shims/backbone',
@@ -46,8 +53,8 @@ module.exports = {
     }
   },
   output: {
-    filename : '_output/UI/[name].js',
-    sourceMapFilename : '_output/UI/[name].map'
+    filename: '_output/' + uiFolder + '/[name].js',
+    sourceMapFilename: '_output/' + uiFolder + '/[name].map'
   },
   plugins: [
     new webpack.optimize.CommonsChunkPlugin({ name: 'vendor' })