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

Conflicts:
	MediaBrowser.Controller/Providers/FanartBaseProvider.cs
	MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs

5 files changed, 0 insertions, 550 deletions

diff --git a/MediaBrowser.ClickOnce/ApplicationUpdateCheck.cs b/MediaBrowser.ClickOnce/ApplicationUpdateCheck.cs
deleted file mode 100644
index 72c42f586..000000000
--- a/MediaBrowser.ClickOnce/ApplicationUpdateCheck.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using MediaBrowser.Model.Updates;
-using System;
-using System.Deployment.Application;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.ClickOnce
-{
-    /// <summary>
-    /// Class ApplicationUpdateCheck
-    /// </summary>
-    public class ApplicationUpdateCheck
-    {
-        /// <summary>
-        /// The _task completion source
-        /// </summary>
-        private TaskCompletionSource<CheckForUpdateResult> _taskCompletionSource;
-
-        /// <summary>
-        /// The _progress
-        /// </summary>
-        private IProgress<double> _progress;
-
-        /// <summary>
-        /// Checks for application update.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="progress">The progress.</param>
-        /// <returns>Task{CheckForUpdateCompletedEventArgs}.</returns>
-        /// <exception cref="System.InvalidOperationException">Current deployment is not a ClickOnce deployment</exception>
-        public Task<CheckForUpdateResult> CheckForApplicationUpdate(CancellationToken cancellationToken, IProgress<double> progress)
-        {
-            if (!ApplicationDeployment.IsNetworkDeployed)
-            {
-                throw new InvalidOperationException("Current deployment is not network deployed.");
-            }
-
-            _progress = progress;
-
-            _taskCompletionSource = new TaskCompletionSource<CheckForUpdateResult>();
-
-            var deployment = ApplicationDeployment.CurrentDeployment;
-
-            cancellationToken.Register(deployment.CheckForUpdateAsyncCancel);
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            deployment.CheckForUpdateCompleted += deployment_CheckForUpdateCompleted;
-            deployment.CheckForUpdateProgressChanged += deployment_CheckForUpdateProgressChanged;
-
-            deployment.CheckForUpdateAsync();
-
-            return _taskCompletionSource.Task;
-        }
-
-        /// <summary>
-        /// To the result.
-        /// </summary>
-        /// <param name="args">The <see cref="CheckForUpdateCompletedEventArgs" /> instance containing the event data.</param>
-        /// <returns>CheckForUpdateResult.</returns>
-        private CheckForUpdateResult ToResult(CheckForUpdateCompletedEventArgs args)
-        {
-            return new CheckForUpdateResult
-            {
-                AvailableVersion = args.AvailableVersion,
-                IsUpdateAvailable = args.UpdateAvailable
-            };
-        }
-
-        /// <summary>
-        /// Handles the CheckForUpdateCompleted event of the deployment control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="CheckForUpdateCompletedEventArgs" /> instance containing the event data.</param>
-        void deployment_CheckForUpdateCompleted(object sender, CheckForUpdateCompletedEventArgs e)
-        {
-            var deployment = ApplicationDeployment.CurrentDeployment;
-
-            deployment.CheckForUpdateCompleted -= deployment_CheckForUpdateCompleted;
-            deployment.CheckForUpdateProgressChanged -= deployment_CheckForUpdateProgressChanged;
-
-            if (e.Error != null)
-            {
-                _taskCompletionSource.SetException(e.Error);
-            }
-            else if (e.Cancelled)
-            {
-                _taskCompletionSource.SetCanceled();
-            }
-            else
-            {
-                _taskCompletionSource.SetResult(ToResult(e));
-            }
-        }
-
-        /// <summary>
-        /// Handles the CheckForUpdateProgressChanged event of the deployment control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="DeploymentProgressChangedEventArgs" /> instance containing the event data.</param>
-        void deployment_CheckForUpdateProgressChanged(object sender, DeploymentProgressChangedEventArgs e)
-        {
-            _progress.Report(e.ProgressPercentage);
-        }
-    }
-}
diff --git a/MediaBrowser.ClickOnce/ApplicationUpdater.cs b/MediaBrowser.ClickOnce/ApplicationUpdater.cs
deleted file mode 100644
index 29af406f1..000000000
--- a/MediaBrowser.ClickOnce/ApplicationUpdater.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Deployment.Application;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.ClickOnce
-{
-    /// <summary>
-    /// Class ApplicationUpdater
-    /// </summary>
-    public class ApplicationUpdater
-    {
-        /// <summary>
-        /// The _task completion source
-        /// </summary>
-        private TaskCompletionSource<AsyncCompletedEventArgs> _taskCompletionSource;
-
-        /// <summary>
-        /// The _progress
-        /// </summary>
-        private IProgress<double> _progress;
-
-        /// <summary>
-        /// Updates the application
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="progress">The progress.</param>
-        /// <returns>Task{AsyncCompletedEventArgs}.</returns>
-        /// <exception cref="System.InvalidOperationException">Current deployment is not network deployed.</exception>
-        public Task<AsyncCompletedEventArgs> UpdateApplication(CancellationToken cancellationToken, IProgress<double> progress)
-        {
-            if (!ApplicationDeployment.IsNetworkDeployed)
-            {
-                throw new InvalidOperationException("Current deployment is not network deployed.");
-            }
-
-            _progress = progress;
-
-            _taskCompletionSource = new TaskCompletionSource<AsyncCompletedEventArgs>();
-
-            var deployment = ApplicationDeployment.CurrentDeployment;
-
-            cancellationToken.Register(deployment.UpdateAsyncCancel);
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            deployment.UpdateCompleted += deployment_UpdateCompleted;
-            deployment.UpdateProgressChanged += deployment_UpdateProgressChanged;
-
-            deployment.UpdateAsync();
-
-            return _taskCompletionSource.Task;
-        }
-
-        /// <summary>
-        /// Handles the UpdateCompleted event of the deployment control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="AsyncCompletedEventArgs" /> instance containing the event data.</param>
-        void deployment_UpdateCompleted(object sender, AsyncCompletedEventArgs e)
-        {
-            var deployment = ApplicationDeployment.CurrentDeployment;
-
-            deployment.UpdateCompleted -= deployment_UpdateCompleted;
-            deployment.UpdateProgressChanged -= deployment_UpdateProgressChanged;
-
-            if (e.Error != null)
-            {
-                _taskCompletionSource.SetException(e.Error);
-            }
-            else if (e.Cancelled)
-            {
-                _taskCompletionSource.SetCanceled();
-            }
-            else
-            {
-                _taskCompletionSource.SetResult(e);
-            }
-        }
-
-        /// <summary>
-        /// Handles the UpdateProgressChanged event of the deployment control.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="DeploymentProgressChangedEventArgs" /> instance containing the event data.</param>
-        void deployment_UpdateProgressChanged(object sender, DeploymentProgressChangedEventArgs e)
-        {
-            _progress.Report(e.ProgressPercentage);
-        }
-    }
-}
diff --git a/MediaBrowser.ClickOnce/ClickOnceHelper.cs b/MediaBrowser.ClickOnce/ClickOnceHelper.cs
deleted file mode 100644
index c86332ccf..000000000
--- a/MediaBrowser.ClickOnce/ClickOnceHelper.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-using System.Deployment.Application;
-using Microsoft.Win32;
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Security.AccessControl;
-
-namespace MediaBrowser.ClickOnce
-{
-    /// <summary>
-    /// Class ClickOnceHelper
-    /// </summary>
-    public class ClickOnceHelper
-    {
-        /// <summary>
-        /// The uninstall string
-        /// </summary>
-        private const string UninstallString = "UninstallString";
-        /// <summary>
-        /// The display name key
-        /// </summary>
-        private const string DisplayNameKey = "DisplayName";
-        /// <summary>
-        /// The uninstall string file
-        /// </summary>
-        private const string UninstallStringFile = "UninstallString.bat";
-        /// <summary>
-        /// The appref extension
-        /// </summary>
-        private const string ApprefExtension = ".appref-ms";
-        /// <summary>
-        /// The uninstall registry key
-        /// </summary>
-        private readonly RegistryKey UninstallRegistryKey;
-
-        /// <summary>
-        /// Gets the location.
-        /// </summary>
-        /// <value>The location.</value>
-        private static string Location
-        {
-            get { return Assembly.GetExecutingAssembly().Location; }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is network deployed.
-        /// </summary>
-        /// <value><c>true</c> if this instance is network deployed; otherwise, <c>false</c>.</value>
-        public static bool IsNetworkDeployed
-        {
-            get { return ApplicationDeployment.IsNetworkDeployed; }
-        }
-
-        /// <summary>
-        /// Gets the name of the publisher.
-        /// </summary>
-        /// <value>The name of the publisher.</value>
-        public string PublisherName { get; private set; }
-        /// <summary>
-        /// Gets the name of the product.
-        /// </summary>
-        /// <value>The name of the product.</value>
-        public string ProductName { get; private set; }
-        /// <summary>
-        /// Gets the uninstall file.
-        /// </summary>
-        /// <value>The uninstall file.</value>
-        public string UninstallFile { get; private set; }
-        /// <summary>
-        /// Gets the name of the suite.
-        /// </summary>
-        /// <value>The name of the suite.</value>
-        public string SuiteName { get; private set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ClickOnceHelper" /> class.
-        /// </summary>
-        /// <param name="publisherName">Name of the publisher.</param>
-        /// <param name="productName">Name of the product.</param>
-        /// <param name="suiteName">Name of the suite.</param>
-        public ClickOnceHelper(string publisherName, string productName, string suiteName)
-        {
-            PublisherName = publisherName;
-            ProductName = productName;
-            SuiteName = suiteName;
-
-            var publisherFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), PublisherName);
-
-            if (!Directory.Exists(publisherFolder))
-            {
-                Directory.CreateDirectory(publisherFolder);
-            }
-
-            UninstallFile = Path.Combine(publisherFolder, UninstallStringFile);
-
-            UninstallRegistryKey = GetUninstallRegistryKeyByProductName(ProductName);
-        }
-
-        /// <summary>
-        /// Gets the shortcut path.
-        /// </summary>
-        /// <returns>System.String.</returns>
-        private string GetShortcutPath()
-        {
-            var allProgramsPath = Environment.GetFolderPath(Environment.SpecialFolder.Programs);
-
-            var shortcutPath = Path.Combine(allProgramsPath, PublisherName);
-
-            if (!string.IsNullOrEmpty(SuiteName))
-            {
-                shortcutPath = Path.Combine(shortcutPath, SuiteName);
-            }
-
-            return Path.Combine(shortcutPath, ProductName) + ApprefExtension;
-        }
-
-        /// <summary>
-        /// Gets the startup shortcut path.
-        /// </summary>
-        /// <returns>System.String.</returns>
-        private string GetStartupShortcutPath()
-        {
-            var startupPath = Environment.GetFolderPath(Environment.SpecialFolder.Startup);
-            
-            return Path.Combine(startupPath, ProductName) + ApprefExtension;
-        }
-
-        /// <summary>
-        /// Adds the shortcut to startup.
-        /// </summary>
-        public void AddShortcutToStartup()
-        {
-            var startupPath = GetStartupShortcutPath();
-
-            if (!File.Exists(startupPath))
-            {
-                File.Copy(GetShortcutPath(), startupPath);
-            }
-        }
-
-        /// <summary>
-        /// Removes the shortcut from startup.
-        /// </summary>
-        public void RemoveShortcutFromStartup()
-        {
-            var startupPath = GetStartupShortcutPath();
-
-            if (File.Exists(startupPath))
-            {
-                File.Delete(startupPath);
-            }
-        }
-
-        /// <summary>
-        /// Updates the uninstall parameters.
-        /// </summary>
-        /// <param name="uninstallerFileName">Name of the uninstaller file.</param>
-        public void UpdateUninstallParameters(string uninstallerFileName)
-        {
-            if (UninstallRegistryKey != null)
-            {
-                UpdateUninstallString(uninstallerFileName);
-            }
-        }
-
-        /// <summary>
-        /// Gets the name of the uninstall registry key by product.
-        /// </summary>
-        /// <param name="productName">Name of the product.</param>
-        /// <returns>RegistryKey.</returns>
-        private RegistryKey GetUninstallRegistryKeyByProductName(string productName)
-        {
-            var subKey = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Uninstall");
-
-            if (subKey == null)
-            {
-                return null;
-            }
-
-            return subKey.GetSubKeyNames()
-                .Select(name => subKey.OpenSubKey(name, RegistryKeyPermissionCheck.ReadWriteSubTree, RegistryRights.QueryValues | RegistryRights.ReadKey | RegistryRights.SetValue))
-                .Where(application => application != null)
-                .FirstOrDefault(application => application.GetValueNames().Where(appKey => appKey.Equals(DisplayNameKey)).Any(appKey => application.GetValue(appKey).Equals(productName)));
-        }
-
-        /// <summary>
-        /// Updates the uninstall string.
-        /// </summary>
-        /// <param name="uninstallerFileName">Name of the uninstaller file.</param>
-        private void UpdateUninstallString(string uninstallerFileName)
-        {
-            var uninstallString = (string)UninstallRegistryKey.GetValue(UninstallString);
-
-            if (!string.IsNullOrEmpty(UninstallFile) && uninstallString.StartsWith("rundll32.exe", StringComparison.OrdinalIgnoreCase))
-            {
-                File.WriteAllText(UninstallFile, uninstallString);
-            }
-
-            var str = String.Format("\"{0}\" uninstall", Path.Combine(Path.GetDirectoryName(Location), uninstallerFileName));
-
-            UninstallRegistryKey.SetValue(UninstallString, str);
-        }
-
-        /// <summary>
-        /// Uninstalls this instance.
-        /// </summary>
-        public void Uninstall()
-        {
-            RemoveShortcutFromStartup();
-
-            var uninstallString = File.ReadAllText(UninstallFile);
-
-            new Process
-            {
-                StartInfo =
-                {
-                    Arguments = uninstallString.Substring(uninstallString.IndexOf(" ", StringComparison.OrdinalIgnoreCase) + 1),
-                    FileName = uninstallString.Substring(0, uninstallString.IndexOf(" ", StringComparison.OrdinalIgnoreCase)),
-                    UseShellExecute = false
-                }
-
-            }.Start();
-        }
-
-        /// <summary>
-        /// Configures the click once startup.
-        /// </summary>
-        /// <param name="publisherName">Name of the publisher.</param>
-        /// <param name="productName">Name of the product.</param>
-        /// <param name="suiteName">Name of the suite.</param>
-        /// <param name="runAtStartup">if set to <c>true</c> [run at startup].</param>
-        /// <param name="uninstallerFilename">The uninstaller filename.</param>
-        public static void ConfigureClickOnceStartupIfInstalled(string publisherName, string productName, string suiteName, bool runAtStartup, string uninstallerFilename)
-        {
-            if (!ApplicationDeployment.IsNetworkDeployed)
-            {
-                return;
-            }
-
-            var clickOnceHelper = new ClickOnceHelper(publisherName, productName, suiteName);
-
-            if (runAtStartup)
-            {
-                clickOnceHelper.UpdateUninstallParameters(uninstallerFilename);
-                clickOnceHelper.AddShortcutToStartup();
-            }
-            else
-            {
-                clickOnceHelper.RemoveShortcutFromStartup();
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.ClickOnce/MediaBrowser.ClickOnce.csproj b/MediaBrowser.ClickOnce/MediaBrowser.ClickOnce.csproj
deleted file mode 100644
index eb566fd7f..000000000
--- a/MediaBrowser.ClickOnce/MediaBrowser.ClickOnce.csproj
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{CC96BF3E-0BDA-4809-BC4B-BB6D418F4A84}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MediaBrowser.ClickOnce</RootNamespace>
-    <AssemblyName>MediaBrowser.ClickOnce</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs">
-      <Link>Properties\SharedVersion.cs</Link>
-    </Compile>
-    <Compile Include="ApplicationUpdateCheck.cs" />
-    <Compile Include="ApplicationUpdater.cs" />
-    <Compile Include="ClickOnceHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
-      <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
-      <Name>MediaBrowser.Model</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>if $(ConfigurationName) == Release (
-xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i
-)</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/MediaBrowser.ClickOnce/Properties/AssemblyInfo.cs b/MediaBrowser.ClickOnce/Properties/AssemblyInfo.cs
deleted file mode 100644
index c3947b648..000000000
--- a/MediaBrowser.ClickOnce/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("MediaBrowser.ClickOnce")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MediaBrowser.ClickOnce")]
-[assembly: AssemblyCopyright("Copyright ©  2013")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("16e62c11-5009-4212-8c96-fd692479fc5d")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
\ No newline at end of file