Merge pull request #1503 from MediaBrowser/dev

Dev

3 files changed, 52 insertions, 168 deletions

diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index cd21dc21a..442ab76f6 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -350,7 +350,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             foreach (var source in list)
             {
-                Normalize(source, item.ChannelType == ChannelType.TV);
+                Normalize(source, service, item.ChannelType == ChannelType.TV);
             }
 
             return list;
@@ -379,12 +379,13 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             {
                 MediaSourceInfo info;
                 bool isVideo;
+                ILiveTvService service;
 
                 if (isChannel)
                 {
                     var channel = GetInternalChannel(id);
                     isVideo = channel.ChannelType == ChannelType.TV;
-                    var service = GetService(channel);
+                    service = GetService(channel);
                     _logger.Info("Opening channel stream from {0}, external channel Id: {1}", service.Name, channel.ExternalId);
                     info = await service.GetChannelStream(channel.ExternalId, mediaSourceId, cancellationToken).ConfigureAwait(false);
                     info.RequiresClosing = true;
@@ -400,7 +401,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 {
                     var recording = await GetInternalRecording(id, cancellationToken).ConfigureAwait(false);
                     isVideo = !string.Equals(recording.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase);
-                    var service = GetService(recording);
+                    service = GetService(recording);
 
                     _logger.Info("Opening recording stream from {0}, external recording Id: {1}", service.Name, recording.ExternalId);
                     info = await service.GetRecordingStream(recording.ExternalId, null, cancellationToken).ConfigureAwait(false);
@@ -415,7 +416,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 }
 
                 _logger.Info("Live stream info: {0}", _jsonSerializer.SerializeToString(info));
-                Normalize(info, isVideo);
+                Normalize(info, service, isVideo);
 
                 var data = new LiveStreamData
                 {
@@ -440,7 +441,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             }
         }
 
-        private void Normalize(MediaSourceInfo mediaSource, bool isVideo)
+        private void Normalize(MediaSourceInfo mediaSource, ILiveTvService service, bool isVideo)
         {
             if (mediaSource.MediaStreams.Count == 0)
             {
@@ -537,6 +538,12 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                     mediaSource.Bitrate = total;
                 }
             }
+
+            if (!(service is EmbyTV.EmbyTV))
+            {
+                // We can't trust that we'll be able to direct stream it through emby server,  no matter what the provider says
+                mediaSource.SupportsDirectStream = true;
+            }
         }
 
         private async Task<LiveTvChannel> GetChannel(ChannelInfo channelInfo, string serviceName, Guid parentFolderId, CancellationToken cancellationToken)
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 67eb3d53b..c3db09457 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -354,7 +354,7 @@ namespace MediaBrowser.WebDashboard.Api
 
             if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase))
             {
-                sb.Append("<meta http-equiv=\"Content-Security-Policy\" content=\"default-src * 'unsafe-inline' 'unsafe-eval'\">");
+                sb.Append("<meta http-equiv=\"Content-Security-Policy\" content=\"default-src * 'unsafe-inline' 'unsafe-eval' data:;\">");
             }
 
             sb.Append("<link rel=\"manifest\" href=\"manifest.json\">");
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 9b2dfca19..3feb98b92 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -1690,247 +1690,124 @@
     <None Include="dashboard-ui\css\fonts\roboto\VvXUGKZXbHtX_S_VCTLpGhTbgVql8nDJpwnrE27mub0.woff2">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </None>

-    <Content Include="dashboard-ui\strings\html\ar.json">

+    <Content Include="dashboard-ui\strings\ar.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\bg-BG.json">

+    <Content Include="dashboard-ui\strings\bg-BG.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\ca.json">

+    <Content Include="dashboard-ui\strings\ca.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\cs.json">

+    <Content Include="dashboard-ui\strings\cs.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\da.json">

+    <Content Include="dashboard-ui\strings\da.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\de.json">

+    <Content Include="dashboard-ui\strings\de.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\el.json">

+    <Content Include="dashboard-ui\strings\el.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\en-GB.json">

+    <Content Include="dashboard-ui\strings\en-GB.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\en-US.json">

+    <Content Include="dashboard-ui\strings\en-US.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\es-AR.json">

+    <Content Include="dashboard-ui\strings\es-AR.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\es-MX.json">

+    <Content Include="dashboard-ui\strings\es-MX.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\es.json">

+    <Content Include="dashboard-ui\strings\es.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\fi.json">

+    <Content Include="dashboard-ui\strings\fi.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\fr.json">

+    <Content Include="dashboard-ui\strings\fr.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\gsw.json">

+    <Content Include="dashboard-ui\strings\gsw.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\he.json">

+    <Content Include="dashboard-ui\strings\he.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\hr.json">

+    <Content Include="dashboard-ui\strings\hr.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\it.json">

+    <Content Include="dashboard-ui\strings\it.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\kk.json">

+    <Content Include="dashboard-ui\strings\kk.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\ko.json">

+    <Content Include="dashboard-ui\strings\ko.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\ms.json">

+    <Content Include="dashboard-ui\strings\ms.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\nb.json">

+    <Content Include="dashboard-ui\strings\nb.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\nl.json">

+    <Content Include="dashboard-ui\strings\nl.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\pl.json">

+    <Content Include="dashboard-ui\strings\pl.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\pt-BR.json">

+    <Content Include="dashboard-ui\strings\pt-BR.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\pt-PT.json">

+    <Content Include="dashboard-ui\strings\pt-PT.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\ro.json">

+    <Content Include="dashboard-ui\strings\ro.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\ru.json">

+    <Content Include="dashboard-ui\strings\ru.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\server.json">

+    <Content Include="dashboard-ui\strings\server.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\sl-SI.json">

+    <Content Include="dashboard-ui\strings\sl-SI.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\sv.json">

+    <Content Include="dashboard-ui\strings\sv.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\tr.json">

+    <Content Include="dashboard-ui\strings\tr.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\uk.json">

+    <Content Include="dashboard-ui\strings\uk.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\vi.json">

+    <Content Include="dashboard-ui\strings\vi.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\zh-CN.json">

+    <Content Include="dashboard-ui\strings\zh-CN.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\strings\html\zh-TW.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\ar.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\be-BY.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\bg-BG.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\ca.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\cs.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\da.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\de.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\el.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\en-GB.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\en-US.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\es-AR.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\es-MX.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\es-VE.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\es.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\fi.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\fr.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\gsw.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\he.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\hr.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\hu.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\it.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\javascript.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\kk.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\ms.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\nb.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\nl.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\pl.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\pt-BR.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\pt-PT.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\ro.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\ru.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\sl-SI.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\sv.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\tr.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\uk.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\vi.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\zh-CN.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\strings\javascript\zh-TW.json">

+    <Content Include="dashboard-ui\strings\zh-TW.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

     <None Include="dashboard-ui\manifest.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </None>

-    <None Include="dashboard-ui\strings\html\hu.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </None>

-    <None Include="dashboard-ui\strings\html\id.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </None>

-    <None Include="dashboard-ui\strings\html\zh-HK.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </None>

-    <None Include="dashboard-ui\strings\javascript\id.json">

+    <None Include="dashboard-ui\strings\hu.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </None>

-    <None Include="dashboard-ui\strings\javascript\ko.json">

+    <None Include="dashboard-ui\strings\id.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </None>

-    <None Include="dashboard-ui\strings\javascript\zh-HK.json">

+    <None Include="dashboard-ui\strings\zh-HK.json">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </None>

     <Content Include="dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.table.js">