Merge pull request #3328 from MediaBrowser/dev

rework width/height properties
MediaBrowser · Jun 15, 2018 · cd58ce7 · cd58ce7
2 parents 6c1b3d7 + 08eba08
commit cd58ce7
Show file tree

Hide file tree

Showing 88 changed files with 380 additions and 326 deletions.
diff --git a/BDInfo/BDInfo.csproj b/BDInfo/BDInfo.csproj
@@ -34,10 +34,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/BDInfo/packages.config b/BDInfo/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
 </packages>
diff --git a/DvdLib/DvdLib.csproj b/DvdLib/DvdLib.csproj
@@ -49,10 +49,10 @@
     <Compile Include="Ifo\VideoAttributes.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/DvdLib/packages.config b/DvdLib/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
 </packages>
diff --git a/Emby.Dlna/Didl/DidlBuilder.cs b/Emby.Dlna/Didl/DidlBuilder.cs
@@ -205,19 +205,13 @@ private void AddVideoResource(DlnaOptions options, XmlWriter writer, BaseItem vi
                 streamInfo = new StreamBuilder(_mediaEncoder, GetStreamBuilderLogger(options)).BuildVideoItem(new VideoOptions
                 {
                     ItemId = video.Id,
-                    MediaSources = sources.ToArray(sources.Count),
+                    MediaSources = sources.ToArray(),
                     Profile = _profile,
                     DeviceId = deviceId,
                     MaxBitrate = _profile.MaxStreamingBitrate
                 });
             }
 
-            if (string.Equals(Path.GetExtension(video.Path), ".m2ts", StringComparison.OrdinalIgnoreCase))
-            {
-                var a = 1;
-                var b = a;
-            }
-
             var targetWidth = streamInfo.TargetWidth;
             var targetHeight = streamInfo.TargetHeight;
 

diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs
@@ -220,7 +220,7 @@ public DeviceProfile GetProfile(IDictionary<string, string> headers)
             }
             else
             {
-                var headerString = string.Join(", ", headers.Select(i => string.Format("{0}={1}", i.Key, i.Value)).ToArray(headers.Count));
+                var headerString = string.Join(", ", headers.Select(i => string.Format("{0}={1}", i.Key, i.Value)).ToArray());
                 _logger.Debug("No matching device profile found. {0}", headerString);
             }
 

diff --git a/Emby.Dlna/Emby.Dlna.csproj b/Emby.Dlna/Emby.Dlna.csproj
@@ -174,13 +174,13 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs
@@ -551,7 +551,7 @@ private PlaylistItem GetPlaylistItem(BaseItem item, List<MediaSourceInfo> mediaS
                     StreamInfo = new StreamBuilder(_mediaEncoder, GetStreamBuilderLogger()).BuildVideoItem(new VideoOptions
                     {
                         ItemId = item.Id,
-                        MediaSources = mediaSources.ToArray(mediaSources.Count),
+                        MediaSources = mediaSources.ToArray(),
                         Profile = profile,
                         DeviceId = deviceId,
                         MaxBitrate = profile.MaxStreamingBitrate,

diff --git a/Emby.Dlna/Server/DescriptionXmlBuilder.cs b/Emby.Dlna/Server/DescriptionXmlBuilder.cs
@@ -230,7 +230,7 @@ private string GetFriendlyName()
                 }
             }
 
-            var characters = characterList.ToArray(characterList.Count);
+            var characters = characterList.ToArray();
 
             var serverName = new string(characters);
 

diff --git a/Emby.Dlna/Service/BaseControlHandler.cs b/Emby.Dlna/Service/BaseControlHandler.cs
@@ -255,7 +255,7 @@ private void LogResponse(ControlResponse response)
             }
 
             var originalHeaders = response.Headers;
-            var headers = string.Join(", ", originalHeaders.Select(i => string.Format("{0}={1}", i.Key, i.Value)).ToArray(originalHeaders.Count));
+            var headers = string.Join(", ", originalHeaders.Select(i => string.Format("{0}={1}", i.Key, i.Value)).ToArray());
             //builder.Append(response.Xml);
 
             Logger.Debug("Control response. Headers: {0}", headers);

diff --git a/Emby.Dlna/packages.config b/Emby.Dlna/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
-  <package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net47" />
 </packages>
diff --git a/Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj b/Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj
@@ -35,13 +35,13 @@
       <HintPath>..\packages\ImageMagickSharp.1.0.0.19\lib\net45\ImageMagickSharp.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Emby.Drawing.ImageMagick/packages.config b/Emby.Drawing.ImageMagick/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ImageMagickSharp" version="1.0.0.19" targetFramework="net452" />
-  <package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
-  <package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
 </packages>
diff --git a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
@@ -43,13 +43,13 @@
     <Compile Include="StripCollageBuilder.cs" />
     <Compile Include="UnplayedCountIndicator.cs" />
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/Emby.Drawing.Skia/packages.config b/Emby.Drawing.Skia/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
-  <package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
   <package id="SkiaSharp" version="1.58.1" targetFramework="portable45-net45+win8" requireReinstallation="true" />
 </packages>
diff --git a/Emby.Drawing/Emby.Drawing.csproj b/Emby.Drawing/Emby.Drawing.csproj
@@ -41,13 +41,13 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/Emby.Drawing/packages.config b/Emby.Drawing/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
-  <package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
 </packages>
diff --git a/Emby.Photos/Emby.Photos.csproj b/Emby.Photos/Emby.Photos.csproj
@@ -32,13 +32,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.49-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="TagLib.Portable">
       <HintPath>..\ThirdParty\taglib\TagLib.Portable.dll</HintPath>

diff --git a/Emby.Photos/PhotoProvider.cs b/Emby.Photos/PhotoProvider.cs
@@ -179,7 +179,7 @@ public Task<ItemUpdateType> FetchAsync(Photo item, MetadataRefreshOptions option
                 }
             }
 
-            if (!item.Width.HasValue || !item.Height.HasValue)
+            if (item.Width <= 0 || item.Height <= 0)
             {
                 var img = item.GetImageInfo(ImageType.Primary, 0);
 

diff --git a/Emby.Photos/packages.config b/Emby.Photos/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.Common" version="3.3.49-beta" targetFramework="net47" />
-  <package id="MediaBrowser.Server.Core" version="3.3.49-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
 </packages>
diff --git a/Emby.Server.Implementations/Browser/BrowserLauncher.cs b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
@@ -13,42 +13,29 @@ public static class BrowserLauncher
         /// </summary>
         /// <param name="page">The page.</param>
         /// <param name="appHost">The app host.</param>
-        public static void OpenDashboardPage(string page, IServerApplicationHost appHost)
+        private static void OpenDashboardPage(string page, IServerApplicationHost appHost)
         {
             var url = appHost.GetLocalApiUrl("localhost") + "/web/" + page;
 
             OpenUrl(appHost, url);
         }
 
-        /// <summary>
-        /// Opens the community.
-        /// </summary>
-        public static void OpenCommunity(IServerApplicationHost appHost)
-        {
-            OpenUrl(appHost, "https://emby.media/community");
-        }
-
-        public static void OpenEmbyPremiere(IServerApplicationHost appHost)
-        {
-            OpenDashboardPage("supporterkey.html", appHost);
-        }
-
         /// <summary>
         /// Opens the web client.
         /// </summary>
         /// <param name="appHost">The app host.</param>
-        public static void OpenWebClient(IServerApplicationHost appHost)
+        public static void OpenWizard(IServerApplicationHost appHost)
         {
-            OpenDashboardPage("index.html", appHost);
+            OpenDashboardPage("index.html?start=wizard", appHost);
         }
 
         /// <summary>
-        /// Opens the dashboard.
+        /// Opens the web client.
         /// </summary>
         /// <param name="appHost">The app host.</param>
-        public static void OpenDashboard(IServerApplicationHost appHost)
+        public static void OpenWebApp(IServerApplicationHost appHost)
         {
-            OpenDashboardPage("dashboard.html", appHost);
+            OpenDashboardPage("index.html", appHost);
         }
 
         /// <summary>