Skip to content

Commit

Permalink
Changed = to Is. Added paq8px_v174 to test command line. Also wrote t…
Browse files Browse the repository at this point in the history
…he stdout redirection code to the log window.
  • Loading branch information
moisespr123 committed Jan 6, 2019
1 parent a46bf14 commit 7e3fecd
Show file tree
Hide file tree
Showing 7 changed files with 165 additions and 45 deletions.
10 changes: 8 additions & 2 deletions PAQCompress.sln
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27428.2043
# Visual Studio Version 16
VisualStudioVersion = 16.0.28407.52
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "PAQCompress", "PAQCompress\PAQCompress.vbproj", "{230293DD-F8F0-4B67-BF90-3FE898AE3C76}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{230293DD-F8F0-4B67-BF90-3FE898AE3C76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{230293DD-F8F0-4B67-BF90-3FE898AE3C76}.Debug|Any CPU.Build.0 = Debug|Any CPU
{230293DD-F8F0-4B67-BF90-3FE898AE3C76}.Debug|x64.ActiveCfg = Debug|x64
{230293DD-F8F0-4B67-BF90-3FE898AE3C76}.Debug|x64.Build.0 = Debug|x64
{230293DD-F8F0-4B67-BF90-3FE898AE3C76}.Release|Any CPU.ActiveCfg = Release|Any CPU
{230293DD-F8F0-4B67-BF90-3FE898AE3C76}.Release|Any CPU.Build.0 = Release|Any CPU
{230293DD-F8F0-4B67-BF90-3FE898AE3C76}.Release|x64.ActiveCfg = Release|x64
{230293DD-F8F0-4B67-BF90-3FE898AE3C76}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
77 changes: 50 additions & 27 deletions PAQCompress/Form1.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

91 changes: 84 additions & 7 deletions PAQCompress/Form1.vb
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,104 @@

Private Sub PAQSeries_SelectedIndexChanged(sender As Object, e As EventArgs) Handles PAQSeries.SelectedIndexChanged
PAQVersion.Items.Clear()
CompressionLevel.Items.Clear()
PAQVersion.Text = String.Empty
If PAQSeries.SelectedItem = "PAQ8o10t" Or PAQSeries.SelectedItem = "PAQ8PXPRE" Then
If PAQSeries.SelectedItem Is "PAQ8o10t" Or PAQSeries.SelectedItem Is "PAQ8PXPRE" Then
CompressionLevel.Items.AddRange({"1", "2", "3", "4", "5", "6", "7", "8"})
PAQVersion.Enabled = False
ElseIf PAQSeries.SelectedItem = "PAQ8KX" Then
PAQVersion.Items.AddRange({"v1", "v2", "v3", "v4", "v4a", "v4adual2", "v5", "v6", "v7"})
ElseIf PAQSeries.SelectedItem Is "PAQ8KX" Then
PAQVersion.Items.AddRange({"v1", "v1_alt", "v2", "v2_alt", "v3", "v3_alt", "v4", "v4a", "v4adual2", "v5", "v6", "v7"})
PAQVersion.Enabled = True
ElseIf PAQSeries.SelectedItem = "PAQ8PF" Then
ElseIf PAQSeries.SelectedItem Is "PAQ8PF" Then
PAQVersion.Items.AddRange({"beta1", "beta2", "beta3"})
PAQVersion.Enabled = True
ElseIf PAQSeries.SelectedItem = "FP8" Then
ElseIf PAQSeries.SelectedItem Is "FP8" Then
PAQVersion.Items.AddRange({"v1", "v2", "v3", "v4", "v5", "v6"})
PAQVersion.Enabled = True
ElseIf PAQSeries.SelectedItem = "PAQ8PX" Then
ElseIf PAQSeries.SelectedItem Is "PAQ8PX" Then
PAQVersion.Items.AddRange({"v42", "v44", "v45", "v46", "v47", "v48", "v49", "v51", "v52", "v53", "v54", "v57", "v58",
"v60", "v60_Intel_SSE2", "v61_Intel_SSE2", "v64", "v64_Intel_SSE2", "v65", "v66", "v66_Intel_SSE2",
"v67", "v67_Intel_SSE2", "v68", "v68_Intel_SSE2", "v68e", "v68p3", "v69", "v69_Intel_SSE2"})
"v67", "v67_Intel_SSE2", "v68", "v68_Intel_SSE2", "v68e", "v68p3", "v69", "v69_Intel_SSE2", "v174"})
PAQVersion.Enabled = True
End If
End Sub

Private Sub PAQVersion_SelectedIndexChanged(sender As Object, e As EventArgs) Handles PAQVersion.SelectedIndexChanged
CompressionLevel.Items.Clear()
CompressionLevel.Items.AddRange({"1", "2", "3", "4", "5", "6", "7", "8"})
If PAQSeries.SelectedItem Is "PAQ8PX" Then
If PAQVersion.SelectedIndex > 28 Then
CompressionLevel.Items.Add("9")
End If
End If
End Sub

Private Sub StartButton_Click(sender As Object, e As EventArgs) Handles StartButton.Click
Dim CompressorToUse As String = String.Empty
Dim CompressionParameters As String = String.Empty
If CompressionLevel.Items.Contains(CompressionLevel.Text) Then
If PAQSeries.SelectedItem Is "PAQ8KX" Then
If PAQVersion.Items.Contains(PAQVersion.Text) Then
CompressorToUse = "Executables/PAQ8KX/paq8kx_" + PAQVersion.Text + ".exe"
CompressionParameters = "-" + CompressionLevel.Text + " """ + OutputLocation.Text + """ """ + InputLocation.Text + """"
Else
MessageBox.Show("Select an item from the version dropdown")
End If
End If
If PAQSeries.SelectedItem Is "PAQ8PX" Then
If PAQVersion.Items.Contains(PAQVersion.Text) Then
CompressorToUse = "Executables/PAQ8PX/paq8px_" + PAQVersion.Text + ".exe"
CompressionParameters = "-" + CompressionLevel.Text + " """ + InputLocation.Text + """ """ + OutputLocation.Text + """"
Else
MessageBox.Show("Select an item from the version dropdown")
End If
End If
End If
If Not String.IsNullOrEmpty(CompressorToUse) And Not String.IsNullOrEmpty(CompressionParameters) Then
StartButton.Enabled = False
Dim StartCompressionThread = New Threading.Thread(Sub() CompressionThread(CompressorToUse, CompressionParameters))
StartCompressionThread.Start()
End If
End Sub

Private Sub CompressionThread(Compressor As String, Params As String)
Using process As New Process()
process.StartInfo.WorkingDirectory = Environment.CurrentDirectory
process.StartInfo.FileName = Compressor
process.StartInfo.Arguments = Params
process.StartInfo.UseShellExecute = False
process.StartInfo.RedirectStandardOutput = True
process.StartInfo.RedirectStandardError = True
process.StartInfo.CreateNoWindow = False
AddHandler process.OutputDataReceived, New DataReceivedEventHandler(Sub(sender, e)
If Not e.Data = Nothing Then
UpdateLog(e.Data)
End If
End Sub)
AddHandler process.ErrorDataReceived, New DataReceivedEventHandler(Sub(sender, e)
If Not e.Data = Nothing Then
UpdateLog(e.Data)
End If
End Sub)
process.Start()
process.BeginOutputReadLine()
process.BeginErrorReadLine()
process.WaitForExit()
StartButton.BeginInvoke(Sub() StartButton.Enabled = True)
End Using
End Sub

Private Delegate Sub UpdateLogInvoker(message As String)
Private Sub UpdateLog(message As String)
If Log.InvokeRequired Then
Log.Invoke(New UpdateLogInvoker(AddressOf UpdateLog), message)
Else
If Not String.IsNullOrWhiteSpace(message) Then
message = message.Replace(vbBack, "")
Log.AppendText(Date.Now().ToString() + " || " + message + vbCrLf)
Log.SelectionStart = Log.Text.Length - 1
Log.ScrollToCaret()
End If
End If
End Sub
End Class
2 changes: 1 addition & 1 deletion PAQCompress/My Project/Application.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions PAQCompress/My Project/Resources.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions PAQCompress/My Project/Settings.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7e3fecd

Please sign in to comment.