open-source-mirrors
/
Ombi
mirror of https://github.com/Ombi-app/Ombi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #903 from tidusjar/dev

Browse Source 
Dev
pull/927/head^2
Jamie 8 years ago committed by GitHub
parent ec751d421d 6048053c3c
commit 69b2d22fac
13 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File

2
Ombi.Api.Models/Watcher/WatcherAddMovieResult.cs
Unescape View File

@ -31,7 +31,7 @@ namespace Ombi.Api.Models.Watcher
{
public class WatcherAddMovieResult
{
public string status { get; set; }
public bool response { get; set; }
public string message { get; set; }
[JsonIgnore]

5
Ombi.Api.Models/Watcher/WatcherListStatusResult.cs
Unescape View File

@ -78,7 +78,10 @@ namespace Ombi.Api.Models.Watcher
public class WatcherListStatusResultContainer
{
public List<WatcherListStatusResult> Results { get; set; }
[JsonProperty("movies")]
public List<WatcherListStatusResult> Movies { get; set; }
[JsonProperty("response")]
public bool Response { get; set; }
[JsonIgnore]
public string ErrorMessage { get; set; }
[JsonIgnore]

11
Ombi.Api/WatcherApi.cs
Unescape View File

@ -84,16 +84,15 @@ namespace Ombi.Api
public WatcherListStatusResultContainer ListMovies(string apiKey, Uri baseUrl)
{
var response = Send("liststatus", apiKey, baseUrl);
var response = Send("liststatus", apiKey, baseUrl);
try
{
if (response.Content.Contains("No movies found"))
{
return new WatcherListStatusResultContainer();
}
var items = JsonConvert.DeserializeObject<List<WatcherListStatusResult>>(response.Content);
return new WatcherListStatusResultContainer {Results = items};
var items = JsonConvert.DeserializeObject<WatcherListStatusResultContainer>(response.Content);
return items;
}
catch (Exception e)
{
@ -115,9 +114,7 @@ namespace Ombi.Api
{
return new WatcherListStatusResultContainer();
}
var items = JsonConvert.DeserializeObject<List<WatcherListStatusResult>>(response.Content);
return new WatcherListStatusResultContainer { Results = items };
return JsonConvert.DeserializeObject<WatcherListStatusResultContainer>(response.Content);
}
catch (Exception e)
{

2
Ombi.Core/MovieSender.cs
Unescape View File

@ -78,7 +78,7 @@ namespace Ombi.Core
Log.Error(result.ErrorMessage);
return new MovieSenderResult { Result = false };
}
if (result.status.Equals("success", StringComparison.CurrentCultureIgnoreCase))
if (result.response)
{
return new MovieSenderResult { Result = true, MovieSendingEnabled = true };
}

4
Ombi.Services/Jobs/WatcherCacher.cs
Unescape View File

@ -77,10 +77,10 @@ namespace Ombi.Services.Jobs
Log.Error(movies.ErrorMessage);
}
var wantedMovies =
movies?.Results?.Where(x => x.status.Equals("Wanted", StringComparison.CurrentCultureIgnoreCase));
movies?.Movies?.Where(x => x.status.Equals("Wanted", StringComparison.CurrentCultureIgnoreCase));
if (wantedMovies != null && wantedMovies.Any())
{
Cache.Set(CacheKeys.WatcherQueued, movies.Results.Select(x => x.imdbid).ToArray(), CacheKeys.TimeFrameMinutes.SchedulerCaching);
Cache.Set(CacheKeys.WatcherQueued, movies.Movies.Select(x => x.imdbid).ToArray(), CacheKeys.TimeFrameMinutes.SchedulerCaching);
}
}

4
Ombi.UI/Jobs/Scheduler.cs
Unescape View File

@ -210,7 +210,7 @@ namespace Ombi.UI.Jobs
var cpCacher =
TriggerBuilder.Create()
.WithIdentity("CouchPotatoCacher", "Cache")
.StartAt(DateBuilder.FutureDate(4, IntervalUnit.Minute))
.StartAt(DateBuilder.FutureDate(2, IntervalUnit.Minute))
.WithSimpleSchedule(x => x.WithIntervalInMinutes(s.CouchPotatoCacher).RepeatForever())
.Build();
@ -218,7 +218,7 @@ namespace Ombi.UI.Jobs
TriggerBuilder.Create()
.WithIdentity("WatcherCacher", "Cache")
//.StartNow()
.StartAt(DateBuilder.FutureDate(3, IntervalUnit.Minute))
.StartAt(DateBuilder.FutureDate(2, IntervalUnit.Minute))
.WithSimpleSchedule(x => x.WithIntervalInMinutes(s.WatcherCacher).RepeatForever())
.Build();

8
Ombi.UI/Modules/Admin/SystemStatusModule.cs
Unescape View File

@ -123,17 +123,17 @@ namespace Ombi.UI.Modules.Admin
var url = Request.Form["url"];
var args = (string)Request.Form["args"].ToString();
var lowered = args.ToLower();
var appPath = Path.Combine(Path.GetDirectoryName(Assembly.GetAssembly(typeof(SystemStatusModule)).Location ?? string.Empty) ?? string.Empty, "PlexRequests.Updater.exe");
var appPath = Path.Combine(Path.GetDirectoryName(Assembly.GetAssembly(typeof(SystemStatusModule)).Location ?? string.Empty) ?? string.Empty, "Ombi.Updater.exe");
if (!string.IsNullOrEmpty(lowered))
{
if (lowered.Contains("plexrequests.exe"))
if (lowered.Contains("ombi.exe"))
{
lowered = lowered.Replace("plexrequests.exe", "");
lowered = lowered.Replace("ombi.exe", "");
}
}
var startArgs = string.IsNullOrEmpty(lowered) ? appPath : $"{lowered} Plexrequests.Updater.exe";
var startArgs = string.IsNullOrEmpty(lowered) ? appPath : $"{lowered} Ombi.Updater.exe";
var startInfo = Type.GetType("Mono.Runtime") != null
? new ProcessStartInfo(startArgs) { Arguments = $"{url} {lowered}", }

2
Ombi.UI/Modules/ApplicationTesterModule.cs
Unescape View File

@ -114,7 +114,7 @@ namespace Ombi.UI.Modules
try
{
var status = WatcherApi.Version(settings.ApiKey, settings.FullUri);
return !status.response
return status.response
? Response.AsJson(new JsonResponseModel { Result = true, Message = "Connected to Watcher successfully!" })
: Response.AsJson(new JsonResponseModel { Result = false, Message = $"Could not connect to Watcher, Error: {status.ErrorMessage}" });

4
Ombi.UI/Modules/SearchModule.cs
Unescape View File

@ -567,6 +567,7 @@ namespace Ombi.UI.Modules
{
if (ShouldAutoApprove(RequestType.Movie, settings, Username))
{
model.Approved = true;
var result = await MovieSender.Send(model);
if (result.Result)
@ -576,8 +577,7 @@ namespace Ombi.UI.Modules
}
if (!result.MovieSendingEnabled)
{
model.Approved = true;
return await AddRequest(model, settings, $"{fullMovieName} {Resources.UI.Search_SuccessfullyAdded}");
}

4
Ombi.UI/Program.cs
Unescape View File

@ -159,9 +159,9 @@ namespace Ombi.UI
private static void PrintToConsole(string message, ConsoleColor colour = ConsoleColor.Gray)
{
Console.ForegroundColor = colour;
// Console.ForegroundColor = colour;
Console.WriteLine(message);
Console.ForegroundColor = ConsoleColor.Gray;
//Console.ForegroundColor = ConsoleColor.Gray;
}
private static void CheckUpdate(UpdateValue val)

2
Ombi.UI/Views/Integration/Watcher.cshtml
Unescape View File

@ -16,7 +16,7 @@
<form class="form-horizontal" method="POST" id="mainForm">
<fieldset>
<legend>Watcher Settings</legend>
<small>Please note, this is still in beta and may stop working at anytime as Watcher is still very much in development and is constantly changing.</small>
@Html.Checkbox(Model.Enabled, "Enabled", "Enabled")
<div class="form-group">

4
Ombi.UI/Views/Shared/Partial/_Sidebar.cshtml
Unescape View File

@ -10,10 +10,10 @@
@Html.GetSidebarUrl(Context, "/admin/usermanagementsettings", "User Management Settings")
@Html.GetSidebarUrl(Context, "/admin/plex", "Plex")
@Html.GetSidebarUrl(Context, "/admin/couchpotato", "CouchPotato")
@Html.GetSidebarUrl(Context, "/admin/watcher", "Watcher")
@Html.GetSidebarUrl(Context, "/admin/watcher", "Watcher (beta)")
@Html.GetSidebarUrl(Context, "/admin/sonarr", "Sonarr")
@Html.GetSidebarUrl(Context, "/admin/sickrage", "SickRage")
@Html.GetSidebarUrl(Context, "/admin/headphones", "Headphones (Beta)")
@Html.GetSidebarUrl(Context, "/admin/headphones", "Headphones (beta)")
@Html.GetSidebarUrl(Context, "/admin/newsletter", "Newsletter Settings")
@Html.GetSidebarUrl(Context, "/admin/emailnotification", "Email Notifications")
@Html.GetSidebarUrl(Context, "/admin/pushbulletnotification", "Pushbullet Notifications")

10
Ombi.Updater/Updater.cs
Unescape View File

@ -56,7 +56,7 @@ namespace Ombi.Updater
}
else
{
if (entry.Name.Contains("PlexRequests.Updater"))
if (entry.Name.Contains("Ombi.Updater"))
{
entry.ExtractToFile(fullPath + "_Updated", true);
continue;
@ -75,7 +75,7 @@ namespace Ombi.Updater
{
BackupCurrentVersion();
var dir = CreateTempPath();
TempPath = Path.Combine(dir.FullName, "PlexRequestsUpdate.zip");
TempPath = Path.Combine(dir.FullName, "OmbiUpdate.zip");
CheckAndDelete(TempPath);
Console.WriteLine("Downloading new version");
@ -109,7 +109,7 @@ namespace Ombi.Updater
}
else
{
if (entry.Name.Contains("PlexRequests.Updater"))
if (entry.Name.Contains("Ombi.Updater"))
{
entry.ExtractToFile(fullPath + "_Updated", true);
continue;
@ -150,7 +150,7 @@ namespace Ombi.Updater
var dir = Directory.CreateDirectory(Path.Combine(applicationPath, "BackupSystem"));
var allfiles = Directory.GetFiles(applicationPath, "*.*", SearchOption.AllDirectories);
BackupPath = Path.Combine(dir.FullName, "PlexRequestsBackup.zip");
BackupPath = Path.Combine(dir.FullName, "OmbiBackup.zip");
CheckAndDelete(BackupPath);
using (var fileStream = new FileStream(BackupPath, FileMode.CreateNew))
@ -202,7 +202,7 @@ namespace Ombi.Updater
private void FinishUpdate(string launchOptions)
{
var args = Error ? "-u 2" : "-u 1";
var startInfo = new ProcessStartInfo($"{launchOptions}PlexRequests.exe") { Arguments = args, UseShellExecute = true };
var startInfo = new ProcessStartInfo($"{launchOptions}Ombi.exe") { Arguments = args, UseShellExecute = true };
Process.Start(startInfo);

Write Preview
Loading…
Cancel
Save