Merge pull request #1058 from tidusjar/dev

Dev

Ombi.UI/Content/base.css

@@ -525,3 +525,22 @@ label {
   display: block !important;
   margin: 0 auto !important; }
 
+.pace {
+  -webkit-pointer-events: none;
+  pointer-events: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none; }
+
+.pace-inactive {
+  display: none; }
+
+.pace .pace-progress {
+  background: #df691a;
+  position: fixed;
+  z-index: 2000;
+  top: 0;
+  right: 100%;
+  width: 100%;
+  height: 5px; }
+

Ombi.UI/Content/base.scss

@@ -650,4 +650,27 @@ $border-radius: 10px;
     width: 300px;
     display: block $i;
     margin: 0 auto $i;
+}
+
+.pace {
+  -webkit-pointer-events: none;
+  pointer-events: none;
+
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}
+
+.pace-inactive {
+  display: none;
+}
+
+.pace .pace-progress {
+  background: $primary-colour;
+  position: fixed;
+  z-index: 2000;
+  top: 0;
+  right: 100%;
+  width: 100%;
+  height: 5px;
 }

Ombi.UI/Jobs/Scheduler.cs

@@ -304,8 +304,8 @@ namespace Ombi.UI.Jobs
             var embyEpisode =
                 TriggerBuilder.Create()
                 .WithIdentity("EmbyEpisodeCacher", "Emby")
-                //.StartAt(DateBuilder.FutureDate(10, IntervalUnit.Minute))
-                .StartAt(DateBuilder.FutureDate(10, IntervalUnit.Minute))
+				.StartNow()
+				//.StartAt(DateBuilder.FutureDate(10, IntervalUnit.Minute))
                 .WithSimpleSchedule(x => x.WithIntervalInHours(s.EmbyEpisodeCacher).RepeatForever())
                 .Build();
 

Ombi.UI/Modules/Admin/AdminModule.cs

@@ -92,6 +92,7 @@ namespace Ombi.UI.Modules.Admin
         private IJobRecord JobRecorder { get; }
         private IAnalytics Analytics { get; }
         private IRecentlyAdded RecentlyAdded { get; }
+        private IMassEmail MassEmail { get; }
         private ISettingsService<NotificationSettingsV2> NotifySettings { get; }
         private ISettingsService<DiscordNotificationSettings> DiscordSettings { get; }
         private IDiscordApi DiscordApi { get; }
@@ -123,7 +124,7 @@ namespace Ombi.UI.Modules.Admin
             ICacheProvider cache, ISettingsService<SlackNotificationSettings> slackSettings,
             ISlackApi slackApi, ISettingsService<LandingPageSettings> lp,
             ISettingsService<ScheduledJobsSettings> scheduler, IJobRecord rec, IAnalytics analytics,
-             ISettingsService<NotificationSettingsV2> notifyService, IRecentlyAdded recentlyAdded,
+             ISettingsService<NotificationSettingsV2> notifyService, IRecentlyAdded recentlyAdded, IMassEmail massEmail,
              ISettingsService<WatcherSettings> watcherSettings ,
              ISettingsService<DiscordNotificationSettings> discord,
              IDiscordApi discordapi, ISettingsService<RadarrSettings> settings, IRadarrApi radarrApi,
@@ -158,6 +159,7 @@ namespace Ombi.UI.Modules.Admin
             Analytics = analytics;
             NotifySettings = notifyService;
             RecentlyAdded = recentlyAdded;
+            MassEmail = massEmail;
             WatcherSettings = watcherSettings;
             DiscordSettings = discord;
             DiscordApi = discordapi;
@@ -222,6 +224,9 @@ namespace Ombi.UI.Modules.Admin
 
             Get["/newsletter", true] = async (x, ct) => await Newsletter();
             Post["/newsletter", true] = async (x, ct) => await SaveNewsletter();
+            Post["/testnewsletteradminemail"] = x => TestNewsletterAdminEmail(); 
+            Post["/testmassadminemail"] = x => TestMassAdminEmail();
+            Post["/sendmassemail"] = x => SendMassEmail();
 
             Post["/createapikey"] = x => CreateApiKey();
 
@@ -246,7 +251,6 @@ namespace Ombi.UI.Modules.Admin
             Get["/notificationsettings", true] = async (x, ct) => await NotificationSettings();
             Post["/notificationsettings"] = x => SaveNotificationSettings();
 
-            Post["/recentlyAddedTest"] = x => RecentlyAddedTest();
         }
 
         private async Task<Negotiator> Authentication()
@@ -441,11 +445,15 @@ namespace Ombi.UI.Modules.Admin
         private async Task<Response> SavePlex()
         {
             var plexSettings = this.Bind<PlexSettings>();
-            var valid = this.Validate(plexSettings);
-            if (!valid.IsValid)
-            {
-                return Response.AsJson(valid.SendJsonError());
-            }
+
+			if (plexSettings.Enable)
+			{
+				var valid = this.Validate(plexSettings);
+				if (!valid.IsValid)
+				{
+					return Response.AsJson(valid.SendJsonError());
+				}
+			}
 
            
             if (plexSettings.Enable)
@@ -462,7 +470,7 @@ namespace Ombi.UI.Modules.Admin
                 }
             }
 
-            if (string.IsNullOrEmpty(plexSettings.MachineIdentifier))
+            if (string.IsNullOrEmpty(plexSettings.MachineIdentifier) && plexSettings.Enable)
             {
                 //Lookup identifier
                 var server = PlexApi.GetServer(plexSettings.PlexAuthToken);
@@ -1166,7 +1174,13 @@ namespace Ombi.UI.Modules.Admin
                 FaultQueueHandler = s.FaultQueueHandler,
                 PlexEpisodeCacher = s.PlexEpisodeCacher,
                 PlexUserChecker = s.PlexUserChecker,
-                UserRequestLimitResetter = s.UserRequestLimitResetter
+                UserRequestLimitResetter = s.UserRequestLimitResetter,
+				EmbyAvailabilityChecker = s.EmbyAvailabilityChecker,
+				EmbyContentCacher = s.EmbyContentCacher,
+				EmbyEpisodeCacher = s.EmbyEpisodeCacher,
+				EmbyUserChecker = s.EmbyUserChecker,
+				RadarrCacher = s.RadarrCacher,
+				WatcherCacher = s.WatcherCacher
             };
             return View["SchedulerSettings", model];
         }
@@ -1229,13 +1243,13 @@ namespace Ombi.UI.Modules.Admin
             var model = this.Bind<NotificationSettingsV2>();
             return View["NotificationSettings", model];
         }
-
-        private Response RecentlyAddedTest()
+       
+        private Response TestNewsletterAdminEmail()
         {
             try
             {
-                Log.Debug("Clicked TEST");
-                RecentlyAdded.Test();
+                Log.Debug("Clicked Admin Newsletter Email Test");
+                RecentlyAdded.RecentlyAddedAdminTest();
                 return Response.AsJson(new JsonResponseModel { Result = true, Message = "Sent email to administrator" });
             }
             catch (Exception e)
@@ -1244,5 +1258,50 @@ namespace Ombi.UI.Modules.Admin
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = e.Message });
             }
         }
+        private Response TestMassAdminEmail()
+        {
+            try
+            {
+                var settings = this.Bind<MassEmailSettings>();
+                Log.Debug("Clicked Admin Mass Email Test");
+                if (settings.Subject == null) {
+                    return Response.AsJson(new JsonResponseModel { Result = false, Message = "Please Set a Subject" });
+                }
+                if (settings.Body == null)
+                {
+                    return Response.AsJson(new JsonResponseModel { Result = false, Message = "Please Set a Body" });
+                }
+                MassEmail.MassEmailAdminTest(settings.Body.Replace("\n", "<br/>"), settings.Subject);
+                return Response.AsJson(new JsonResponseModel { Result = true, Message = "Sent email to administrator" });
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = e.Message });
+            }
+        }
+        private Response SendMassEmail()
+        {
+            try
+            {
+                var settings = this.Bind<MassEmailSettings>();
+                Log.Debug("Clicked Admin Mass Email Test");
+                if (settings.Subject == null)
+                {
+                    return Response.AsJson(new JsonResponseModel { Result = false, Message = "Please Set a Subject" });
+                }
+                if (settings.Body == null)
+                {
+                    return Response.AsJson(new JsonResponseModel { Result = false, Message = "Please Set a Body" });
+                }
+                MassEmail.SendMassEmail(settings.Body.Replace("\n", "<br/>"), settings.Subject);
+                return Response.AsJson(new JsonResponseModel { Result = true, Message = "Sent email to All users" });
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = e.Message });
+            }
+        }
     }
 }

Ombi.UI/Modules/Admin/IntegrationModule.cs

@@ -156,7 +156,7 @@ namespace Ombi.UI.Modules.Admin
             var cp = await CpSettings.GetSettingsAsync();
             if (cp.Enabled)
             {
-                return Response.AsJson(new JsonResponseModel { Result = false, Message = "CouchPotato is enabled, we cannot enable Watcher and CouchPotato" });
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "CouchPotato is enabled, we cannot enable Radarr and CouchPotato" });
             }
 
             var valid = this.Validate(radarrSettings);

Ombi.UI/NinjectModules/ServicesModule.cs

@@ -49,6 +49,7 @@ namespace Ombi.UI.NinjectModules
             Bind<ISonarrCacher>().To<SonarrCacher>();
             Bind<ISickRageCacher>().To<SickRageCacher>();
             Bind<IRecentlyAdded>().To<RecentlyAdded>();
+            Bind<IMassEmail>().To<RecentlyAdded>();
             Bind<IRadarrCacher>().To<RadarrCacher>();
             Bind<IPlexContentCacher>().To<PlexContentCacher>();
             Bind<IJobFactory>().To<CustomJobFactory>();

Ombi.UI/Views/Admin/Emby.cshtml

@@ -47,6 +47,8 @@
                 </div>
             </div>
 
+			@Html.Checkbox(Model.EnableEpisodeSearching, "EnableEpisodeSearching", "Enable Episode Searching")
+
             <div class="form-group">
                 <label for="SubDir" class="control-label">Emby Base Url</label>
                 <div>

Ombi.UI/Views/Admin/NewsletterSettings.cshtml

@@ -7,46 +7,48 @@
     <form class="form-horizontal" method="POST" id="mainForm">
         <fieldset>
             <legend>Newsletter Settings</legend>
+            <div style="padding:10px">
 
-            <!-- Email Nofication Section -->
-            <div class="form-group">
-                <div class="checkbox">
+                <!-- Email Nofication Section -->
+                <div class="form-group">
+                    <div class="checkbox">
 
-                    <small>Note: This will require you to setup your email notifications</small>
-                    <br />
-                    @if (Model.SendRecentlyAddedEmail)
-                    {
-                        <input type="checkbox" id="SendRecentlyAddedEmail" name="SendRecentlyAddedEmail" checked="checked"><label for="SendRecentlyAddedEmail">Enable newsletter</label>
-                    }
-                    else
-                    {
-                        <input type="checkbox" id="SendRecentlyAddedEmail" name="SendRecentlyAddedEmail"><label for="SendRecentlyAddedEmail">Enable newsletter</label>
-                    }
+                        <small>Note: This will require you to setup your email notifications</small>
+                        <br />
+                        @if (Model.SendRecentlyAddedEmail)
+                        {
+                            <input type="checkbox" id="SendRecentlyAddedEmail" name="SendRecentlyAddedEmail" checked="checked"><label for="SendRecentlyAddedEmail">Enable newsletter</label>
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="SendRecentlyAddedEmail" name="SendRecentlyAddedEmail"><label for="SendRecentlyAddedEmail">Enable newsletter</label>
+                        }
 
 
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
+                <div class="form-group">
 
-              <br>
-                <label for="CustomUsers" class="control-label">Email Addresses to Send to (For users that are not in your User Management section)</label>
-              <small>You can add multiple email addresses by using the ; delimiter</small>
-<div>
-                    <input type="text" class="form-control form-control-custom " placeholder="first@address.com;second@address.com" id="CustomUsers" name="CustomUsers" value="@Model.CustomUsers">
+                    <br>
+                    <label for="CustomUsers" class="control-label">Email Addresses to Send to (For users that are not in your User Management section)</label>
+                    <small>You can add multiple email addresses by using the ; delimiter</small>
+                    <div>
+                        <input type="text" class="form-control form-control-custom " placeholder="first@address.com;second@address.com" id="CustomUsers" name="CustomUsers" value="@Model.CustomUsers">
+                    </div>
                 </div>
-            </div>
 
-            <div class="form-group">
-                <div>
-                    <button id="recentlyAddedBtn" class="btn btn-primary-outline">Send test email to Admin <div id="spinner"></div></button>
+                <div class="form-group">
+                    <div>
+                        <button id="recentlyAddedBtn" class="btn btn-primary-outline">Send test email to Admin <div id="testEmailSpinner"></div></button>
+                    </div>
                 </div>
-            </div>
 
-            <br />
-            <br />
-            <div class="form-group">
-                <div>
-                    <button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
+                <br />
+                <br />
+                <div class="form-group">
+                    <div>
+                        <button type="submit" id="save" class="btn btn-primary-outline">Save</button>
+                    </div>
                 </div>
             </div>
             <!-- Email Nofication Section -->
@@ -54,6 +56,39 @@
         </fieldset>
 
     </form>
+    <form id="massemail" class="form-horizontal">
+        <fieldset>
+            <legend>Mass Email</legend>
+            <div style="padding:10px">
+                <div class="form-group">
+                    <small>Note: This will require you to setup your email notifications</small>
+                </div>
+                <div class="form-group">
+                    <label for="massEmailSubject" class="control-label">Subject</label>
+                    <div>
+                        <input type="text" class="form-control form-control-custom " placeholder="A Message from Plex Admin" id="massEmailSubject" name="massEmailSubject" value="">
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="massEmailBody" class="control-label">Body</label>
+
+                    <textarea id="massEmailBody" class="form-control" rows="5"></textarea>
+                    <small>Supports HTML</small>
+
+                </div>
+                <div class="form-group">
+                    <div>
+                        <button id="testSendMassEmailBtn" class="btn btn-primary-outline">Send Test to Admin<div id="testSendMassEmailSpinner"></div></button>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <div>
+                        <button id="sendMassEmailBtn" class="btn btn-primary-outline">Send To All Users<div id="sendMassEmailSpinner"></div></button>
+                    </div>
+                </div>
+            </div>
+        </fieldset>
+    </form>
 </div>
 
 
@@ -90,8 +125,8 @@
         $('#recentlyAddedBtn').click(function (e) {
             e.preventDefault();
             var base = '@Html.GetBaseUrl()';
-            var url = createBaseUrl(base, '/admin/recentlyAddedTest');
-            $('#spinner').attr("class", "fa fa-spinner fa-spin");
+            var url = createBaseUrl(base, '/admin/testnewsletteradminemail');
+            $('#testEmailSpinner').attr("class", "fa fa-spinner fa-spin");
             $.ajax({
                 type: "post",
                 url: url,
@@ -99,17 +134,74 @@
                 success: function (response) {
                     if (response) {
                         generateNotify(response.message, "success");
-                        $('#spinner').attr("class", "fa fa-check");
+                        $('#testSendMassEmailSpinner').attr("class", "fa fa-check");
                     } else {
 
                         generateNotify(response.message, "danger");
-                        $('#spinner').attr("class", "fa fa-times");
+                        $('#testSendMassEmailSpinner').attr("class", "fa fa-times");
                     }
                 },
                 error: function (e) {
                     console.log(e);
                     generateNotify("Something went wrong!", "danger");
-                    $('#spinner').attr("class", "fa fa-times");
+                    $('#testSendMassEmailSpinner').attr("class", "fa fa-times");
+                }
+            });
+        });
+
+        $('#testSendMassEmailBtn').click(function (e) {
+            e.preventDefault();
+            var base = '@Html.GetBaseUrl()';
+            var url = createBaseUrl(base, '/admin/testmassadminemail');
+            $('#testSendMassEmailSpinner').attr("class", "fa fa-spinner fa-spin");
+            var data = { "Users": "", "Body": $("#massEmailBody").val(), "Subject": $("#massEmailSubject").val() };
+            $.ajax({
+                type: "post",
+                url: url,
+                data: data,
+                dataType: "json",
+                success: function (response) {
+                    if (response.result) {
+                        generateNotify(response.message, "success");
+                        $('#testSendMassEmailSpinner').attr("class", "fa fa-check");
+                    } else {
+
+                        generateNotify(response.message, "danger");
+                        $('#testSendMassEmailSpinner').attr("class", "fa fa-times");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                    $('#testSendMassEmailSpinner').attr("class", "fa fa-times");
+                }
+            });
+        });
+        $('#sendMassEmailBtn').click(function (e) {
+            e.preventDefault();
+            var base = '@Html.GetBaseUrl()';
+            var url = createBaseUrl(base, '/admin/sendmassemail');
+            $('#sendMassEmailSpinner').attr("class", "fa fa-spinner fa-spin");
+            var data = { "Users": "", "Body": $("#massEmailBody").val(), "Subject": $("#massEmailSubject").val() };
+            $.ajax({
+                type: "post",
+                url: url,
+                data: data,
+                dataType: "json",
+                success: function (response) {
+                    if (response.result) {
+                        generateNotify(response.message, "success");
+                        $('#sendMassEmailSpinner').attr("class", "fa fa-check");
+                    } else {
+
+                        generateNotify(response.message, "danger");
+                        $('#sendMassEmailSpinner').attr("class", "fa fa-times");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                    $('#sendMassEmailSpinner').attr("class", "fa fa-times");
                 }
             });
         });

Ombi.UI/Views/Integration/Radarr.cshtml

@@ -64,10 +64,10 @@
             </div>
 
             <div class="form-group">
-                <label for="RootPath" class="control-label">Root save directory for TV shows</label>
+                <label for="RootPath" class="control-label">Root save directory for Movies</label>
                 <div>
-                    <input type="text" class="form-control form-control-custom " placeholder="C:\Media\Tv" id="RootPath" name="RootPath" value="@Model.RootPath">
-                    <label>Enter the root folder where movies are saved. For example <strong>C:\Media\TV</strong>.</label>
+                    <input type="text" class="form-control form-control-custom " placeholder="C:\Media\Movies" id="RootPath" name="RootPath" value="@Model.RootPath">
+                    <label>Enter the root folder where movies are saved. For example <strong>C:\Media\Movies</strong>.</label>
                 </div>
             </div>
 
@@ -241,4 +241,4 @@
 
 
     })
-</script>
+</script>

Ombi.UI/Views/SystemStatus/Status.cshtml

@@ -50,9 +50,9 @@
             {
                 <label class="control-label"><a href="@Model.Status.UpdateUri" target="_blank"><i class="fa fa-check"></i></a></label>
                 <br />
-                <input id="args" class="form-control form-control-custom " placeholder="optional launch arguments e.g. /etc/mono /opt/PlexRequests.exe">
+                @*<input id="args" class="form-control form-control-custom " placeholder="optional launch arguments e.g. /etc/mono /opt/PlexRequests.exe">*@
                 <br/>
-                <button id="autoUpdate" class="btn btn-success-outline">Automatic Update (beta) <i class="fa fa-download"></i></button>
+                @*<button id="autoUpdate" class="btn btn-success-outline">Automatic Update (beta) <i class="fa fa-download"></i></button>*@
             }
             else
             {