Skip to content
Permalink
Browse files

- prevent Unpacker CLI from redirecting standard output for dds to pn…

…g conversions
  • Loading branch information...
cozy1 committed Apr 11, 2019
1 parent e99dc5a commit e43e7565e9aed41fdc426a73611e4f40c26220ac
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("ec9ae02a")]
[assembly: AssemblyInformationalVersion("e99dc5a5")]
[assembly: AssemblyConfiguration("")]
@@ -1,5 +1,6 @@
Rocksmith Toolkit Release Notes

- prevent Unpacker CLI from redirecting standard output for dds to png conversions
- added error handler for TreeViewOfd exceptions
- added additional flexibility to Quick Add feature
- only show the display setting warning on first run if applicable
@@ -110,13 +110,13 @@ static int Main(string[] args)
args = new string[]
{
"-u",
"-input=D:\\Temp\\PeppaPig_p.psarc",
"-x",
"-d",
"-f=Pc",
"-v=RS2014",
"-input=D:\\Temp\\PeppaPig_p.psarc",
"-output=D:\\Temp",
"-c"
"-v=RS2014",
"-c",
"-f=Pc"
};

// args = new string[] {"-?"};
@@ -580,7 +580,19 @@ public static DLCPackageData LoadFromFolder(string unpackedDir, Platform targetP
bnkPreviewVolume = attr.PreviewVolume;

// Fill SongInfo
data.SongInfo = new SongInfo { JapaneseArtistName = attr.JapaneseArtistName, JapaneseSongName = attr.JapaneseSongName, SongDisplayName = attr.SongName, SongDisplayNameSort = attr.SongNameSort, Album = attr.AlbumName, AlbumSort = attr.AlbumNameSort, SongYear = attr.SongYear ?? 0, Artist = attr.ArtistName, ArtistSort = attr.ArtistNameSort, AverageTempo = (int)attr.SongAverageTempo };
data.SongInfo = new SongInfo
{
JapaneseArtistName = attr.JapaneseArtistName,
JapaneseSongName = attr.JapaneseSongName,
SongDisplayName = attr.SongName,
SongDisplayNameSort = attr.SongNameSort,
Album = attr.AlbumName,
AlbumSort = attr.AlbumNameSort,
SongYear = attr.SongYear ?? 0,
Artist = attr.ArtistName,
ArtistSort = attr.ArtistNameSort,
AverageTempo = (int)attr.SongAverageTempo
};
}

// Adding Arrangement
@@ -893,6 +905,7 @@ public void CleanCache()
a.ClearCache();
}

// finalizer (C++ destructor syntax)
~DLCPackageData()
{
CleanCache();
@@ -157,7 +157,7 @@ public static string Unpack(string srcPath, string destDirPath, Platform predefi
// use the best quality (largest) dds file for the conversion
FileInfo[] fileInfos = ddsFiles.Select(fi => new FileInfo(fi)).ToArray();
var ddsFile = fileInfos.OrderByDescending(fl => fl.Length).Select(fn => fn.FullName).FirstOrDefault();
ExternalApps.Dds2Png(ddsFile);
ExternalApps.Dds2Png(ddsFile, isQuiet: true);
}
}

@@ -79,17 +79,17 @@ public static bool VerifyExternalApps()
return true;
}

public static void Dds2Png(string sourcePath, string destinationPath = null)
public static void Dds2Png(string sourcePath, string destinationPath = null, bool isQuiet = false)
{
var cmdArgs = String.Empty;
if (destinationPath == null)
{
cmdArgs = String.Format(" -overwrite -out png \"{0}\"", sourcePath);
}
cmdArgs = String.Format(" -overwrite -out png \"{0}\"", sourcePath);
else
{
cmdArgs = String.Format(" -overwrite -out png -o \"{1}\" \"{0}\"", sourcePath, destinationPath);
}

if (isQuiet)
cmdArgs = String.Format(" -quiet{0}", cmdArgs);

GeneralExtension.RunExternalExecutable(APP_TOPNG, true, true, true, cmdArgs);
}

@@ -27,5 +27,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("ec9ae02a")]
[assembly: AssemblyInformationalVersion("e99dc5a5")]
[assembly: AssemblyConfiguration("")]
@@ -31,7 +31,7 @@
<Config Key="creator_autosavetemplate" Value="true" />
<!-- converter config key count = 2 -->"
<Config Key="converter_source" Value="Pc" />
<Config Key="converter_target" Value="XBox360" />
<Config Key="converter_target" Value="Mac" />
<!-- ddc config key count = 5 -->"
<Config Key="ddc_config" Value="ddc_default" />
<Config Key="ddc_rampup" Value="ddc_default" />
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("ec9ae02a")]
[assembly: AssemblyInformationalVersion("e99dc5a5")]
[assembly: AssemblyConfiguration("")]
@@ -18,7 +18,7 @@ PAUSE>NUL|SET /P "= Press any key to contiune or Ctrl-C to escape ..."
echo.
@echo on

%UP% -u -x -d -c -f=Pc -v=RS2014 -i=%1 -o=%~d1\Temp
%UP% -u -x -d -c -i=%1 -o=%~d1\Temp -v=RS2014 -f=Pc 1>%~d1\Temp\standard.txt 2>%~d1\Temp\error.txt

@echo off
echo.
@@ -1,3 +1,3 @@
2.9.2.0
ec9ae02a
e99dc5a5

0 comments on commit e43e756

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