update portable projects

2026-06-12 18:50:23 +01:00 · 2016-11-11 12:33:10 -05:00
parent 13ec531b14
commit 5655787c1a
38 changed files with 639 additions and 236 deletions
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
--- a/MediaBrowser.Server.Startup.Common/HttpServerFactory.cs
+++ b/MediaBrowser.Server.Startup.Common/HttpServerFactory.cs
@@ -1,107 +0,0 @@
-using System;
-using System.IO;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
-using Emby.Common.Implementations.Net;
-using Emby.Server.Implementations.HttpServer;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Cryptography;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.System;
-using MediaBrowser.Model.Text;
-using ServiceStack.Text.Jsv;
-using SocketHttpListener.Primitives;
-
-namespace MediaBrowser.Server.Startup.Common
-{
-    /// <summary>
-    /// Class ServerFactory
-    /// </summary>
-    public static class HttpServerFactory
-    {
-        /// <summary>
-        /// Creates the server.
-        /// </summary>
-        /// <returns>IHttpServer.</returns>
-        public static IHttpServer CreateServer(IServerApplicationHost applicationHost,
-            ILogManager logManager,
-            IServerConfigurationManager config, 
-            INetworkManager networkmanager,
-            IMemoryStreamFactory streamProvider,
-            string serverName, 
-            string defaultRedirectpath,
-            ITextEncoding textEncoding,
-            ISocketFactory socketFactory,
-            ICryptoProvider cryptoProvider,
-            IJsonSerializer json,
-            IXmlSerializer xml,
-            IEnvironmentInfo environment,
-            ICertificate certificate)
-        {
-            var logger = logManager.GetLogger("HttpServer");
-
-            return new HttpListenerHost(applicationHost,
-                logger, 
-                config, 
-                serverName, 
-                defaultRedirectpath, 
-                networkmanager, 
-                streamProvider, 
-                textEncoding, 
-                socketFactory, 
-                cryptoProvider, 
-                json, 
-                xml,
-                environment,
-                certificate,
-                new StreamFactory(),
-                GetParseFn);
-        }
-
-        private static Func<string, object> GetParseFn(Type propertyType)
-        {
-            return s => JsvReader.GetParseFn(propertyType)(s);
-        }
-    }
-
-    public class StreamFactory : IStreamFactory
-    {
-        public Stream CreateNetworkStream(ISocket socket, bool ownsSocket)
-        {
-            var netSocket = (NetSocket)socket;
-
-            return new NetworkStream(netSocket.Socket, ownsSocket);
-        }
-
-        public Task AuthenticateSslStreamAsServer(Stream stream, ICertificate certificate)
-        {
-            var sslStream = (SslStream)stream;
-            var cert = (Certificate)certificate;
-
-            return sslStream.AuthenticateAsServerAsync(cert.X509Certificate);
-        }
-
-        public Stream CreateSslStream(Stream innerStream, bool leaveInnerStreamOpen)
-        {
-            return new SslStream(innerStream, leaveInnerStreamOpen);
-        }
-    }
-
-    public class Certificate : ICertificate
-    {
-        public Certificate(X509Certificate x509Certificate)
-        {
-            X509Certificate = x509Certificate;
-        }
-
-        public X509Certificate X509Certificate { get; private set; }
-    }
-}
--- a/MediaBrowser.Server.Startup.Common/ImageEncoderHelper.cs
+++ b/MediaBrowser.Server.Startup.Common/ImageEncoderHelper.cs
@@ -0,0 +1,46 @@
+using Emby.Drawing;
+using Emby.Drawing.Net;
+using Emby.Drawing.ImageMagick;
+using Emby.Server.Core;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+
+namespace MediaBrowser.Server.Startup.Common
+{
+    public class ImageEncoderHelper
+    {
+        public static IImageEncoder GetImageEncoder(ILogger logger, 
+            ILogManager logManager, 
+            IFileSystem fileSystem, 
+            StartupOptions startupOptions, 
+            IHttpClient httpClient,
+            IServerConfigurationManager config)
+        {
+            if (!startupOptions.ContainsOption("-enablegdi"))
+            {
+                try
+                {
+                    return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), config.ApplicationPaths, httpClient, fileSystem, config);
+                }
+                catch
+                {
+                    logger.Error("Error loading ImageMagick. Will revert to GDI.");
+                }
+            }
+
+            try
+            {
+                return new GDIImageEncoder(fileSystem, logManager.GetLogger("GDI"));
+            }
+            catch
+            {
+                logger.Error("Error loading GDI. Will revert to NullImageEncoder.");
+            }
+
+            return new NullImageEncoder();
+        }
+    }
+}
--- a/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
+++ b/MediaBrowser.Server.Startup.Common/MediaBrowser.Server.Startup.Common.csproj
@@ -60,8 +60,8 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll</HintPath>
    </Reference>
-    <Reference Include="Patterns.Logging, Version=1.0.6151.30227, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Patterns.Logging.1.0.0.6\lib\portable-net45+win8\Patterns.Logging.dll</HintPath>
+    <Reference Include="Patterns.Logging, Version=1.0.6159.22455, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Patterns.Logging.1.0.0.7\lib\netstandard1.3\Patterns.Logging.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="ServiceStack, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -76,9 +76,9 @@
      <HintPath>..\packages\SimpleInjector.3.2.4\lib\net45\SimpleInjector.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="SocketHttpListener.Portable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ThirdParty\emby\SocketHttpListener.Portable.dll</HintPath>
+    <Reference Include="SocketHttpListener, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SocketHttpListener.Portable.1.0.50\lib\portable-net45+win8\SocketHttpListener.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Configuration" />
@@ -93,7 +93,6 @@
    <Compile Include="..\SharedVersion.cs">
      <Link>Properties\SharedVersion.cs</Link>
    </Compile>
-    <Compile Include="ApplicationHost.cs" />
    <Compile Include="ApplicationPathHelper.cs" />
    <Compile Include="Cryptography\ASN1.cs" />
    <Compile Include="Cryptography\ASN1Convert.cs" />
@@ -113,7 +112,7 @@
    <Compile Include="Cryptography\X509Extension.cs" />
    <Compile Include="Cryptography\X509Extensions.cs" />
    <Compile Include="Cryptography\X520Attributes.cs" />
-    <Compile Include="HttpServerFactory.cs" />
+    <Compile Include="ImageEncoderHelper.cs" />
    <Compile Include="IO\MemoryStreamProvider.cs" />
    <Compile Include="LiveTv\TunerHosts\SatIp\ChannelScan.cs" />
    <Compile Include="LiveTv\TunerHosts\SatIp\Rtcp\ReportBlock.cs" />
@@ -145,6 +144,14 @@
      <Project>{805844ab-e92f-45e6-9d99-4f6d48d129a5}</Project>
      <Name>Emby.Dlna</Name>
    </ProjectReference>
+    <ProjectReference Include="..\Emby.Drawing.ImageMagick\Emby.Drawing.ImageMagick.csproj">
+      <Project>{6cfee013-6e7c-432b-ac37-cabf0880c69a}</Project>
+      <Name>Emby.Drawing.ImageMagick</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Emby.Drawing.Net\Emby.Drawing.Net.csproj">
+      <Project>{c97a239e-a96c-4d64-a844-ccf8cc30aecb}</Project>
+      <Name>Emby.Drawing.Net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj">
      <Project>{08fff49b-f175-4807-a2b5-73b0ebd9f716}</Project>
      <Name>Emby.Drawing</Name>
--- a/MediaBrowser.Server.Startup.Common/packages.config
+++ b/MediaBrowser.Server.Startup.Common/packages.config
@@ -4,7 +4,8 @@
  <package id="MediaBrowser.Naming" version="1.0.0.59" targetFramework="net46" />
  <package id="Microsoft.IO.RecyclableMemoryStream" version="1.1.0.0" targetFramework="net46" />
  <package id="Mono.Posix" version="4.0.0.0" targetFramework="net45" />
-  <package id="Patterns.Logging" version="1.0.0.6" targetFramework="net46" />
+  <package id="Patterns.Logging" version="1.0.0.7" targetFramework="net46" />
  <package id="ServiceStack.Text" version="4.5.4" targetFramework="net46" />
  <package id="SimpleInjector" version="3.2.4" targetFramework="net46" />
+  <package id="SocketHttpListener.Portable" version="1.0.50" targetFramework="net46" />
 </packages>