mirror of https://github.com/jellyfin/jellyfin.git
restore model properties
This commit is contained in:
parent
45ebbdc23a
commit
9924019f57
|
@ -3,7 +3,6 @@ using MediaBrowser.Controller.Configuration;
|
||||||
using MediaBrowser.Controller.Devices;
|
using MediaBrowser.Controller.Devices;
|
||||||
using MediaBrowser.Controller.Dlna;
|
using MediaBrowser.Controller.Dlna;
|
||||||
using MediaBrowser.Controller.Library;
|
using MediaBrowser.Controller.Library;
|
||||||
using MediaBrowser.Controller.LiveTv;
|
|
||||||
using MediaBrowser.Controller.MediaEncoding;
|
using MediaBrowser.Controller.MediaEncoding;
|
||||||
using MediaBrowser.Model.Extensions;
|
using MediaBrowser.Model.Extensions;
|
||||||
using MediaBrowser.Model.IO;
|
using MediaBrowser.Model.IO;
|
||||||
|
|
|
@ -281,6 +281,13 @@ namespace MediaBrowser.Model.Querying
|
||||||
public int? ImageTypeLimit { get; set; }
|
public int? ImageTypeLimit { get; set; }
|
||||||
public ImageType[] EnableImageTypes { get; set; }
|
public ImageType[] EnableImageTypes { get; set; }
|
||||||
|
|
||||||
|
[Obsolete]
|
||||||
|
public string[] Artists { get; set; }
|
||||||
|
[Obsolete]
|
||||||
|
public string[] Studios { get; set; }
|
||||||
|
[Obsolete]
|
||||||
|
public string Person { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="ItemQuery" /> class.
|
/// Initializes a new instance of the <see cref="ItemQuery" /> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -299,6 +306,9 @@ namespace MediaBrowser.Model.Querying
|
||||||
|
|
||||||
VideoTypes = new VideoType[] { };
|
VideoTypes = new VideoType[] { };
|
||||||
|
|
||||||
|
Artists = new string[] { };
|
||||||
|
Studios = new string[] { };
|
||||||
|
|
||||||
Genres = new string[] { };
|
Genres = new string[] { };
|
||||||
StudioIds = new string[] { };
|
StudioIds = new string[] { };
|
||||||
IncludeItemTypes = new string[] { };
|
IncludeItemTypes = new string[] { };
|
||||||
|
|
|
@ -15,8 +15,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public const long Infinite = 0;
|
public const long Infinite = 0;
|
||||||
|
|
||||||
public Func<long, long, long> ThrottleCallback { get; set; }
|
|
||||||
|
|
||||||
#region Private members
|
#region Private members
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The base stream.
|
/// The base stream.
|
||||||
|
@ -293,16 +291,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ThrottleCallback != null)
|
|
||||||
{
|
|
||||||
var val = ThrottleCallback(_maximumBytesPerSecond, _bytesWritten);
|
|
||||||
|
|
||||||
if (val == 0)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -35,8 +35,11 @@
|
||||||
"HeaderConfirmation": "Confirmation",
|
"HeaderConfirmation": "Confirmation",
|
||||||
"MessageKeyUpdated": "Thank you. Your supporter key has been updated.",
|
"MessageKeyUpdated": "Thank you. Your supporter key has been updated.",
|
||||||
"MessageKeyRemoved": "Thank you. Your supporter key has been removed.",
|
"MessageKeyRemoved": "Thank you. Your supporter key has been removed.",
|
||||||
|
"HeaderSupportTheTeam": "Support the Emby Team",
|
||||||
|
"TextEnjoyBonusFeatures": "Enjoy Bonus Features",
|
||||||
"TitleLiveTV": "Live TV",
|
"TitleLiveTV": "Live TV",
|
||||||
"TitleSync": "Sync",
|
"TitleSync": "Sync",
|
||||||
|
"ButtonDonate": "Donate",
|
||||||
"ErrorLaunchingChromecast": "There was an error launching chromecast. Please ensure your device is connected to your wireless network.",
|
"ErrorLaunchingChromecast": "There was an error launching chromecast. Please ensure your device is connected to your wireless network.",
|
||||||
"MessageErrorLoadingSupporterInfo": "There was an error loading supporter information. Please try again later.",
|
"MessageErrorLoadingSupporterInfo": "There was an error loading supporter information. Please try again later.",
|
||||||
"MessageLinkYourSupporterKey": "Link your supporter key with up to {0} Emby Connect members to enjoy free access to the following apps:",
|
"MessageLinkYourSupporterKey": "Link your supporter key with up to {0} Emby Connect members to enjoy free access to the following apps:",
|
||||||
|
@ -175,6 +178,9 @@
|
||||||
"OptionThursday": "Thursday",
|
"OptionThursday": "Thursday",
|
||||||
"OptionFriday": "Friday",
|
"OptionFriday": "Friday",
|
||||||
"OptionSaturday": "Saturday",
|
"OptionSaturday": "Saturday",
|
||||||
|
"OptionEveryday": "Every day",
|
||||||
|
"OptionWeekend": "Weekends",
|
||||||
|
"OptionWeekday": "Weekdays",
|
||||||
"HeaderConfirmDeletion": "Confirm Deletion",
|
"HeaderConfirmDeletion": "Confirm Deletion",
|
||||||
"MessageConfirmPathSubstitutionDeletion": "Are you sure you wish to delete this path substitution?",
|
"MessageConfirmPathSubstitutionDeletion": "Are you sure you wish to delete this path substitution?",
|
||||||
"LiveTvUpdateAvailable": "(Update available)",
|
"LiveTvUpdateAvailable": "(Update available)",
|
||||||
|
|
|
@ -913,8 +913,8 @@
|
||||||
"OptionDefaultSort": "Default",
|
"OptionDefaultSort": "Default",
|
||||||
"OptionCommunityMostWatchedSort": "Most Watched",
|
"OptionCommunityMostWatchedSort": "Most Watched",
|
||||||
"TabNextUp": "Next Up",
|
"TabNextUp": "Next Up",
|
||||||
|
"PlaceholderUsername": "Username",
|
||||||
"HeaderBecomeProjectSupporter": "Become an Emby Supporter",
|
"HeaderBecomeProjectSupporter": "Become an Emby Supporter",
|
||||||
"TextEnjoyBonusFeatures": "Enjoy Bonus Features",
|
|
||||||
"MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
|
"MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.",
|
||||||
"MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the + button to start creating Collections.",
|
"MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, Albums, Books and Games. Click the + button to start creating Collections.",
|
||||||
"MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
|
"MessageNoPlaylistsAvailable": "Playlists allow you to create lists of content to play consecutively at a time. To add items to playlists, right click or tap and hold, then select Add to Playlist.",
|
||||||
|
|
Loading…
Reference in New Issue