fix mac ffmpeg build

4 files changed, 19 insertions, 33 deletions

diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 471bc1a22..561940800 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -219,7 +219,8 @@ namespace MediaBrowser.ServerApplication
         private ISyncRepository SyncRepository { get; set; }
         private ITVSeriesManager TVSeriesManager { get; set; }
 
-        private StartupOptions _startupOptions;
+        private readonly StartupOptions _startupOptions;
+        private readonly string _remotePackageName;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ApplicationHost" /> class.
@@ -229,14 +230,16 @@ namespace MediaBrowser.ServerApplication
         /// <param name="supportsRunningAsService">if set to <c>true</c> [supports running as service].</param>
         /// <param name="isRunningAsService">if set to <c>true</c> [is running as service].</param>
         /// <param name="options">The options.</param>
+        /// <param name="remotePackageName">Name of the remote package.</param>
         public ApplicationHost(ServerApplicationPaths applicationPaths, 
             ILogManager logManager, 
             bool supportsRunningAsService, 
             bool isRunningAsService,
-            StartupOptions options)
+            StartupOptions options, string remotePackageName)
             : base(applicationPaths, logManager)
         {
             _startupOptions = options;
+            _remotePackageName = remotePackageName;
             _isRunningAsService = isRunningAsService;
             SupportsRunningAsService = supportsRunningAsService;
         }
@@ -1091,9 +1094,17 @@ namespace MediaBrowser.ServerApplication
         /// <returns>Task{CheckForUpdateResult}.</returns>
         public override async Task<CheckForUpdateResult> CheckForApplicationUpdate(CancellationToken cancellationToken, IProgress<double> progress)
         {
-            var result = await NativeApp.CheckForApplicationUpdate(ApplicationVersion,
-                        ConfigurationManager.CommonConfiguration.SystemUpdateLevel, InstallationManager,
-                        cancellationToken, progress).ConfigureAwait(false);
+            var availablePackages = await InstallationManager.GetAvailablePackagesWithoutRegistrationInfo(cancellationToken).ConfigureAwait(false);
+
+            var version = InstallationManager.GetLatestCompatibleVersion(availablePackages, _remotePackageName, null, ApplicationVersion, ConfigurationManager.CommonConfiguration.SystemUpdateLevel);
+
+            var versionObject = version == null || string.IsNullOrWhiteSpace(version.versionStr) ? null : new Version(version.versionStr);
+
+            var isUpdateAvailable = versionObject != null && versionObject > ApplicationVersion;
+
+            var result = versionObject != null ?
+                new CheckForUpdateResult { AvailableVersion = versionObject.ToString(), IsUpdateAvailable = isUpdateAvailable, Package = version } :
+                new CheckForUpdateResult { AvailableVersion = ApplicationVersion.ToString(), IsUpdateAvailable = false };
 
             HasUpdateAvailable = result.IsUpdateAvailable;
 
diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
index dc20653d7..907067148 100644
--- a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
+++ b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
@@ -57,7 +57,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
                                 case "FFProbeFilename":
                                     return "ffprobe";
                                 case "ArchiveType":
-                                    return "gz";
+                                    return "7z";
                             }
                         }
                         if (PlatformDetection.IsX86)
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index 33529a31a..15fd7af74 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -209,7 +209,7 @@ namespace MediaBrowser.ServerApplication
         /// <param name="options">The options.</param>
         private static void RunApplication(ServerApplicationPaths appPaths, ILogManager logManager, bool runService, StartupOptions options)
         {
-            _appHost = new ApplicationHost(appPaths, logManager, true, runService, options);
+            _appHost = new ApplicationHost(appPaths, logManager, true, runService, options, "MBServer");
 
             var initProgress = new Progress<double>();
 
diff --git a/MediaBrowser.ServerApplication/Native/NativeApp.cs b/MediaBrowser.ServerApplication/Native/NativeApp.cs
index 0e7dc50a9..2388b610b 100644
--- a/MediaBrowser.ServerApplication/Native/NativeApp.cs
+++ b/MediaBrowser.ServerApplication/Native/NativeApp.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Updates;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Updates;
+using System.Runtime.InteropServices;
 
 namespace MediaBrowser.ServerApplication.Native
 {
@@ -90,24 +84,5 @@ namespace MediaBrowser.ServerApplication.Native
                 EXECUTION_STATE es = SetThreadExecutionState(EXECUTION_STATE.ES_SYSTEM_REQUIRED);
             }
         }
-
-        public static async Task<CheckForUpdateResult> CheckForApplicationUpdate(Version currentVersion,
-            PackageVersionClass updateLevel,
-            IInstallationManager installationManager,
-            CancellationToken cancellationToken,
-            IProgress<double> progress)
-        {
-            var availablePackages = await installationManager.GetAvailablePackagesWithoutRegistrationInfo(cancellationToken).ConfigureAwait(false);
-
-            var version = installationManager.GetLatestCompatibleVersion(availablePackages, "MBServer", null, currentVersion, updateLevel);
-
-            var versionObject = version == null || string.IsNullOrWhiteSpace(version.versionStr) ? null : new Version(version.versionStr);
-
-            var isUpdateAvailable = versionObject != null && versionObject > currentVersion;
-
-            return versionObject != null ?
-                new CheckForUpdateResult { AvailableVersion = versionObject.ToString(), IsUpdateAvailable = isUpdateAvailable, Package = version } :
-                new CheckForUpdateResult { AvailableVersion = currentVersion.ToString(), IsUpdateAvailable = false };
-        }
     }
 }