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

3 files changed, 48 insertions, 0 deletions

diff --git a/MediaBrowser.Installer/MainWindow.xaml.cs b/MediaBrowser.Installer/MainWindow.xaml.cs
index 22548a355..eddfdccc7 100644
--- a/MediaBrowser.Installer/MainWindow.xaml.cs
+++ b/MediaBrowser.Installer/MainWindow.xaml.cs
@@ -249,6 +249,17 @@ namespace MediaBrowser.Installer
                 return;
             }
 
+            // Install Pismo
+            try
+            {
+                InstallPismo();
+            }
+            catch (Exception e)
+            {
+                SystemClose("Error Installing Pismo - "+e.GetType().FullName+"\n\n"+e.Message);
+                return;
+            }
+
             // And run
             try
             {
@@ -264,6 +275,17 @@ namespace MediaBrowser.Installer
 
         }
 
+        private void InstallPismo()
+        {
+            // Kick off the Pismo installer and wait for it to end
+            var pismo = new Process();
+            pismo.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+            pismo.StartInfo.FileName = Path.Combine(RootPath, "Pismo", "pfminst.exe");
+            pismo.StartInfo.Arguments = "install";
+            pismo.Start();
+            pismo.WaitForExit();
+        }
+
         protected async Task<PackageVersionInfo> GetPackageVersion()
         {
             try
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 88ef97950..13d9e3344 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -373,6 +373,8 @@
 if $(ConfigurationName) == Release (
 rmdir "$(SolutionDir)..\Deploy\Server\System" /s /q
 mkdir "$(SolutionDir)..\Deploy\Server\System"
+rmdir "$(SolutionDir)..\Deploy\Server\Pismo" /s /q
+mkdir "$(SolutionDir)..\Deploy\Server\Pismo"
 xcopy "$(TargetDir)$(TargetFileName)" "$(SolutionDir)..\Deploy\Server\System\" /y
 xcopy "$(SolutionDir)Mediabrowser.Uninstaller\bin\Release\MediaBrowser.Uninstaller.exe.config" "$(SolutionDir)..\Deploy\Server\System\" /y
 xcopy "$(SolutionDir)Mediabrowser.Uninstaller.Execute\bin\Release\MediaBrowser.Uninstaller.Execute.exe.config" "$(SolutionDir)..\Deploy\Server\System\" /y
@@ -380,6 +382,9 @@ xcopy "$(SolutionDir)Mediabrowser.Uninstaller\bin\Release\MediaBrowser.Uninstall
 xcopy "$(SolutionDir)Mediabrowser.Uninstaller.Execute\bin\Release\MediaBrowser.Uninstaller.Execute.exe" "$(SolutionDir)..\Deploy\Server\System\" /y
 xcopy "$(SolutionDir)Mediabrowser.Installer\bin\Release\MediaBrowser.Installer.exe" "$(SolutionDir)..\Deploy\Server\System\" /y
 
+//Pismo
+"$(SolutionDir)ThirdParty\7zip\7za" x  "$(SolutionDir)ThirdParty\Pismo-Install\pfm-168-mediabrowser-win.zip" -o"$(SolutionDir)..\Deploy\Server\Pismo\" -y 
+
 mkdir "$(SolutionDir)..\Deploy\Server\System\swagger-ui"
 xcopy "$(TargetDir)swagger-ui" "$(SolutionDir)..\Deploy\Server\System\swagger-ui" /y /s
 
diff --git a/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs b/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs
index 5cbd2dd9e..5870a8ed5 100644
--- a/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs
+++ b/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs
@@ -198,12 +198,33 @@ namespace MediaBrowser.Uninstaller.Execute
             // Remove reference to us
             RemoveUninstall();
 
+            // Remove pismo
+            try
+            {
+                UnInstallPismo();
+            }
+            catch
+            {
+                // No biggie - maybe they uninstalled it themselves
+            }
+
             // and done
             lblHeading.Content = string.Format("Media Browser {0} Uninstalled.", Product);
             btnUninstall.Visibility = Visibility.Hidden;
             btnFinished.Visibility = Visibility.Visible;
         }
 
+        private void UnInstallPismo()
+        {
+            // Kick off the Pismo uninstaller and wait for it to end
+            var pismo = new Process();
+            pismo.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+            pismo.StartInfo.FileName = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "pfm.exe");
+            pismo.StartInfo.Arguments = "uninstall pfm-license-mediabrowser.txt";
+            pismo.Start();
+            pismo.WaitForExit();
+        }
+
         private void RemoveUninstall()
         {