diff options
7 files changed, 11 insertions, 18 deletions
diff --git a/MediaBrowser.Api/SessionsService.cs b/MediaBrowser.Api/SessionsService.cs index 3f16fe624..4554b35fa 100644 --- a/MediaBrowser.Api/SessionsService.cs +++ b/MediaBrowser.Api/SessionsService.cs @@ -119,8 +119,8 @@ namespace MediaBrowser.Api /// <summary> /// Gets or sets the position to seek to /// </summary> - [ApiMember(Name = "SeekPosition", Description = "The position to seek to.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")] - public long? SeekPosition { get; set; } + [ApiMember(Name = "SeekPositionTicks", Description = "The position to seek to.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")] + public long? SeekPositionTicks { get; set; } /// <summary> /// Gets or sets the play command. @@ -200,7 +200,7 @@ namespace MediaBrowser.Api Data = new PlaystateRequest { Command = request.Command, - SeekPosition = request.SeekPosition + SeekPositionTicks = request.SeekPositionTicks } }, CancellationToken.None).ConfigureAwait(false); diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs index 54f2093f4..b787885c7 100644 --- a/MediaBrowser.Controller/Entities/Movies/Movie.cs +++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Runtime.Serialization; using System.Threading; using System.Threading.Tasks; diff --git a/MediaBrowser.Model/Session/PlaystateCommand.cs b/MediaBrowser.Model/Session/PlaystateCommand.cs index 9fed860dd..7e85d9d27 100644 --- a/MediaBrowser.Model/Session/PlaystateCommand.cs +++ b/MediaBrowser.Model/Session/PlaystateCommand.cs @@ -36,6 +36,6 @@ namespace MediaBrowser.Model.Session { public PlaystateCommand Command { get; set; } - public long? SeekPosition { get; set; } + public long? SeekPositionTicks { get; set; } } } diff --git a/MediaBrowser.Providers/Savers/MovieXmlSaver.cs b/MediaBrowser.Providers/Savers/MovieXmlSaver.cs index 4dd756d54..7c95e9dc3 100644 --- a/MediaBrowser.Providers/Savers/MovieXmlSaver.cs +++ b/MediaBrowser.Providers/Savers/MovieXmlSaver.cs @@ -2,7 +2,6 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; using MediaBrowser.Providers.Movies; using System; using System.Globalization; @@ -113,15 +112,9 @@ namespace MediaBrowser.Providers.Savers public string GetSavePath(BaseItem item) { - if (item.ResolveArgs.IsDirectory) - { - var video = (Video)item; - var path = video.VideoType == VideoType.VideoFile || video.VideoType == VideoType.Iso ? Path.GetDirectoryName(item.Path) : item.Path; - - return Path.Combine(path, "movie.xml"); - } - - return Path.ChangeExtension(item.Path, ".xml"); + return item.ResolveArgs.IsDirectory ? + Path.Combine(item.MetaLocation, "movie.xml") : + Path.ChangeExtension(item.Path, ".xml"); } } } diff --git a/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs b/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs index 92efdeb39..445cf5c3f 100644 --- a/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs +++ b/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs @@ -97,7 +97,7 @@ namespace MediaBrowser.Providers.TV /// <summary> /// The LOCA l_ MET a_ FIL e_ NAME /// </summary> - protected const string LocalMetaFileName = "Series.xml"; + protected const string LocalMetaFileName = "series.xml"; /// <summary> /// Supportses the specified item. diff --git a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/RemoteNotifications.cs b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/RemoteNotifications.cs index b8b1bbf28..e98a0a2c5 100644 --- a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/RemoteNotifications.cs +++ b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/RemoteNotifications.cs @@ -100,7 +100,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications { // Only show notifications that are active, new since last download, and not older than max age var notificationList = notifications - .Where(i => string.Equals(i.active, "1") && i.date.ToUniversalTime() > lastRunTime && (DateTime.Now - i.date.ToUniversalTime()) <= _maxAge) + .Where(i => string.Equals(i.active, "1") && i.date.ToUniversalTime() > lastRunTime && (DateTime.UtcNow - i.date.ToUniversalTime()) <= _maxAge) .ToList(); foreach (var user in _userManager.Users.ToList()) diff --git a/MediaBrowser.Server.Implementations/Sorting/OfficialRatingComparer.cs b/MediaBrowser.Server.Implementations/Sorting/OfficialRatingComparer.cs index dd31109da..e9ba3b5d3 100644 --- a/MediaBrowser.Server.Implementations/Sorting/OfficialRatingComparer.cs +++ b/MediaBrowser.Server.Implementations/Sorting/OfficialRatingComparer.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Controller.Entities; +using System; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Localization; using MediaBrowser.Controller.Sorting; using MediaBrowser.Model.Querying; |