Add files via upload

Revan654 · Sep 24, 2018 · 1e6935b · 1e6935b
1 parent 403e876
commit 1e6935b
Show file tree

Hide file tree

Showing 4 changed files with 272 additions and 161 deletions.
diff --git a/General/Extras.vb b/General/Extras.vb
@@ -12,6 +12,10 @@ Public Class GIF
             proj.SourceFile = inputFile
         End If
 
+        proj.Log.WriteHeader("Saving GIF")
+        proj.Log.WriteLine(inputFile)
+        proj.Log.Save(proj)
+
         Dim Rate = s.Storage.GetInt("GifFrameRate", 15)
         Dim cachePath = Folder.Temp + "Palette.png"
         Dim OutPutPath = inputFile + ".gif"
@@ -42,6 +46,10 @@ End Class
             proj.SourceFile = inputFile
         End If
 
+        proj.Log.WriteHeader("Saving Thumbnails")
+        proj.Log.WriteLine(inputFile)
+        proj.Log.Save(proj)
+
         Dim Col = s.Storage.GetInt("MTNColumn", 4)
         Dim Rows = s.Storage.GetInt("MTNRow", 6)
         Dim SizeWidth = s.Storage.GetInt("MTNWidth", 1280)
@@ -66,6 +74,10 @@ Public Class PNG
             proj.SourceFile = inputFile
         End If
 
+        proj.Log.WriteHeader("Saving aPNG")
+        proj.Log.WriteLine(inputFile)
+        proj.Log.Save(proj)
+
         Dim Rate = s.Storage.GetInt("PNGFrameRate", 15)
         Dim Path = inputFile + ".apng"
         Dim NewPath = inputFile + ".png"
@@ -74,12 +86,21 @@ Public Class PNG
         Dim Duration = s.Storage.GetString("PNGLength", 4)
         Dim Size = s.Storage.GetInt("PNGScale", 480)
         Dim OptSettings = s.Storage.GetString("PNGopt", "-z0")
+        Dim Opt = s.Storage.GetBool("OptSetting", False)
+
+        If Opt = False Then
 
-        g.DefaultCommands.ExecuteCommandLine(Package.Items("ffmpeg").Path.Escape + " -ss " & Seek & " -t " & Duration & " -i " + """" + inputFile + """" + " -lavfi " + """" + "fps=" & Rate & ",scale=" & Size & ":-1:flags=spline" + """ -plays 0 -loglevel quiet -an -y " + """" + Path + """", True, True, False)
-        File.Move(Path, NewPath)
-        g.DefaultCommands.ExecuteCommandLine(Package.Items("PNGopt").Path.Escape + " " + OptSettings + " " + """" + NewPath + """" + " " + """" + OptOut + """", True, True, False)
-        File.Delete(NewPath)
+            g.DefaultCommands.ExecuteCommandLine(Package.Items("ffmpeg").Path.Escape + " -ss " & Seek & " -t " & Duration & " -i " + """" + inputFile + """" + " -lavfi " + """" + "fps=" & Rate & ",scale=" & Size & ":-1:flags=spline" + """ -plays 0 -loglevel quiet -an -y " + """" + Path + """", True, True, False)
+            File.Move(Path, NewPath)
 
+        Else
+
+            g.DefaultCommands.ExecuteCommandLine(Package.Items("ffmpeg").Path.Escape + " -ss " & Seek & " -t " & Duration & " -i " + """" + inputFile + """" + " -lavfi " + """" + "fps=" & Rate & ",scale=" & Size & ":-1:flags=spline" + """ -plays 0 -loglevel quiet -an -y " + """" + Path + """", True, True, False)
+            File.Move(Path, NewPath)
+            g.DefaultCommands.ExecuteCommandLine(Package.Items("PNGopt").Path.Escape + " " + OptSettings + " " + """" + NewPath + """" + " " + """" + OptOut + """", True, True, False)
+            File.Delete(NewPath)
+
+        End If
 
     End Sub
 

diff --git a/General/LogBuilder.vb b/General/LogBuilder.vb
@@ -73,6 +73,10 @@ Public Class LogBuilder
     Shared EnvironmentString As String 'cached due to bug report
 
     Sub WriteEnvironment()
+
+        Dim Memory = My.Computer.Info.TotalPhysicalMemory \ 1073741824
+        Dim MemoryF = Math.Ceiling(My.Computer.Info.TotalPhysicalMemory * 100D) / 100D
+
         If ToString.Contains("- System Environment -") Then Exit Sub
         WriteHeader("System Environment")
 
@@ -82,6 +86,7 @@ Public Class LogBuilder
             "Language:" + CultureInfo.CurrentCulture.EnglishName + BR +
             "CPU:" + Registry.LocalMachine.GetString("HARDWARE\DESCRIPTION\System\CentralProcessor\0", "ProcessorNameString") + BR +
             "GPU:" + String.Join(", ", SystemHelp.VideoControllers) + BR +
+            "Memory:" + MemoryF.ToString.Shorten(1) + " GB" + BR +
             "Resolution:" & Screen.PrimaryScreen.Bounds.Width & " x " & Screen.PrimaryScreen.Bounds.Height & BR +
             "DPI:" & g.MainForm.DeviceDpi