diff options
| author | Sven Van den brande <sven.vandenbrande@outlook.com> | 2013-11-10 22:47:45 +0100 |
|---|---|---|
| committer | Sven Van den brande <sven.vandenbrande@outlook.com> | 2013-11-10 22:47:45 +0100 |
| commit | 09d7bc00c2f21b0686bb08051bf20ba7aebccfcd (patch) | |
| tree | 923bcb092565d4a2f0466b532044c84ca7e0f8ee /MediaBrowser.Model | |
| parent | e4564ac8607e45534bfb8132ccb410eab04f5528 (diff) | |
| parent | 0bf016d0ff500a2a2ffc51a22f90748b79d6dbbc (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Dto/BaseItemDto.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/PackageReviewInfo.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/IO/IZipClient.cs | 16 | ||||
| -rw-r--r-- | MediaBrowser.Model/Updates/PackageInfo.cs | 6 |
4 files changed, 27 insertions, 6 deletions
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index 501095f24..1d50a5933 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -384,6 +384,12 @@ namespace MediaBrowser.Model.Dto public Guid? AlbumPrimaryImageTag { get; set; } /// <summary> + /// Gets or sets the series primary image tag. + /// </summary> + /// <value>The series primary image tag.</value> + public Guid? SeriesPrimaryImageTag { get; set; } + + /// <summary> /// Gets or sets the album artist. /// </summary> /// <value>The album artist.</value> diff --git a/MediaBrowser.Model/Entities/PackageReviewInfo.cs b/MediaBrowser.Model/Entities/PackageReviewInfo.cs index 9d71622c3..c350935f4 100644 --- a/MediaBrowser.Model/Entities/PackageReviewInfo.cs +++ b/MediaBrowser.Model/Entities/PackageReviewInfo.cs @@ -33,5 +33,10 @@ namespace MediaBrowser.Model.Entities /// </summary> public string review { get; set; } + /// <summary> + /// Time of review + /// </summary> + public DateTime timestamp { get; set; } + } } diff --git a/MediaBrowser.Model/IO/IZipClient.cs b/MediaBrowser.Model/IO/IZipClient.cs index 1fa3e0271..ba0725da5 100644 --- a/MediaBrowser.Model/IO/IZipClient.cs +++ b/MediaBrowser.Model/IO/IZipClient.cs @@ -54,5 +54,21 @@ namespace MediaBrowser.Model.IO /// <param name="targetPath">The target path.</param> /// <param name="overwriteExistingFiles">if set to <c>true</c> [overwrite existing files].</param> void ExtractAllFromTar(Stream source, string targetPath, bool overwriteExistingFiles); + + /// <summary> + /// Extracts all from rar. + /// </summary> + /// <param name="sourceFile">The source file.</param> + /// <param name="targetPath">The target path.</param> + /// <param name="overwriteExistingFiles">if set to <c>true</c> [overwrite existing files].</param> + void ExtractAllFromRar(string sourceFile, string targetPath, bool overwriteExistingFiles); + + /// <summary> + /// Extracts all from rar. + /// </summary> + /// <param name="source">The source.</param> + /// <param name="targetPath">The target path.</param> + /// <param name="overwriteExistingFiles">if set to <c>true</c> [overwrite existing files].</param> + void ExtractAllFromRar(Stream source, string targetPath, bool overwriteExistingFiles); } } diff --git a/MediaBrowser.Model/Updates/PackageInfo.cs b/MediaBrowser.Model/Updates/PackageInfo.cs index 13c4d6194..2263f29fd 100644 --- a/MediaBrowser.Model/Updates/PackageInfo.cs +++ b/MediaBrowser.Model/Updates/PackageInfo.cs @@ -118,12 +118,6 @@ namespace MediaBrowser.Model.Updates public string guid { get; set; } /// <summary> - /// Gets or sets the total number of machines who have checked registration for this package (if premium). - /// </summary> - /// <value>The total hits.</value> - public int totalHits { get; set; } - - /// <summary> /// Gets or sets the total number of ratings for this package. /// </summary> /// <value>The total ratings.</value> |