Skip to content
Permalink
Browse files

- restored missing toolkit CLI executables

- added DDC Unit Testing to RocksmithToolkitGUI.Tests
- merged PsarcLoader into PSARC namespace
  • Loading branch information...
cozy1 committed Sep 13, 2019
1 parent bbb0fc4 commit 16369af257eb2b761a2fcfca4a6123690aaea8f1
Showing with 592 additions and 1,478 deletions.
  1. +38 −1 RocksmithCustomSongCreator.sln
  2. +1 −1 RocksmithTookitGUI/Config/GeneralConfig.Designer.cs
  3. +1 −1 RocksmithTookitGUI/Config/GeneralConfig.cs
  4. +49 −49 RocksmithTookitGUI/DDC/DDC.Designer.cs
  5. +4 −4 RocksmithTookitGUI/DDC/DDC.cs
  6. +3 −6 RocksmithTookitGUI/DDC/DDC.resx
  7. +2 −1 RocksmithTookitGUI/DLCPackerUnpacker/DLCPackerUnpacker.cs
  8. +1 −1 RocksmithTookitGUI/Properties/AssemblyInfo.cs
  9. +4 −1 RocksmithTookitGUI/ReleaseNotes.txt
  10. BIN RocksmithTookitGUI/Resources/Thumbs.db
  11. +0 −15 RocksmithToolkitCLI/artistfolders/app.config
  12. +0 −3 RocksmithToolkitCLI/artistfolders/artistfolders.csproj
  13. +0 −15 RocksmithToolkitCLI/cdlcconverter/app.config
  14. +0 −3 RocksmithToolkitCLI/cdlcconverter/cdlcconverter.csproj
  15. +0 −15 RocksmithToolkitCLI/convert2012/app.config
  16. +0 −3 RocksmithToolkitCLI/convert2012/convert2012.csproj
  17. +0 −15 RocksmithToolkitCLI/devtools/app.config
  18. +0 −3 RocksmithToolkitCLI/devtools/devtools.csproj
  19. +0 −15 RocksmithToolkitCLI/packagecreator/app.config
  20. +1 −4 RocksmithToolkitCLI/packagecreator/packagecreator.csproj
  21. +0 −15 RocksmithToolkitCLI/packer/app.config
  22. +0 −3 RocksmithToolkitCLI/packer/packer.csproj
  23. +0 −15 RocksmithToolkitCLI/pcdecrypt/app.config
  24. +0 −3 RocksmithToolkitCLI/pcdecrypt/pcdecrypt.csproj
  25. +0 −15 RocksmithToolkitCLI/pedalgen/app.config
  26. +0 −3 RocksmithToolkitCLI/pedalgen/pedalgen.csproj
  27. +0 −15 RocksmithToolkitCLI/sng2014/app.config
  28. +0 −3 RocksmithToolkitCLI/sng2014/sng2014.csproj
  29. +0 −15 RocksmithToolkitCLI/sngtotab/app.config
  30. +0 −3 RocksmithToolkitCLI/sngtotab/sngtotab.csproj
  31. +1 −1 RocksmithToolkitCLI/toneliberator/Program.cs
  32. +0 −15 RocksmithToolkitCLI/toneliberator/app.config
  33. +0 −3 RocksmithToolkitCLI/toneliberator/toneliberator.csproj
  34. +0 −15 RocksmithToolkitCLI/transferprofile/app.config
  35. +0 −3 RocksmithToolkitCLI/transferprofile/transferprofile.csproj
  36. +0 −15 RocksmithToolkitCLI/xml2sng/app.config
  37. +0 −3 RocksmithToolkitCLI/xml2sng/xml2sng.csproj
  38. +101 −0 RocksmithToolkitGUI.Tests/DDCTest.cs
  39. +1 −1 RocksmithToolkitGUI.Tests/DLCPackageCreatorTest.cs
  40. +1 −1 RocksmithToolkitGUI.Tests/DLCPackerUnpackerTest.cs
  41. +1 −0 RocksmithToolkitGUI.Tests/RocksmithToolkitGUI.Tests.csproj
  42. +0 −1 RocksmithToolkitLib/DLCPackage/DLCPackageCreator.cs
  43. +1 −1 RocksmithToolkitLib/Extensions/ExternalApps.cs
  44. +1 −1 RocksmithToolkitLib/Ogg/Wwise.cs
  45. +1 −0 RocksmithToolkitLib/PSARC/BigEndianBinaryReader.cs
  46. +362 −18 RocksmithToolkitLib/PSARC/PSARC.cs
  47. +5 −6 RocksmithToolkitLib/{PsarcLoader → PSARC}/PsarcExtensions.cs
  48. +4 −5 RocksmithToolkitLib/{PsarcLoader → PSARC}/PsarcLoader.cs
  49. +2 −3 RocksmithToolkitLib/{PsarcLoader → PSARC}/PsarcPackager.cs
  50. +1 −1 RocksmithToolkitLib/Properties/AssemblyInfo.cs
  51. +0 −76 RocksmithToolkitLib/PsarcLoader/Entry.cs
  52. +0 −1,055 RocksmithToolkitLib/PsarcLoader/PSARC.cs
  53. +3 −5 RocksmithToolkitLib/RocksmithToolkitLib.csproj
  54. +1 −1 RocksmithToolkitUpdater/Properties/AssemblyInfo.cs
  55. +1 −1 RunMeFirst.bat
  56. +1 −1 VersionInfo.txt
@@ -8,34 +8,72 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RocksmithToolkitCLI", "RocksmithToolkitCLI", "{7CFB8499-8B82-40B3-89EA-7971F5FD1E0C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xml2sng", "RocksmithToolkitCLI\xml2sng\xml2sng.csproj", "{48703F6C-9F98-4534-AB1D-67856A84D806}"
ProjectSection(ProjectDependencies) = postProject
{1A3DEAD6-14F3-43C3-B15C-A866D48FEF61} = {1A3DEAD6-14F3-43C3-B15C-A866D48FEF61}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pcdecrypt", "RocksmithToolkitCLI\pcdecrypt\pcdecrypt.csproj", "{9190164B-E755-4C8D-812E-70BE8FA286DD}"
ProjectSection(ProjectDependencies) = postProject
{1A3DEAD6-14F3-43C3-B15C-A866D48FEF61} = {1A3DEAD6-14F3-43C3-B15C-A866D48FEF61}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "packer", "RocksmithToolkitCLI\packer\packer.csproj", "{822D185A-28A3-4AE0-A811-800E968AA2E7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pedalgen", "RocksmithToolkitCLI\pedalgen\pedalgen.csproj", "{54637C43-E331-443B-B30F-C181A5CA60A4}"
ProjectSection(ProjectDependencies) = postProject
{1A3DEAD6-14F3-43C3-B15C-A866D48FEF61} = {1A3DEAD6-14F3-43C3-B15C-A866D48FEF61}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sngtotab", "RocksmithToolkitCLI\sngtotab\sngtotab.csproj", "{3AB6A6D5-B5AE-4319-9B57-2758D13EB042}"
ProjectSection(ProjectDependencies) = postProject
{1A3DEAD6-14F3-43C3-B15C-A866D48FEF61} = {1A3DEAD6-14F3-43C3-B15C-A866D48FEF61}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "devtools", "RocksmithToolkitCLI\devtools\devtools.csproj", "{63FB3334-1E7E-42D7-A025-744BC387AAD6}"
ProjectSection(ProjectDependencies) = postProject
{1A3DEAD6-14F3-43C3-B15C-A866D48FEF61} = {1A3DEAD6-14F3-43C3-B15C-A866D48FEF61}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sng2014", "RocksmithToolkitCLI\sng2014\sng2014.csproj", "{8FDBC548-DEBF-46D6-A933-33C8D72F33AB}"
ProjectSection(ProjectDependencies) = postProject
{1A3DEAD6-14F3-43C3-B15C-A866D48FEF61} = {1A3DEAD6-14F3-43C3-B15C-A866D48FEF61}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "packagecreator", "RocksmithToolkitCLI\PackageCreator\packagecreator.csproj", "{ED268869-387A-477E-A652-C6E47BE2AC02}"
ProjectSection(ProjectDependencies) = postProject
{1A3DEAD6-14F3-43C3-B15C-A866D48FEF61} = {1A3DEAD6-14F3-43C3-B15C-A866D48FEF61}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "artistfolders", "RocksmithToolkitCLI\artistfolders\artistfolders.csproj", "{E742753F-9DC3-4AB7-B129-DC11EB2302CA}"
ProjectSection(ProjectDependencies) = postProject
{2231C13A-14F6-478A-96D7-D1D3E1094CD6} = {2231C13A-14F6-478A-96D7-D1D3E1094CD6}
{1A3DEAD6-14F3-43C3-B15C-A866D48FEF61} = {1A3DEAD6-14F3-43C3-B15C-A866D48FEF61}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "convert2012", "RocksmithToolkitCLI\convert2012\convert2012.csproj", "{FE4E3BDA-2942-4009-9F42-07ECEF8DE350}"
ProjectSection(ProjectDependencies) = postProject
{1A3DEAD6-14F3-43C3-B15C-A866D48FEF61} = {1A3DEAD6-14F3-43C3-B15C-A866D48FEF61}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RocksmithToolkitUpdater", "RocksmithToolkitUpdater\RocksmithToolkitUpdater.csproj", "{4404D0DD-017E-4CC5-8302-3C150FDF06E7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cdlcconverter", "RocksmithToolkitCLI\cdlcconverter\cdlcconverter.csproj", "{972BC97A-B70A-4007-B915-952CC3606A2A}"
ProjectSection(ProjectDependencies) = postProject
{1A3DEAD6-14F3-43C3-B15C-A866D48FEF61} = {1A3DEAD6-14F3-43C3-B15C-A866D48FEF61}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "toneliberator", "RocksmithToolkitCLI\toneliberator\toneliberator.csproj", "{C8BDE9BB-F671-482E-97AB-5472F3C7D319}"
ProjectSection(ProjectDependencies) = postProject
{1A3DEAD6-14F3-43C3-B15C-A866D48FEF61} = {1A3DEAD6-14F3-43C3-B15C-A866D48FEF61}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RocksmithToTabLib", "lib\RocksmithToTabLib\RocksmithToTabLib.csproj", "{A391030A-8289-4B6A-8117-1C7995808AD5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "transferprofile", "RocksmithToolkitCLI\transferprofile\transferprofile.csproj", "{CE48B5DF-398B-47D8-96D6-198566521104}"
ProjectSection(ProjectDependencies) = postProject
{2231C13A-14F6-478A-96D7-D1D3E1094CD6} = {2231C13A-14F6-478A-96D7-D1D3E1094CD6}
{1A3DEAD6-14F3-43C3-B15C-A866D48FEF61} = {1A3DEAD6-14F3-43C3-B15C-A866D48FEF61}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RocksmithToolkitGUI.Tests", "RocksmithToolkitGUI.Tests\RocksmithToolkitGUI.Tests.csproj", "{1940BBE3-640F-499C-80BC-2291585406D2}"
EndProject
@@ -99,7 +137,6 @@ Global
{63FB3334-1E7E-42D7-A025-744BC387AAD6}.Debug w CLI|x86.Build.0 = Debug|x86
{63FB3334-1E7E-42D7-A025-744BC387AAD6}.Debug|x86.ActiveCfg = Debug|x86
{63FB3334-1E7E-42D7-A025-744BC387AAD6}.Release|x86.ActiveCfg = Release|x86
{63FB3334-1E7E-42D7-A025-744BC387AAD6}.Release|x86.Build.0 = Release|x86
{63FB3334-1E7E-42D7-A025-744BC387AAD6}.RocksmithToolkitMac|x86.ActiveCfg = Release|x86
{8FDBC548-DEBF-46D6-A933-33C8D72F33AB}.Debug w CLI|x86.ActiveCfg = Debug|x86
{8FDBC548-DEBF-46D6-A933-33C8D72F33AB}.Debug w CLI|x86.Build.0 = Debug|x86

Some generated files are not rendered by default. Learn more.

@@ -238,7 +238,7 @@ private void btnWwisePath_Click(object sender, EventArgs e)
using (var fbd = new VistaFolderBrowserDialog())
{
fbd.SelectedPath = general_wwisepath.Text;
fbd.Description = "Select the WwiseCLI.exe installation folder," + Environment.NewLine +
fbd.Description = "Select the 'WwiseCLI.exe' installation folder," + Environment.NewLine +
"or press 'X' to close and clear the Wwise Path.";

if (fbd.ShowDialog() != DialogResult.OK)

Some generated files are not rendered by default. Learn more.

@@ -17,7 +17,7 @@
using RocksmithToolkitLib.XmlRepository;
using Control = System.Windows.Forms.Control;
using ProgressBarStyle = System.Windows.Forms.ProgressBarStyle;
using PsarcPackager = RocksmithToolkitLib.PsarcLoader.PsarcPackager;
using RocksmithToolkitLib.PSARC;

namespace RocksmithToolkitGUI.DDC
{
@@ -61,7 +61,7 @@ public DDC()
private bool IsNDD { get; set; }
private string ProcessOutput { get; set; }

private int ApplyPackageDD(string srcPath, int phraseLen, bool removeSus, string rampPath, string cfgPath, out string consoleOutput, bool overWrite = false, bool keepLog = false)
public int ApplyPackageDD(string srcPath, int phraseLen, bool removeSus, string rampPath, string cfgPath, out string consoleOutput, bool overWrite = false, bool keepLog = false)
{
int result = 0; // Ends normally with no error
DLCPackageData packageData;
@@ -242,15 +242,15 @@ private string GenerateDdcFilePath(string filePath)
return ddcFilePath;
}

private string GetConfig()
public string GetConfig()
{
if (cmbConfigFile.Text.Trim().Length > 0)
return String.Format("{0}", Path.GetFullPath(ConfigDb[cmbConfigFile.Text]));

return "";
}

private string GetRampUpMdl()
public string GetRampUpMdl()
{
if (cmbRampUp.Text.Trim().Length > 0)
return String.Format("{0}", Path.GetFullPath(RampUpDb[cmbRampUp.Text]));
@@ -123,16 +123,13 @@
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>35</value>
</metadata>
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>385, 17</value>
</metadata>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>117, 17</value>
</metadata>
<metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>257, 17</value>
</metadata>
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>385, 17</value>
</metadata>
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>385, 17</value>
</metadata>
</root>
@@ -13,11 +13,11 @@
using RocksmithToolkitLib;
using RocksmithToolkitLib.DLCPackage.AggregateGraph2014;
using RocksmithToolkitLib.Extensions;
using RocksmithToolkitLib.PSARC;
using RocksmithToolkitLib.Sng;
using RocksmithToolkitLib.XML;
using RocksmithToolkitLib.XmlRepository;
using RocksmithToolkitGUI.Config;
using RocksmithToolkitLib.PsarcLoader;
using PackageCreator = RocksmithToolkitLib.DLCPackage.DLCPackageCreator;

namespace RocksmithToolkitGUI.DLCPackerUnpacker
@@ -267,6 +267,7 @@ public List<string> UnpackSongs(IEnumerable<string> srcPaths, string destPath)
sw.Stop();
GlobalExtension.ShowProgress("Finished unpacking archive (elapsed time): " + sw.Elapsed, 100);

// insert any Packer error messages
if (!String.IsNullOrEmpty(Packer.ErrMsg.ToString()))
errorsFound.Insert(0, Packer.ErrMsg.ToString());

@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("3274d753")]
[assembly: AssemblyInformationalVersion("bbb0fc46")]
[assembly: AssemblyConfiguration("")]
@@ -1,7 +1,10 @@
Rocksmith Toolkit Release Notes

- restored missing toolkit CLI executables
- added DDC Unit Testing to RocksmithToolkitGUI.Tests
- merged PsarcLoader into PSARC namespace
- improved robustness of unpacker exception handling
- extract remaining salvagable artifacts if archive is corrupt
- extract remaining salvageable artifacts if archive is corrupt
- fixed Quick Add to work with directory names that contain '.' periods
- fixed representative arrangement bug
- DDC tab menu reports errors correctly instead of throwing a misleading exception
Binary file not shown.

0 comments on commit 16369af

Please sign in to comment.
You can’t perform that action at this time.