diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-13 11:07:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-13 11:07:57 -0400 |
| commit | cf15c194aea1f3ce3bfe24548897a8ea51efd934 (patch) | |
| tree | 9ef505a85713ef508302fe40e8133297b1c72b7f /MediaBrowser.Server.Implementations | |
| parent | 5be6cf05e34459a046aceaa16c891f3034859476 (diff) | |
| parent | 2095170eeda806c3fa6195d735ec0734d05b70a1 (diff) | |
Merge pull request #2228 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations')
3 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs index 9ec671908..b3d3ec13c 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -100,7 +100,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer container.Adapter = _containerAdapter; Plugins.RemoveAll(x => x is NativeTypesFeature); - //Plugins.Add(new SwaggerFeature()); + Plugins.Add(new SwaggerFeature()); Plugins.Add(new CorsFeature(allowedHeaders: "Content-Type, Authorization, Range, X-MediaBrowser-Token, X-Emby-Authorization")); //Plugins.Add(new AuthFeature(() => new AuthUserSession(), new IAuthProvider[] { diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index 136a9e195..86d77982c 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -761,6 +761,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV { defaults.SeriesId = program.SeriesId; defaults.ProgramId = program.Id; + defaults.RecordNewOnly = !program.IsRepeat; } defaults.SkipEpisodesInLibrary = true; diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs index 8095a6989..c07c448db 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs @@ -112,8 +112,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts } channel.ImageUrl = FindProperty("tvg-logo", extInf, null); - channel.Number = FindProperty("tvg-id", extInf, channel.Number); channel.Number = FindProperty("channel-id", extInf, channel.Number); + channel.Number = FindProperty("tvg-id", extInf, channel.Number); channel.Name = FindProperty("tvg-name", extInf, channel.Name); channel.Name = FindProperty("tvg-id", extInf, channel.Name); return channel; |