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

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
pull/702/head
Techywarrior 12 years ago
parent 419d851167 a2447f3edc
commit c24c0ad784
9 changed files with 123 additions and 31 deletions
Show Stats Download Patch File Download Diff File

31
MediaBrowser.Api/UserLibrary/ItemsService.cs
Unescape View File

@ -2,6 +2,7 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Localization;
using MediaBrowser.Controller.Persistence;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Querying;
@ -124,6 +125,20 @@ namespace MediaBrowser.Api.UserLibrary
[ApiMember(Name = "AirDays", Description = "Optional filter by Series Air Days. Allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
public string AirDays { get; set; }
/// <summary>
/// Gets or sets the min offical rating.
/// </summary>
/// <value>The min offical rating.</value>
[ApiMember(Name = "MinOfficalRating", Description = "Optional filter by minimum official rating (PG, PG-13, TV-MA, etc).", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
public string MinOfficalRating { get; set; }
/// <summary>
/// Gets or sets the max offical rating.
/// </summary>
/// <value>The max offical rating.</value>
[ApiMember(Name = "MaxOfficalRating", Description = "Optional filter by maximum official rating (PG, PG-13, TV-MA, etc).", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
public string MaxOfficalRating { get; set; }
/// <summary>
/// Gets the order by.
/// </summary>
@ -357,6 +372,22 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>IEnumerable{BaseItem}.</returns>
internal static IEnumerable<BaseItem> ApplyAdditionalFilters(GetItems request, IEnumerable<BaseItem> items)
{
// Min official rating
if (!string.IsNullOrEmpty(request.MinOfficalRating))
{
var level = Ratings.Level(request.MinOfficalRating);
items = items.Where(i => Ratings.Level(i.CustomRating ?? i.OfficialRating) >= level);
}
// Max official rating
if (!string.IsNullOrEmpty(request.MaxOfficalRating))
{
var level = Ratings.Level(request.MaxOfficalRating);
items = items.Where(i => Ratings.Level(i.CustomRating ?? i.OfficialRating) <= level);
}
// Exclude item types
if (!string.IsNullOrEmpty(request.ExcludeItemTypes))
{

35
MediaBrowser.Controller/Entities/BaseItem.cs
Unescape View File

@ -32,7 +32,7 @@ namespace MediaBrowser.Controller.Entities
/// Gets or sets the name.
/// </summary>
/// <value>The name.</value>
public string Name { get; set; }
public virtual string Name { get; set; }
/// <summary>
/// Gets or sets the id.
@ -957,7 +957,7 @@ namespace MediaBrowser.Controller.Entities
{
if (person == null)
{
throw new ArgumentNullException();
throw new ArgumentNullException("person");
}
if (string.IsNullOrWhiteSpace(person.Name))
@ -967,14 +967,37 @@ namespace MediaBrowser.Controller.Entities
if (People == null)
{
People = new List<PersonInfo>();
People = new List<PersonInfo> { person };
return;
}
// Check for dupes based on the combination of Name and Type
// If the type is GuestStar and there's already an Actor entry, then update it to avoid dupes
if (string.Equals(person.Type, PersonType.GuestStar, StringComparison.OrdinalIgnoreCase))
{
var existing = People.FirstOrDefault(p => p.Name.Equals(person.Name, StringComparison.OrdinalIgnoreCase) && p.Type.Equals(PersonType.Actor, StringComparison.OrdinalIgnoreCase));
if (existing != null)
{
existing.Type = PersonType.GuestStar;
return;
}
}
if (!People.Any(p => p.Name.Equals(person.Name, StringComparison.OrdinalIgnoreCase) && p.Type.Equals(person.Type, StringComparison.OrdinalIgnoreCase)))
if (string.Equals(person.Type, PersonType.Actor, StringComparison.OrdinalIgnoreCase))
{
People.Add(person);
// Only add actors if there isn't an existing one of type Actor or GuestStar
if (!People.Any(p => p.Name.Equals(person.Name, StringComparison.OrdinalIgnoreCase) && (p.Type.Equals(PersonType.Actor, StringComparison.OrdinalIgnoreCase) || p.Type.Equals(PersonType.GuestStar, StringComparison.OrdinalIgnoreCase))))
{
People.Add(person);
}
}
else
{
// Check for dupes based on the combination of Name and Type
if (!People.Any(p => p.Name.Equals(person.Name, StringComparison.OrdinalIgnoreCase) && p.Type.Equals(person.Type, StringComparison.OrdinalIgnoreCase)))
{
People.Add(person);
}
}
}

58
MediaBrowser.Installer/MainWindow.xaml.cs
Unescape View File

@ -269,22 +269,13 @@ namespace MediaBrowser.Installer
{
ExtractPackage(archive);
// We're done with it so delete it (this is necessary for update operations)
try
{
File.Delete(archive);
}
catch (FileNotFoundException)
{
}
catch (Exception e)
{
SystemClose("Error Removing Archive - " + e.GetType().FullName + "\n\n" + e.Message);
return;
}
TryDelete(archive);
}
catch (Exception e)
{
SystemClose("Error Extracting - " + e.GetType().FullName + "\n\n" + e.Message);
// Delete archive even if failed so we don't try again with this one
TryDelete(archive);
return;
}
@ -337,6 +328,23 @@ namespace MediaBrowser.Installer
}
private bool TryDelete(string file)
{
try
{
File.Delete(file);
}
catch (FileNotFoundException)
{
}
catch (Exception e)
{
return false;
}
return true;
}
private void PismoInstall()
{
// Kick off the Pismo installer and wait for it to end
@ -441,8 +449,24 @@ namespace MediaBrowser.Installer
var backupDir = Path.Combine(RootPath, "System.old");
if (Directory.Exists(systemDir))
{
if (Directory.Exists(backupDir)) Directory.Delete(backupDir,true);
Directory.Move(systemDir, backupDir);
try
{
if (Directory.Exists(backupDir)) Directory.Delete(backupDir,true);
}
catch (Exception e)
{
throw new ApplicationException("Could not delete previous backup directory.\n\n"+e.Message);
}
try
{
Directory.Move(systemDir, backupDir);
}
catch (Exception e)
{
throw new ApplicationException("Could not move system directory to backup.\n\n"+e.Message);
}
}
// And extract
@ -461,7 +485,7 @@ namespace MediaBrowser.Installer
}
}
}
catch
catch (Exception e)
{
if (retryCount < 3)
{
@ -472,8 +496,8 @@ namespace MediaBrowser.Installer
{
//Rollback
RollBack(systemDir, backupDir);
File.Delete(archive); // so we don't try again if its an update
throw;
TryDelete(archive); // so we don't try again if its an update
throw new ApplicationException(string.Format("Could not extract {0} to {1} after {2} attempts.\n\n{3}", archive, RootPath, retryCount, e.Message));
}
}
}

12
MediaBrowser.Model/Querying/ItemQuery.cs
Unescape View File

@ -157,5 +157,17 @@ namespace MediaBrowser.Model.Querying
/// </summary>
/// <value>The ids.</value>
public string[] Ids { get; set; }
/// <summary>
/// Gets or sets the min official rating.
/// </summary>
/// <value>The min official rating.</value>
public string MinOfficialRating { get; set; }
/// <summary>
/// Gets or sets the max official rating.
/// </summary>
/// <value>The max official rating.</value>
public string MaxOfficialRating { get; set; }
}
}

4
MediaBrowser.Server.Implementations/Library/UserManager.cs
Unescape View File

@ -106,10 +106,12 @@ namespace MediaBrowser.Server.Implementations.Library
/// </summary>
/// <param name="logger">The logger.</param>
/// <param name="configurationManager">The configuration manager.</param>
public UserManager(ILogger logger, IServerConfigurationManager configurationManager)
/// <param name="userDataRepository">The user data repository.</param>
public UserManager(ILogger logger, IServerConfigurationManager configurationManager, IUserDataRepository userDataRepository)
{
_logger = logger;
ConfigurationManager = configurationManager;
_userDataRepository = userDataRepository;
}
#region Events

6
MediaBrowser.ServerApplication/ApplicationHost.cs
Unescape View File

@ -220,12 +220,12 @@ namespace MediaBrowser.ServerApplication
ZipClient = new DotNetZipClient();
RegisterSingleInstance(ZipClient);
UserManager = new UserManager(Logger, ServerConfigurationManager);
RegisterSingleInstance(UserManager);
UserDataRepository = new SQLiteUserDataRepository(ApplicationPaths, JsonSerializer, LogManager);
RegisterSingleInstance(UserDataRepository);
UserManager = new UserManager(Logger, ServerConfigurationManager, UserDataRepository);
RegisterSingleInstance(UserManager);
LibraryManager = new LibraryManager(Logger, TaskManager, UserManager, ServerConfigurationManager, UserDataRepository);
RegisterSingleInstance(LibraryManager);

2
Nuget/MediaBrowser.Common.Internal.nuspec
Unescape View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>MediaBrowser.Common.Internal</id>
<version>3.0.75</version>
<version>3.0.76</version>
<title>MediaBrowser.Common.Internal</title>
<authors>Luke</authors>
<owners>ebr,Luke,scottisafool</owners>

2
Nuget/MediaBrowser.Common.nuspec
Unescape View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>MediaBrowser.Common</id>
<version>3.0.75</version>
<version>3.0.76</version>
<title>MediaBrowser.Common</title>
<authors>Media Browser Team</authors>
<owners>ebr,Luke,scottisafool</owners>

4
Nuget/MediaBrowser.Server.Core.nuspec
Unescape View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>MediaBrowser.Server.Core</id>
<version>3.0.75</version>
<version>3.0.76</version>
<title>Media Browser.Server.Core</title>
<authors>Media Browser Team</authors>
<owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains core components required to build plugins for Media Browser Server.</description>
<copyright>Copyright © Media Browser 2013</copyright>
<dependencies>
<dependency id="MediaBrowser.Common" version="3.0.75" />
<dependency id="MediaBrowser.Common" version="3.0.76" />
</dependencies>
</metadata>
<files>

Write Preview
Loading…
Cancel
Save