diff options
| author | Luis Miguel Almánzar <ruisu15@gmail.com> | 2013-10-28 20:35:10 -0400 |
|---|---|---|
| committer | Luis Miguel Almánzar <ruisu15@gmail.com> | 2013-10-28 20:35:10 -0400 |
| commit | 67354bde5fc8dbf3520c419e2936bacf34e429a8 (patch) | |
| tree | 7f484a193eec083eb48a1532eb09f9131f6f9401 /MediaBrowser.Controller | |
| parent | d77122ba0f3c3ca71bfa4c8fa5b25bb3c3f0f1dc (diff) | |
| parent | 8bd7df410ce1c10cbcc5a223138226bb6986e8b8 (diff) | |
Merge branch 'master' of github.com:MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Controller')
4 files changed, 10 insertions, 41 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 67221a9ac..8174dded2 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -1337,6 +1337,13 @@ namespace MediaBrowser.Controller.Entities var data = userManager.GetUserData(user.Id, key); + if (datePlayed.HasValue) + { + // Incremenet + data.PlayCount++; + } + + // Ensure it's at least one data.PlayCount = Math.Max(data.PlayCount, 1); data.LastPlayedDate = datePlayed ?? data.LastPlayedDate; diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs index 1176fca52..96b120b8f 100644 --- a/MediaBrowser.Controller/Entities/TV/Episode.cs +++ b/MediaBrowser.Controller/Entities/TV/Episode.cs @@ -203,7 +203,7 @@ namespace MediaBrowser.Controller.Entities.TV public bool IsUnaired { - get { return PremiereDate.HasValue && PremiereDate.Value >= DateTime.UtcNow; } + get { return PremiereDate.HasValue && PremiereDate.Value.ToLocalTime().Date >= DateTime.Now.Date; } } public bool IsVirtualUnaired diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs index e1b38bc71..e9bb7f66d 100644 --- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs @@ -552,32 +552,6 @@ namespace MediaBrowser.Controller.Providers } break; - case "GamesDbId": - var gamesdbId = reader.ReadElementContentAsString(); - if (!string.IsNullOrWhiteSpace(gamesdbId)) - { - item.SetProviderId(MetadataProviders.Gamesdb, gamesdbId); - } - break; - - case "Players": - { - var val = reader.ReadElementContentAsString(); - if (!string.IsNullOrWhiteSpace(val)) - { - int num; - - if (int.TryParse(val, NumberStyles.Integer, _usCulture, out num)) - { - var game = item as Game; - if (game != null) - { - game.PlayersSupported = num; - } - } - } - break; - } case "VoteCount": { var val = reader.ReadElementContentAsString(); @@ -592,19 +566,6 @@ namespace MediaBrowser.Controller.Providers } break; } - case "GameSystem": - { - var val = reader.ReadElementContentAsString(); - if (!string.IsNullOrWhiteSpace(val)) - { - var game = item as Game; - if (game != null) - { - game.GameSystem = val; - } - } - break; - } case "MusicbrainzId": { var mbz = reader.ReadElementContentAsString(); diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs index 1b3aba102..dbac826b3 100644 --- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs +++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs @@ -44,7 +44,8 @@ namespace MediaBrowser.Controller.Resolvers ".f4v", ".3gp", ".webm", - ".mts" + ".mts", + ".rec" }; private static readonly Dictionary<string, string> VideoFileExtensionsDictionary = VideoFileExtensions.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase); |