diff options
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/VideoHlsService.cs | 14 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Video.cs | 13 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/BaseMetadataProvider.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/VideoFormat.cs | 14 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Movies/OpenMovieDatabaseProvider.cs | 4 | ||||
| -rw-r--r-- | README.md | 2 |
7 files changed, 48 insertions, 9 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs index a88365c19..46093e0fc 100644 --- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs @@ -1,12 +1,12 @@ -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using MediaBrowser.Common.IO; +using MediaBrowser.Common.IO; using MediaBrowser.Common.MediaInfo; using MediaBrowser.Controller; using MediaBrowser.Controller.Library; -using System; using ServiceStack.ServiceHost; +using System; +using System.IO; +using System.Linq; +using System.Threading.Tasks; namespace MediaBrowser.Api.Playback.Hls { @@ -74,7 +74,9 @@ namespace MediaBrowser.Api.Playback.Hls Task.Run(async () => { - await Task.Delay(2000).ConfigureAwait(false); + // This is an arbitrary time period corresponding to when the request completes. + await Task.Delay(30000).ConfigureAwait(false); + ApiEntryPoint.Instance.OnTranscodeEndRequest(playlist1, TranscodingJobType.Hls); }); } diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index 78f4e3fc2..509859512 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -27,6 +27,19 @@ namespace MediaBrowser.Controller.Entities AdditionalPartIds = new List<Guid>(); } + public VideoFormat VideoFormat + { + get + { + if (!Video3DFormat.HasValue) + { + return VideoFormat.Standard; + } + + return VideoFormat.Digital3D; + } + } + /// <summary> /// Gets or sets the type of the video. /// </summary> diff --git a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs index 4f0876497..a8540f4bd 100644 --- a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs +++ b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs @@ -152,7 +152,14 @@ namespace MediaBrowser.Controller.Providers // Save the file system stamp for future comparisons if (RefreshOnFileSystemStampChange && item.LocationType == LocationType.FileSystem) { - data.FileStamp = GetCurrentFileSystemStamp(item); + try + { + data.FileStamp = GetCurrentFileSystemStamp(item); + } + catch (IOException ex) + { + Logger.ErrorException("Error getting file stamp for {0}", ex, item.Path); + } } item.ProviderData[Id] = data; diff --git a/MediaBrowser.Model/Entities/VideoFormat.cs b/MediaBrowser.Model/Entities/VideoFormat.cs new file mode 100644 index 000000000..8dfd9573c --- /dev/null +++ b/MediaBrowser.Model/Entities/VideoFormat.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace MediaBrowser.Model.Entities +{ + public enum VideoFormat + { + Standard, + Digital3D, + Sbs3D + } +} diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 3faa0ea2f..b3e837dca 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -55,6 +55,7 @@ <Compile Include="Entities\MediaUrl.cs" /> <Compile Include="Entities\MetadataFields.cs" /> <Compile Include="Entities\Video3DFormat.cs" /> + <Compile Include="Entities\VideoFormat.cs" /> <Compile Include="Net\WebSocketMessage.cs" /> <Compile Include="Net\WebSocketMessageType.cs" /> <Compile Include="Net\WebSocketState.cs" /> diff --git a/MediaBrowser.Providers/Movies/OpenMovieDatabaseProvider.cs b/MediaBrowser.Providers/Movies/OpenMovieDatabaseProvider.cs index 3e12b2d87..6cbc8bcdf 100644 --- a/MediaBrowser.Providers/Movies/OpenMovieDatabaseProvider.cs +++ b/MediaBrowser.Providers/Movies/OpenMovieDatabaseProvider.cs @@ -150,7 +150,9 @@ namespace MediaBrowser.Providers.Movies int tomatoMeter; - if (!string.IsNullOrEmpty(result.tomatoMeter) && int.TryParse(result.tomatoMeter, NumberStyles.Integer, UsCulture, out tomatoMeter)) + if (!string.IsNullOrEmpty(result.tomatoMeter) + && int.TryParse(result.tomatoMeter, NumberStyles.Integer, UsCulture, out tomatoMeter) + && tomatoMeter >= 0) { item.CriticRating = tomatoMeter; } @@ -22,6 +22,6 @@ http://community.mediabrowser.tv/ ## Current Versions ## -Release: 3.0.4928.20689<br/> +Release: 3.0.4931.24071<br/> Beta: 3.0.4927.41486<br/> Dev: 3.0.4927.27789
\ No newline at end of file |