diff --git a/src/Ombi.Core.Tests/Rule/Request/CanRequestRuleTests.cs b/src/Ombi.Core.Tests/Rule/Request/CanRequestRuleTests.cs
index 3610ccc6c..c4e9a976e 100644
--- a/src/Ombi.Core.Tests/Rule/Request/CanRequestRuleTests.cs
+++ b/src/Ombi.Core.Tests/Rule/Request/CanRequestRuleTests.cs
@@ -27,7 +27,7 @@ namespace Ombi.Core.Tests.Rule
var request = new BaseRequest() { RequestType = Store.Entities.RequestType.Movie };
var result = await Rule.Execute(request);
- Assert.Equal(result.Success, true);
+ Assert.True(result.Success);
}
[Fact]
@@ -37,8 +37,8 @@ namespace Ombi.Core.Tests.Rule
var request = new BaseRequest() { RequestType = Store.Entities.RequestType.Movie };
var result = await Rule.Execute(request);
- Assert.Equal(result.Success, false);
- Assert.Equal(string.IsNullOrEmpty(result.Message), false);
+ Assert.False(result.Success);
+ Assert.False(string.IsNullOrEmpty(result.Message));
}
[Fact]
@@ -48,7 +48,7 @@ namespace Ombi.Core.Tests.Rule
var request = new BaseRequest() { RequestType = Store.Entities.RequestType.Movie };
var result = await Rule.Execute(request);
- Assert.Equal(result.Success, true);
+ Assert.True(result.Success);
}
[Fact]
@@ -58,7 +58,7 @@ namespace Ombi.Core.Tests.Rule
var request = new BaseRequest() { RequestType = Store.Entities.RequestType.TvShow };
var result = await Rule.Execute(request);
- Assert.Equal(result.Success, true);
+ Assert.True(result.Success);
}
[Fact]
@@ -68,7 +68,7 @@ namespace Ombi.Core.Tests.Rule
var request = new BaseRequest() { RequestType = Store.Entities.RequestType.TvShow };
var result = await Rule.Execute(request);
- Assert.Equal(result.Success, true);
+ Assert.True(result.Success);
}
[Fact]
@@ -78,8 +78,8 @@ namespace Ombi.Core.Tests.Rule
var request = new BaseRequest() { RequestType = Store.Entities.RequestType.TvShow };
var result = await Rule.Execute(request);
- Assert.Equal(result.Success, false);
- Assert.Equal(string.IsNullOrEmpty(result.Message), false);
+ Assert.False(result.Success);
+ Assert.False(string.IsNullOrEmpty(result.Message));
}
}
}
diff --git a/src/Ombi.Core.Tests/Rule/Search/PlexAvailabilityRuleTests.cs b/src/Ombi.Core.Tests/Rule/Search/PlexAvailabilityRuleTests.cs
index fd49ee83d..cac0dce6b 100644
--- a/src/Ombi.Core.Tests/Rule/Search/PlexAvailabilityRuleTests.cs
+++ b/src/Ombi.Core.Tests/Rule/Search/PlexAvailabilityRuleTests.cs
@@ -31,8 +31,8 @@ namespace Ombi.Core.Tests.Rule.Search
var result = await Rule.Execute(search);
Assert.True(result.Success);
- Assert.Equal(search.PlexUrl, "TestUrl");
- Assert.Equal(search.Available, true);
+ Assert.Equal("TestUrl", search.PlexUrl);
+ Assert.True(search.Available);
}
[Fact]
@@ -43,8 +43,8 @@ namespace Ombi.Core.Tests.Rule.Search
var result = await Rule.Execute(search);
Assert.True(result.Success);
- Assert.Equal(search.PlexUrl, null);
- Assert.Equal(search.Available, false);
+ Assert.Null(search.PlexUrl);
+ Assert.False(search.Available);
}
}
}
\ No newline at end of file
diff --git a/src/Ombi.Core.Tests/Rule/Search/RadarrCacheRuleTests.cs b/src/Ombi.Core.Tests/Rule/Search/RadarrCacheRuleTests.cs
index cfa77a3a4..af4320a28 100644
--- a/src/Ombi.Core.Tests/Rule/Search/RadarrCacheRuleTests.cs
+++ b/src/Ombi.Core.Tests/Rule/Search/RadarrCacheRuleTests.cs
@@ -32,8 +32,8 @@ namespace Ombi.Core.Tests.Rule.Search
var request = new SearchMovieViewModel { Id = 123 };
var result =await Rule.Execute(request);
- Assert.Equal(result.Success, true);
- Assert.Equal(request.Approved, true);
+ Assert.True(result.Success);
+ Assert.True(request.Approved);
}
@@ -50,8 +50,8 @@ namespace Ombi.Core.Tests.Rule.Search
var request = new SearchMovieViewModel { Id = 123 };
var result = await Rule.Execute(request);
- Assert.Equal(result.Success, true);
- Assert.Equal(request.Approved, false);
+ Assert.True(result.Success);
+ Assert.False(request.Approved);
}
}
}
diff --git a/src/Ombi.Core/Ombi.Core.csproj b/src/Ombi.Core/Ombi.Core.csproj
index a9befe3f8..1cbe7c803 100644
--- a/src/Ombi.Core/Ombi.Core.csproj
+++ b/src/Ombi.Core/Ombi.Core.csproj
@@ -11,7 +11,7 @@
-
+
@@ -33,13 +33,4 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Ombi.Helpers/AssemblyHelper.cs b/src/Ombi.Helpers/AssemblyHelper.cs
index 4e8fb8e66..51b66d8c9 100644
--- a/src/Ombi.Helpers/AssemblyHelper.cs
+++ b/src/Ombi.Helpers/AssemblyHelper.cs
@@ -6,9 +6,7 @@ namespace Ombi.Helpers
public static class AssemblyHelper
{
public static string GetRuntimeVersion() =>
- Assembly.GetEntryAssembly().GetType()
- .GetTypeInfo()
- .Assembly
+ Assembly.GetEntryAssembly()
.GetCustomAttribute()
.InformationalVersion;
}
diff --git a/src/Ombi.Notifications/Ombi.Notifications.csproj b/src/Ombi.Notifications/Ombi.Notifications.csproj
index 41803ce8d..9bdcaf566 100644
--- a/src/Ombi.Notifications/Ombi.Notifications.csproj
+++ b/src/Ombi.Notifications/Ombi.Notifications.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs b/src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs
index 6cb2863a4..1b5e532e9 100644
--- a/src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs
+++ b/src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
using Castle.Components.DictionaryAdapter;
using Moq;
using NUnit.Framework;
+using Ombi.Core.Notifications;
using Ombi.Schedule.Jobs.Plex;
using Ombi.Store.Entities;
using Ombi.Store.Entities.Requests;
@@ -20,12 +21,15 @@ namespace Ombi.Schedule.Tests
_repo = new Mock();
_tv = new Mock();
_movie = new Mock();
- Checker = new PlexAvailabilityChecker(_repo.Object, _tv.Object, _movie.Object);
+ _movie = new Mock();
+ _notify = new Mock();
+ Checker = new PlexAvailabilityChecker(_repo.Object, _tv.Object, _movie.Object, _notify.Object);
}
private readonly Mock _repo;
private readonly Mock _tv;
private readonly Mock _movie;
+ private readonly Mock _notify;
private PlexAvailabilityChecker Checker { get; }
[Test]
diff --git a/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs b/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs
index d895f7706..43e133a9b 100644
--- a/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs
+++ b/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs
@@ -48,7 +48,7 @@ namespace Ombi.Schedule.Jobs.Ombi
var updates = await OmbiService.GetUpdates(branch);
- var serverVersion = updates.UpdateVersionString.Substring(1, 6);
+ var serverVersion = updates.UpdateVersionString;
Logger.LogInformation(LoggingEvents.Updater, "Service Version {0}", updates.UpdateVersionString);
@@ -106,16 +106,21 @@ namespace Ombi.Schedule.Jobs.Ombi
}
// Download it
+ Logger.LogInformation(LoggingEvents.Updater, "Downloading the file {0} from {1}", download.Name, download.Url);
var extension = download.Name.Split('.').Last();
var zipDir = Path.Combine(currentLocation, $"Ombi.{extension}");
try
{
+ if (File.Exists(zipDir))
+ {
+ File.Delete(zipDir);
+ }
await DownloadAsync(download.Url, zipDir);
}
catch (Exception e)
{
- Console.WriteLine(e);
+ Logger.LogError(LoggingEvents.Updater, e, "Error when downloading the zip");
throw;
}
@@ -155,11 +160,6 @@ namespace Ombi.Schedule.Jobs.Ombi
}
}
- else
- {
- // No updates
- return;
- }
}
public static async Task DownloadAsync(string requestUri, string filename)
diff --git a/src/Ombi.Schedule/Ombi.Schedule.csproj b/src/Ombi.Schedule/Ombi.Schedule.csproj
index 192386e0c..7401be829 100644
--- a/src/Ombi.Schedule/Ombi.Schedule.csproj
+++ b/src/Ombi.Schedule/Ombi.Schedule.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/src/Ombi.Updater/Properties/launchSettings.json b/src/Ombi.Updater/Properties/launchSettings.json
index c9a8dc3e8..74b7bc698 100644
--- a/src/Ombi.Updater/Properties/launchSettings.json
+++ b/src/Ombi.Updater/Properties/launchSettings.json
@@ -2,7 +2,7 @@
"profiles": {
"Ombi.Updater": {
"commandName": "Project",
- "commandLineArgs": "C:\\Users\\Jamie.Rees\\Source\\Repos\\PlexRequests.Net\\src\\Ombi\\bin\\Debug\\netcoreapp1.1\\"
+ "commandLineArgs": "C:\\Users\\Jamie.Rees\\Source\\Repos\\PlexRequests.Net\\src\\Ombi\\bin\\Debug\\netcoreapp1.1 zip"
}
}
}
\ No newline at end of file
diff --git a/src/Ombi/Ombi.csproj b/src/Ombi/Ombi.csproj
index eb118ad76..b42c6c625 100644
--- a/src/Ombi/Ombi.csproj
+++ b/src/Ombi/Ombi.csproj
@@ -44,10 +44,9 @@
-
+
-