Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Conflicts:
	MediaBrowser.Common.Implementations/BaseApplicationHost.cs
	MediaBrowser.ServerApplication/ApplicationHost.cs

1 files changed, 57 insertions, 0 deletions

diff --git a/MediaBrowser.Common/Updates/IPackageManager.cs b/MediaBrowser.Common/Updates/IPackageManager.cs
new file mode 100644
index 000000000..f3ca1d8cf
--- /dev/null
+++ b/MediaBrowser.Common/Updates/IPackageManager.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Kernel;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Common.Security;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Updates;
+
+namespace MediaBrowser.Common.Updates
+{
+    public interface IPackageManager
+    {
+        /// <summary>
+        /// Gets all available packages.
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="networkManager"></param>
+        /// <param name="securityManager"></param>
+        /// <param name="resourcePool"></param>
+        /// <param name="serializer"></param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{List{PackageInfo}}.</returns>
+        Task<IEnumerable<PackageInfo>> GetAvailablePackages(IHttpClient client,
+                                                            INetworkManager networkManager,
+                                                            ISecurityManager securityManager,
+                                                            ResourcePool resourcePool,
+                                                            IJsonSerializer serializer,
+                                                            CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Installs a package.
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="logger"></param>
+        /// <param name="resourcePool"></param>
+        /// <param name="progress"></param>
+        /// <param name="zipClient"></param>
+        /// <param name="appPaths"></param>
+        /// <param name="package">The package.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task InstallPackage(IHttpClient client,
+                            ILogger logger,
+                            ResourcePool resourcePool,
+                            IProgress<double> progress,
+                            IZipClient zipClient,
+                            IApplicationPaths appPaths,
+                            PackageVersionInfo package,
+                            CancellationToken cancellationToken);
+    }
+}