github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-11 07:46:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

#125 refactor async task logic to work with mono

Browse source
This commit is contained in:
Drewster727 2016-04-07 14:29:23 -05:00
parent a6695db590
commit 33de634ade
3 changed files with 74 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

35
PlexRequests.UI/Models/MovieSearchType.cs Normal file
View file

@ -0,0 +1,35 @@
#region Copyright
// /************************************************************************
// Copyright (c) 2016 Jamie Rees
// File: PlexType.cs
// Created By: Jamie Rees
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// ************************************************************************/
#endregion
namespace PlexRequests.UI.Models
{
public enum MovieSearchType
{
Upcoming,
CurrentlyPlaying,
Search
}
}

75
PlexRequests.UI/Modules/SearchModule.cs
View file

@ -51,6 +51,7 @@ using PlexRequests.UI.Models;
using System.Threading.Tasks;
using TMDbLib.Objects.Search;
using PlexRequests.Api.Models.Tv;
using TMDbLib.Objects.General;
namespace PlexRequests.UI.Modules
{
@ -131,36 +132,32 @@ namespace PlexRequests.UI.Modules
private Response UpcomingMovies()
{
Log.Trace("Loading upcoming movies");
return ProcessMovies(new Task<List<SearchMovie>>(() =>
{
return MovieApi.GetUpcomingMovies().Result.Select(x => new SearchMovie()
{
Adult = x.Adult,
BackdropPath = x.BackdropPath,
GenreIds = x.GenreIds,
Id = x.Id,
OriginalLanguage = x.OriginalLanguage,
OriginalTitle = x.OriginalTitle,
Overview = x.Overview,
Popularity = x.Popularity,
PosterPath = x.PosterPath,
ReleaseDate = x.ReleaseDate,
Title = x.Title,
Video = x.Video,
VoteAverage = x.VoteAverage,
VoteCount = x.VoteCount
}).ToList();
}));
return ProcessMovies(MovieSearchType.Upcoming, string.Empty);
}
private Response CurrentlyPlayingMovies()
{
Log.Trace("Loading currently playing movies");
return ProcessMovies(MovieSearchType.CurrentlyPlaying, string.Empty);
}
return ProcessMovies(new Task<List<SearchMovie>>(() =>
private Response SearchMovie(string searchTerm)
{
return MovieApi.GetCurrentPlayingMovies().Result.Select(x => new SearchMovie()
Log.Trace("Searching for Movie {0}", searchTerm);
return ProcessMovies(MovieSearchType.Search, searchTerm);
}
private Response ProcessMovies(MovieSearchType searchType, string searchTerm)
{
List<Task> taskList = new List<Task>();
List<MovieResult> apiMovies = new List<MovieResult>();
taskList.Add(Task.Factory.StartNew<List<MovieResult>>(() =>
{
switch(searchType)
{
case MovieSearchType.Search:
return MovieApi.SearchMovie(searchTerm).Result.Select(x => new MovieResult()
{
Adult = x.Adult,
BackdropPath = x.BackdropPath,
@ -177,31 +174,17 @@ namespace PlexRequests.UI.Modules
VoteAverage = x.VoteAverage,
VoteCount = x.VoteCount
}).ToList();
}));
case MovieSearchType.CurrentlyPlaying:
return MovieApi.GetCurrentPlayingMovies().Result.ToList();
case MovieSearchType.Upcoming:
return MovieApi.GetUpcomingMovies().Result.ToList();
default:
return new List<MovieResult>();
}
private Response SearchMovie(string searchTerm)
{
Log.Trace("Searching for Movie {0}", searchTerm);
return ProcessMovies(new Task<List<SearchMovie>>(() =>
{
return MovieApi.SearchMovie(searchTerm).Result;
}));
}
private Response ProcessMovies(Task<List<SearchMovie>> apiTask)
{
List<Task> taskList = new List<Task>();
List<SearchMovie> apiMovies = new List<SearchMovie>();
apiTask.ContinueWith((t) =>
}).ContinueWith((t) =>
{
apiMovies = t.Result;
});
taskList.Add(apiTask);
apiTask.Start();
}));
Dictionary<int, RequestedModel> dbMovies = new Dictionary<int, RequestedModel>();
taskList.Add(Task.Factory.StartNew(() =>
@ -216,7 +199,7 @@ namespace PlexRequests.UI.Modules
Task.WaitAll(taskList.ToArray());
List<SearchMovieViewModel> viewMovies = new List<SearchMovieViewModel>();
foreach (SearchMovie movie in apiMovies)
foreach (MovieResult movie in apiMovies)
{
var viewMovie = new SearchMovieViewModel()
{

1
PlexRequests.UI/PlexRequests.UI.csproj
View file

@ -169,6 +169,7 @@
<Compile Include="Helpers\TvSender.cs" />
<Compile Include="Helpers\ValidationHelper.cs" />
<Compile Include="Models\DatatablesModel.cs" />
<Compile Include="Models\MovieSearchType.cs" />
<Compile Include="Models\QualityModel.cs" />
<Compile Include="Models\SearchViewModel.cs" />
<Compile Include="Models\SearchMusicViewModel.cs" />