mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-08 12:28:19 +02:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
b7096d2092
4 changed files with 28 additions and 1 deletions
|
@ -1072,6 +1072,11 @@ namespace MediaBrowser.Controller.Entities
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (user.Configuration.BlockNotRated && string.IsNullOrEmpty(CustomRating ?? OfficialRating))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return Ratings.Level(CustomRating ?? OfficialRating) <= user.Configuration.MaxParentalRating.Value;
|
return Ratings.Level(CustomRating ?? OfficialRating) <= user.Configuration.MaxParentalRating.Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -120,6 +120,21 @@ namespace MediaBrowser.Controller.Entities
|
||||||
await LibraryManager.SaveChildren(Id, newChildren, cancellationToken).ConfigureAwait(false);
|
await LibraryManager.SaveChildren(Id, newChildren, cancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Never want folders to be blocked by "BlockNotRated"
|
||||||
|
/// </summary>
|
||||||
|
public override string OfficialRating
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return !string.IsNullOrEmpty(base.OfficialRating) ? base.OfficialRating : "None";
|
||||||
|
}
|
||||||
|
set
|
||||||
|
{
|
||||||
|
base.OfficialRating = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Removes the child.
|
/// Removes the child.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -12,6 +12,12 @@ namespace MediaBrowser.Model.Configuration
|
||||||
/// <value>The max parental rating.</value>
|
/// <value>The max parental rating.</value>
|
||||||
public int? MaxParentalRating { get; set; }
|
public int? MaxParentalRating { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets a value indicating whether items with no rating information should be blocked.
|
||||||
|
/// </summary>
|
||||||
|
/// <value><c>true</c> if items with no rating info should be blocked; otherwise, <c>false</c>.</value>
|
||||||
|
public bool BlockNotRated { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets a value indicating whether [use custom library].
|
/// Gets or sets a value indicating whether [use custom library].
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -48,6 +54,7 @@ namespace MediaBrowser.Model.Configuration
|
||||||
public UserConfiguration()
|
public UserConfiguration()
|
||||||
{
|
{
|
||||||
IsAdministrator = true;
|
IsAdministrator = true;
|
||||||
|
BlockNotRated = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<targets async="true"></targets>
|
<targets async="true"></targets>
|
||||||
</nlog>
|
</nlog>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
<add key="DebugProgramDataPath" value="..\..\..\..\ProgramData-Server" />
|
<add key="DebugProgramDataPath" value="%ApplicationData%\MediaBrowser-Server" />
|
||||||
<add key="ReleaseProgramDataPath" value="%ApplicationData%" />
|
<add key="ReleaseProgramDataPath" value="%ApplicationData%" />
|
||||||
<add key="ProgramDataFolderName" value="MediaBrowser-Server" />
|
<add key="ProgramDataFolderName" value="MediaBrowser-Server" />
|
||||||
<add key="ClientSettingsProvider.ServiceUri" value="" />
|
<add key="ClientSettingsProvider.ServiceUri" value="" />
|
||||||
|
|
Loading…
Reference in a new issue