Added paq8px v204.

moisespr123 · Aug 2, 2021 · 066fe39 · 066fe39
1 parent 912c31c
commit 066fe39
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,6 @@
+v0.5.13
+- Added paq8px v204.
+
 v0.5.12
 - Added paq8px v203.
 

diff --git a/PAQCompress/DistributedProjectFunctions.vb b/PAQCompress/DistributedProjectFunctions.vb
@@ -18,9 +18,9 @@ Public Class DistributedProjectFunctions
             Return Form1.AdjustOutputFilename(filename, True)
         Else
             If filename.Contains(".native.") Then
-                Return IO.Path.GetFileNameWithoutExtension(IO.Path.GetFileNameWithoutExtension(filename))
+                Return Path.GetFileNameWithoutExtension(Path.GetFileNameWithoutExtension(filename))
             Else
-                Return IO.Path.GetFileNameWithoutExtension(filename)
+                Return Path.GetFileNameWithoutExtension(filename)
             End If
 
         End If
@@ -56,15 +56,15 @@ Public Class DistributedProjectFunctions
                         formData.Add(New StringContent(format), "f")
                         formData.Add(New StringContent(GenerateCommandLineArguments()), "c")
                         formData.Add(New StringContent(GetOutputFilename(filename)), "n")
-                        Dim uri As Uri = New Uri(serverUrl + "media_put.php")
+                        Dim uri As New Uri(serverUrl + "media_put.php")
                         client.DefaultRequestHeaders.Add("Accept-Language", "en-GB,en-US;q=0.8,en;q=0.6,ru;q=0.4")
                         client.Timeout = Threading.Timeout.InfiniteTimeSpan
                         Dim response As HttpResponseMessage = client.PostAsync(uri, formData).Result
                         If Not response.IsSuccessStatusCode Then
                             Console.WriteLine("Error")
                             Console.WriteLine(response.StatusCode)
                         End If
-                        Dim reader As StreamReader = New StreamReader(response.Content.ReadAsStreamAsync().Result)
+                        Dim reader As New StreamReader(response.Content.ReadAsStreamAsync().Result)
                         Dim result As String = reader.ReadToEnd()
                         Return result
                     End If

diff --git a/PAQCompress/Form1.Designer.vb b/PAQCompress/Form1.Designer.vb
diff --git a/PAQCompress/Form1.vb b/PAQCompress/Form1.vb
@@ -13,7 +13,7 @@
     Private Const paq8pxd_nativecpus As Integer = 44 'Starting on v90.
     Private Const paq8gen_enable_a_flag As Integer = 1 'v2fixa
     Private ReadOnly DistributedPAQCompressors As New Dictionary(Of String, String())() From {{"PAQ8PX", {"v185", "v186", "v186fix1", "v187", "v187fix3", "v187fix5", "v188", "v189",
-                                                                                                          "v193fix2", "v198", "v201", "v202", "v203"}},
+                                                                                                          "v193fix2", "v198", "v201", "v202", "v203", "v204"}},
                                                                                               {"PAQ8PXd", {"v85", "v86"}}}
 
     Private Sub Form1_Load(ByVal sender As Object, ByVal e As EventArgs) Handles MyBase.Load
@@ -196,7 +196,7 @@
                                       "v179fix2", "v179fix3", "v179fix4", "v179fix5", "v180", "v181", "v181fix1", "v182", "v182fix1", "v182fix2",
                                       "v183", "v183fix1", "v184", "v185", "v186", "v186fix1", "v187", "v187fix1", "v187fix2", "v187fix3", "v187fix4", "v187fix5",
                                       "v188", "v189", "v190", "v191", "v191a", "v192", "v193", "v193fix1", "v193fix2", "v194", "v195", "v196", "v197", "v198",
-                                      "v199", "v200", "v201", "v202", "v203"})
+                                      "v199", "v200", "v201", "v202", "v203", "v204"})
             PAQVersion.Enabled = True
         End If
         If PAQVersion.Enabled Then
@@ -329,9 +329,13 @@
     Private Sub CheckCompressionLevelAndChange()
         If PAQSeries.SelectedItem Is "PAQ8PX" Or PAQSeries.SelectedItem Is "FP8sk" Then
             Try
-                If Convert.ToInt32(CompressionLevel.Text) >= 9 Then
+                If Convert.ToInt32(CompressionLevel.Text) >= 9 And PAQVersion.SelectedIndex <= Flags_enable Then
                     CompressionLevel.Text = "8"
                     CompressionLevel.SelectedItem = "8"
+                ElseIf Convert.ToInt32(CompressionLevel.Text) >= 9 And PAQVersion.SelectedIndex <= paq8px_enable_levels_10_12 Then
+                    CompressionLevel.Text = "9"
+                    CompressionLevel.SelectedItem = "9"
+
                 End If
             Catch
                 CompressionLevel.Text = "8"
@@ -365,7 +369,7 @@
                 useNativeCPU.Enabled = True
             Else
                 useNativeCPU.Enabled = False
-        End If
+            End If
         ElseIf PAQSeries.SelectedItem Is "PAQ8gen" Then
             If CompressRButton.Checked Then
                 EnableFlagsCheckboxes()

diff --git a/PAQCompress/My Project/AssemblyInfo.vb b/PAQCompress/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("0.5.12.0")>
-<Assembly: AssemblyFileVersion("0.5.12.0")>
+<Assembly: AssemblyVersion("0.5.13.0")>
+<Assembly: AssemblyFileVersion("0.5.13.0")>