Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.6.1 #158

Merged
merged 49 commits into from
Apr 16, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
3efd54c
Fixed #144
Apr 6, 2016
d1c6a13
#145 firefox css dsplay issue
Apr 6, 2016
c6e6583
#125 start indicating in the results if an item is already requested …
Apr 7, 2016
a6695db
fix search spinner sticking around after clearing search text + make …
Apr 7, 2016
33de634
#125 refactor async task logic to work with mono
Apr 7, 2016
10be8f0
Fixes for sonarr, we now display the error messages back to the user
Apr 7, 2016
dd07e75
Added logging around SickRage
Apr 7, 2016
53734d9
Merge branch 'dev' of https://github.com/tidusjar/PlexRequests.Net.git
Apr 7, 2016
adfbfb5
Set the default log level to info. #141
Apr 7, 2016
462eb0c
I think i've fixed an issue where SickRage reports Show not found.
Apr 7, 2016
e8fb28a
Change default logging
Apr 7, 2016
6ed7df2
cache the couchpotato wanted list, update it on an interval, and use …
Apr 8, 2016
456e442
add csproj with file changes from previous commit
Apr 8, 2016
5d1c1ba
start the initial couchpotato cache call on a separate thread to keep…
Apr 8, 2016
68624f6
remove couchpotato api test code
Apr 8, 2016
1af3c21
Added a url base
Apr 8, 2016
75d3c40
Made the base better
Apr 8, 2016
50022cb
fixed
Apr 8, 2016
35310d3
Fixed args
Apr 8, 2016
5f67302
#150 sonarr/sickrage cache checking. sickrage has a couple small item…
Apr 8, 2016
e707837
#150 split out the cache subscriptions to make sure they subscribe pr…
Apr 8, 2016
718e886
#150 start caching plex media as well. refactored the availability ch…
Apr 9, 2016
3261bdb
revert everything (except PlexRequests.UI) back to .NET 4.5.2 -- fixe…
Apr 11, 2016
7679a13
Fixed #154
Apr 12, 2016
854bfdd
Converted the UI back down to .NET 4.5.2
Apr 12, 2016
39c8964
kick off the schedulers once the web app has started (fixes api error…
Apr 12, 2016
fdbb373
Finished up the caching TODO's
Apr 12, 2016
5352422
Remove test code from plex api GetLibrary method
Apr 13, 2016
6190ece
Finally fixed #72
Apr 14, 2016
213a088
Commented out the unit tests as they need to be reworked now.
Apr 14, 2016
866b6d6
removed the test code from #72
Apr 14, 2016
6dea8b7
Fixed exception and all areas will now use the base url #72
Apr 14, 2016
acb9aab
More changes for #72
Apr 14, 2016
f01f230
Fixed when we do not have a base
Apr 14, 2016
256cfbc
Fixed a small bug in the SR cacher
Apr 14, 2016
7888912
By default don't use a url base
Apr 14, 2016
770b447
return empty array when obtaining queued IDs in sickrage cacher
Apr 14, 2016
e8e7367
Merge remote-tracking branch 'origin/dev' into dev
Apr 14, 2016
7c7142c
Done the auth, cp, logs and sidebar for #72
Apr 14, 2016
7c24597
Merge branch 'dev' of https://github.com/tidusjar/PlexRequests.Net.git
Apr 14, 2016
4c6c0ae
cache plex library data regardless of whether we have requests in the…
Apr 15, 2016
1fbe29a
add an extra check when determining if a tv show is already available…
Apr 15, 2016
94aee87
Merge remote-tracking branch 'origin/dev' into dev
Apr 15, 2016
51f8e2a
More changes for the urlbase #72
Apr 15, 2016
47dc543
#72 Login page done
Apr 15, 2016
67c968e
BaseUrl is finally finished! #72
Apr 16, 2016
26c220e
Bump up the version number ready for the release.
Apr 16, 2016
da344b2
Merge branch 'master' into dev
Apr 16, 2016
6fa64f0
Update README.md
Apr 16, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions PlexRequests.Api.Interfaces/ICouchPotatoApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@ public interface ICouchPotatoApi
bool AddMovie(string imdbid, string apiKey, string title, Uri baseUrl, string profileID = default(string));
CouchPotatoStatus GetStatus(Uri url, string apiKey);
CouchPotatoProfiles GetProfiles(Uri url, string apiKey);
CouchPotatoMovies GetMovies(Uri baseUrl, string apiKey, string[] status);
}
}
2 changes: 2 additions & 0 deletions PlexRequests.Api.Interfaces/IPlexApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,7 @@ public interface IPlexApi
PlexSearch SearchContent(string authToken, string searchTerm, Uri plexFullHost);
PlexStatus GetStatus(string authToken, Uri uri);
PlexAccount GetAccount(string authToken);
PlexLibraries GetLibrarySections(string authToken, Uri plexFullHost);
PlexSearch GetLibrary(string authToken, Uri plexFullHost, string libraryId);
}
}
2 changes: 2 additions & 0 deletions PlexRequests.Api.Interfaces/ISickRageApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,7 @@ Task<SickRageTvAdd> AddSeries(int tvdbId, int seasoncount, int[] seasons, string
SickRagePing Ping(string apiKey, Uri baseUrl);

Task<SickRageTvAdd> AddSeason(int tvdbId, int season, string apiKey, Uri baseUrl);

Task<SickrageShows> GetShows(string apiKey, Uri baseUrl);
}
}
2 changes: 2 additions & 0 deletions PlexRequests.Api.Interfaces/ISonarrApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,7 @@ SonarrAddSeries AddSeries(int tvdbId, string title, int qualityId, bool seasonFo
int seasonCount, int[] seasons, string apiKey, Uri baseUrl);

SystemStatus SystemStatus(string apiKey, Uri baseUrl);

List<Series> GetSeries(string apiKey, Uri baseUrl);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PlexRequests.Api.Interfaces</RootNamespace>
<AssemblyName>PlexRequests.Api.Interfaces</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion PlexRequests.Api.Interfaces/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="RestSharp" version="105.2.3" targetFramework="net452" requireReinstallation="true" />
<package id="RestSharp" version="105.2.3" targetFramework="net452" />
</packages>
35 changes: 26 additions & 9 deletions PlexRequests.Api.Models/Movie/CouchPotatoAdd.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class CouchPotatoAdd
}
public class Rating
{
public List<double> imdb { get; set; }
public List<string> imdb { get; set; }
}


Expand All @@ -23,15 +23,15 @@ public class Images
{
public List<object> disc_art { get; set; }
public List<string> poster { get; set; }
public List<string> backdrop { get; set; }
public List<object> extra_thumbs { get; set; }
public List<string> poster_original { get; set; }
public List<object> landscape { get; set; }
public string[] actors { get; set; }
public List<string> actors { get; set; }
public List<string> backdrop_original { get; set; }
public List<object> clear_art { get; set; }
public List<object> logo { get; set; }
public List<object> banner { get; set; }
public List<string> backdrop { get; set; }
public List<object> landscape { get; set; }
public List<object> extra_fanart { get; set; }
}

Expand All @@ -42,23 +42,37 @@ public class Info
public int tmdb_id { get; set; }
public string plot { get; set; }
public string tagline { get; set; }
public Release_Date release_date { get; set; }
public int year { get; set; }
public string original_title { get; set; }
public string[] actor_roles { get; set; }
public List<string> actor_roles { get; set; }
public bool via_imdb { get; set; }
public string mpaa { get; set; }
public bool via_tmdb { get; set; }
public Images images { get; set; }
public List<string> directors { get; set; }
public List<string> titles { get; set; }
public string imdb { get; set; }
public int year { get; set; }
public Images images { get; set; }
public string mpaa { get; set; }
public bool via_tmdb { get; set; }
public List<string> actors { get; set; }
public List<string> writers { get; set; }
public int runtime { get; set; }
public string type { get; set; }
public string released { get; set; }
}

public class Release_Date
{
public int dvd { get; set; }
public int expires { get; set; }
public int theater { get; set; }
public bool bluray { get; set; }
}

public class Files
{
public List<string> image_poster { get; set; }
}

public class Identifiers
{
public string imdb { get; set; }
Expand All @@ -74,8 +88,11 @@ public class Movie
public string _rev { get; set; }
public string profile_id { get; set; }
public string _id { get; set; }
public List<object> tags { get; set; }
public int last_edit { get; set; }
public object category_id { get; set; }
public string type { get; set; }
public Files files { get; set; }
public Identifiers identifiers { get; set; }
}

Expand Down
12 changes: 12 additions & 0 deletions PlexRequests.Api.Models/Movie/CouchPotatoMovies.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System.Collections.Generic;

namespace PlexRequests.Api.Models.Movie
{
public class CouchPotatoMovies
{
public List<Movie> movies { get; set; }
public int total { get; set; }
public bool success { get; set; }
public bool empty { get; set; }
}
}
22 changes: 22 additions & 0 deletions PlexRequests.Api.Models/Plex/PlexLibraries.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
using System.Collections.Generic;
using System.Xml.Serialization;

namespace PlexRequests.Api.Models.Plex
{
[XmlRoot(ElementName = "MediaContainer")]
public class PlexLibraries
{
[XmlElement(ElementName = "Directory")]
public List<Directory> Directories { get; set; }
}

[XmlRoot(ElementName = "Location")]
public partial class Location
{
[XmlElement(ElementName = "id")]
public int id { get; set; }
[XmlElement(ElementName = "path")]
public string path { get; set; }
}

}
35 changes: 35 additions & 0 deletions PlexRequests.Api.Models/Plex/PlexMediaType.cs
Original file line number Diff line number Diff line change
@@ -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.Services
{
public enum PlexMediaType
{
Movie,
Show,
Music // double check this one
}
}
2 changes: 2 additions & 0 deletions PlexRequests.Api.Models/Plex/PlexStatus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public class Directory
public string Key { get; set; }
[XmlAttribute(AttributeName = "title")]
public string Title { get; set; }
[XmlAttribute(AttributeName = "type")]
public string type { get; set; }
}

[XmlRoot(ElementName = "MediaContainer")]
Expand Down
13 changes: 12 additions & 1 deletion PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PlexRequests.Api.Models</RootNamespace>
<AssemblyName>PlexRequests.Api.Models</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down Expand Up @@ -46,6 +46,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Movie\CouchPotatoAdd.cs" />
<Compile Include="Movie\CouchPotatoMovies.cs" />
<Compile Include="Movie\CouchPotatoProfiles.cs" />
<Compile Include="Movie\CouchPotatoStatus.cs" />
<Compile Include="Music\HeadphonesAlbumSearchResult.cs" />
Expand All @@ -62,17 +63,21 @@
<Compile Include="Plex\PlexAuthentication.cs" />
<Compile Include="Plex\PlexError.cs" />
<Compile Include="Plex\PlexFriends.cs" />
<Compile Include="Plex\PlexLibraries.cs" />
<Compile Include="Plex\PlexSearch.cs" />
<Compile Include="Plex\PlexStatus.cs" />
<Compile Include="Plex\PlexMediaType.cs" />
<Compile Include="Plex\PlexUserRequest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SickRage\SickRageBase.cs" />
<Compile Include="SickRage\SickrageShows.cs" />
<Compile Include="SickRage\SickRagePing.cs" />
<Compile Include="SickRage\SickRageSeasonList.cs" />
<Compile Include="SickRage\SickRageShowInformation.cs" />
<Compile Include="SickRage\SickRageStatus.cs" />
<Compile Include="SickRage\SickRageTvAdd.cs" />
<Compile Include="Sonarr\SonarrAddSeries.cs" />
<Compile Include="Sonarr\SonarrAllSeries.cs" />
<Compile Include="Sonarr\SonarrError.cs" />
<Compile Include="Sonarr\SonarrProfile.cs" />
<Compile Include="Sonarr\SystemStatus.cs" />
Expand All @@ -87,6 +92,12 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PlexRequests.Helpers\PlexRequests.Helpers.csproj">
<Project>{1252336D-42A3-482A-804C-836E60173DFA}</Project>
<Name>PlexRequests.Helpers</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
2 changes: 1 addition & 1 deletion PlexRequests.Api.Models/SickRage/SickRageBase.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace PlexRequests.Api.Models.SickRage
{
public class SickRageBase<T>
public abstract class SickRageBase<T>
{
public T data { get; set; }
public string message { get; set; }
Expand Down
9 changes: 7 additions & 2 deletions PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
namespace PlexRequests.Api.Models.SickRage
using Newtonsoft.Json;
using PlexRequests.Helpers;

namespace PlexRequests.Api.Models.SickRage
{
public class SickRageSeasonList : SickRageBase<int[]>
public class SickRageSeasonList : SickRageBase<object>
{
[JsonIgnore]
public int[] Data => JsonConvertHelper.ParseObjectToArray<int>(data);
}
}
42 changes: 42 additions & 0 deletions PlexRequests.Api.Models/SickRage/SickrageShows.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#region Copyright
// /************************************************************************
// Copyright (c) 2016 Jamie Rees
// File: SickrageShows.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

using System;
using System.Collections.Generic;

namespace PlexRequests.Api.Models.SickRage
{
public class SickrageShows : SickRageBase<Dictionary<int, Item>>
{

}

public class Item
{
public int tvdbid { get; set; }
}
}
17 changes: 13 additions & 4 deletions PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
using System.Collections.Generic;

using Newtonsoft.Json;
using System;

namespace PlexRequests.Api.Models.Sonarr
{
public class Season
{
public int seasonNumber { get; set; }
public bool monitored { get; set; }
public Statistics statistics { get; set; }
}

public class Statistics
{
public int episodeFileCount { get; set; }
public int episodeCount { get; set; }
public int totalEpisodeCount { get; set; }
public long sizeOnDisk { get; set; }
public float percentOfEpisodes { get; set; }
public DateTime previousAiring { get; set; }
}

public class SonarrAddSeries
Expand All @@ -26,7 +38,7 @@ public class SonarrAddSeries
public string titleSlug { get; set; }
public int id { get; set; }
[JsonIgnore]
public string ErrorMessage { get; set; }
public List<string> ErrorMessages { get; set; }
}

public class AddOptions
Expand All @@ -35,7 +47,4 @@ public class AddOptions
public bool ignoreEpisodesWithoutFiles { get; set; }
public bool searchForMissingEpisodes { get; set; }
}



}
Loading