Fixed node server not stoping & added updater

pink1stools · Jan 2, 2019 · 61823b0 · 61823b0
1 parent 48a8530
commit 61823b0
Show file tree

Hide file tree

Showing 68 changed files with 1,650 additions and 12 deletions.
diff --git a/PS4_PKG_Linker/MainWindow.xaml b/PS4_PKG_Linker/MainWindow.xaml
@@ -1880,7 +1880,7 @@
 
         </Controls:MetroAnimatedSingleRowTabControl>
         <StatusBar Name="SB1" Grid.Row="1" BorderThickness="1" BorderBrush="{DynamicResource AccentColorBrush}">
-            <StatusBarItem>PS4 PKG Linker</StatusBarItem>
+            <StatusBarItem Name="FVersion">PS4 PKG Linker</StatusBarItem>
             <StatusBarItem HorizontalAlignment="Right" >
             <StackPanel Name="spl" Orientation="Horizontal">
                     <local:ClickableLabel Padding="0" x:Name="github_lable" Cursor="{Binding Cursor1}" Click="github_lable_Click">

diff --git a/PS4_PKG_Linker/MainWindow.xaml.cs b/PS4_PKG_Linker/MainWindow.xaml.cs
@@ -31,6 +31,7 @@
 using MahApps.Metro.Controls.Dialogs;
 using System.Windows.Resources;
 using System.ComponentModel;
+using AutoUpdaterDotNET;
 
 namespace PS4_PKG_Linker
 {
@@ -147,6 +148,7 @@ private void MetroWindow_Loaded(object sender, RoutedEventArgs e)
             Load();
             Set_cursor();
             Check_server();
+            Get_Version();
 
             //this.child01.IsOpen = true;
         }
@@ -315,6 +317,23 @@ private void SaveSettings()
 
         #region<<set_up>>
 
+        public void Get_Version()
+        {
+            AutoUpdater.LetUserSelectRemindLater = true;
+            AutoUpdater.RemindLaterTimeSpan = RemindLaterFormat.Minutes;
+            AutoUpdater.RemindLaterAt = 1;
+            AutoUpdater.ReportErrors = true;
+            AutoUpdater.DownloadPath = Environment.CurrentDirectory;
+
+            AutoUpdater.Start("https://raw.githubusercontent.com/pink1stools/PS4_PKG_Linker/master/Updater.xml");
+
+
+            System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
+            FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
+            string version = fvi.FileVersion;
+            FVersion.Content += "  v" + version;
+        }
+
         public void Set_cursor()
         {
 
@@ -823,6 +842,21 @@ private void check_processes()
                     tempProc.WaitForExit();
                 }
             }
+
+            Process[] processes2 = Process.GetProcessesByName("node");
+            foreach (var process in processes2)
+            {
+                process.Kill();
+                process.WaitForExit();
+            }
+            Process[] processes3 = Process.GetProcessesByName("ServiceHub.Host.Node.x86");
+            foreach (var process in processes3)
+            {
+                process.Kill();
+                process.WaitForExit();
+            }
+
+
         }
 
         #endregion<<>>

diff --git a/PS4_PKG_Linker/PS4_PKG_Linker.csproj b/PS4_PKG_Linker/PS4_PKG_Linker.csproj
@@ -58,6 +58,9 @@
     <StartupObject>PS4_PKG_Linker.App</StartupObject>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AutoUpdater.NET, Version=1.4.11.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autoupdater.NET.Official.1.4.11\lib\net40\AutoUpdater.NET.dll</HintPath>
+    </Reference>
     <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
     </Reference>
@@ -200,6 +203,9 @@
   <ItemGroup>
     <Resource Include="tools\resources\aero-middle-finger-2.cur" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Updater.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\libcurl.NET.x86.1.4.1.0\build\libcurl.NET.x86.targets" Condition="Exists('..\packages\libcurl.NET.x86.1.4.1.0\build\libcurl.NET.x86.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/PS4_PKG_Linker/Properties/AssemblyInfo.cs b/PS4_PKG_Linker/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.2.0")]
diff --git a/PS4_PKG_Linker/Updater.xml b/PS4_PKG_Linker/Updater.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<item>
+    <version>1.0.2.0</version>
+    <url>https://github.com/pink1stools/PS4_PKG_Linker/releases/download/v1.0.1/PS4_PKG_Linker_v1.0.1.zip</url>
+    <changelog>https://github.com/pink1stools/PS4_PKG_Linker/releases</changelog>
+    <mandatory>false</mandatory>
+</item>
diff --git a/PS4_PKG_Linker/bin/Debug/AutoUpdater.NET.dll b/PS4_PKG_Linker/bin/Debug/AutoUpdater.NET.dll
diff --git a/PS4_PKG_Linker/bin/Debug/AutoUpdater.NET.pdb b/PS4_PKG_Linker/bin/Debug/AutoUpdater.NET.pdb