diff options
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Drawing/ImageOutputFormat.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/ImageOptions.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model/Users/ForgotPasswordAction.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Model/Users/ForgotPasswordResult.cs | 23 | ||||
| -rw-r--r-- | MediaBrowser.Model/Users/PinRedeemResult.cs | 17 |
6 files changed, 57 insertions, 8 deletions
diff --git a/MediaBrowser.Model/Drawing/ImageOutputFormat.cs b/MediaBrowser.Model/Drawing/ImageOutputFormat.cs index 824970073..ec32f64f2 100644 --- a/MediaBrowser.Model/Drawing/ImageOutputFormat.cs +++ b/MediaBrowser.Model/Drawing/ImageOutputFormat.cs @@ -7,10 +7,6 @@ namespace MediaBrowser.Model.Drawing public enum ImageOutputFormat { /// <summary> - /// The original - /// </summary> - Original, - /// <summary> /// The BMP /// </summary> Bmp, @@ -26,6 +22,9 @@ namespace MediaBrowser.Model.Drawing /// The PNG /// </summary> Png, + /// <summary> + /// The webp + /// </summary> Webp } } diff --git a/MediaBrowser.Model/Dto/ImageOptions.cs b/MediaBrowser.Model/Dto/ImageOptions.cs index 08ac7906a..037be4a87 100644 --- a/MediaBrowser.Model/Dto/ImageOptions.cs +++ b/MediaBrowser.Model/Dto/ImageOptions.cs @@ -1,6 +1,5 @@ using MediaBrowser.Model.Drawing; using MediaBrowser.Model.Entities; -using System; namespace MediaBrowser.Model.Dto { @@ -74,7 +73,7 @@ namespace MediaBrowser.Model.Dto /// Gets or sets the format. /// </summary> /// <value>The format.</value> - public ImageOutputFormat Format { get; set; } + public ImageOutputFormat? Format { get; set; } /// <summary> /// Gets or sets a value indicating whether [add played indicator]. @@ -100,8 +99,6 @@ namespace MediaBrowser.Model.Dto public ImageOptions() { EnableImageEnhancers = true; - - Format = ImageOutputFormat.Original; } } } diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 8f84edb25..3a6e8d3e5 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -407,6 +407,9 @@ <Compile Include="Updates\PackageInfo.cs" /> <Compile Include="Updates\PackageVersionInfo.cs" /> <Compile Include="Users\AuthenticationResult.cs" /> + <Compile Include="Users\ForgotPasswordAction.cs" /> + <Compile Include="Users\ForgotPasswordResult.cs" /> + <Compile Include="Users\PinRedeemResult.cs" /> <None Include="Fody.targets" /> <None Include="FodyWeavers.xml" /> <None Include="MediaBrowser.Model.snk" /> diff --git a/MediaBrowser.Model/Users/ForgotPasswordAction.cs b/MediaBrowser.Model/Users/ForgotPasswordAction.cs new file mode 100644 index 000000000..f75b1d74b --- /dev/null +++ b/MediaBrowser.Model/Users/ForgotPasswordAction.cs @@ -0,0 +1,10 @@ + +namespace MediaBrowser.Model.Users +{ + public enum ForgotPasswordAction + { + ContactAdmin = 0, + PinCode = 1, + InNetworkRequired = 2 + } +} diff --git a/MediaBrowser.Model/Users/ForgotPasswordResult.cs b/MediaBrowser.Model/Users/ForgotPasswordResult.cs new file mode 100644 index 000000000..7dbb1e96b --- /dev/null +++ b/MediaBrowser.Model/Users/ForgotPasswordResult.cs @@ -0,0 +1,23 @@ +using System; + +namespace MediaBrowser.Model.Users +{ + public class ForgotPasswordResult + { + /// <summary> + /// Gets or sets the action. + /// </summary> + /// <value>The action.</value> + public ForgotPasswordAction Action { get; set; } + /// <summary> + /// Gets or sets the pin file. + /// </summary> + /// <value>The pin file.</value> + public string PinFile { get; set; } + /// <summary> + /// Gets or sets the pin expiration date. + /// </summary> + /// <value>The pin expiration date.</value> + public DateTime? PinExpirationDate { get; set; } + } +} diff --git a/MediaBrowser.Model/Users/PinRedeemResult.cs b/MediaBrowser.Model/Users/PinRedeemResult.cs new file mode 100644 index 000000000..6a01bf2d4 --- /dev/null +++ b/MediaBrowser.Model/Users/PinRedeemResult.cs @@ -0,0 +1,17 @@ + +namespace MediaBrowser.Model.Users +{ + public class PinRedeemResult + { + /// <summary> + /// Gets or sets a value indicating whether this <see cref="PinRedeemResult"/> is success. + /// </summary> + /// <value><c>true</c> if success; otherwise, <c>false</c>.</value> + public bool Success { get; set; } + /// <summary> + /// Gets or sets the users reset. + /// </summary> + /// <value>The users reset.</value> + public string[] UsersReset { get; set; } + } +} |