Only print out files that were named
Instead of almost all of them. Major convention changes too.
This commit is contained in:
parent
ae662cad8a
commit
99fa58f31a
1 changed files with 205 additions and 197 deletions
116
Program.cs
116
Program.cs
|
@ -1,4 +1,5 @@
|
||||||
using System;
|
using System;
|
||||||
|
using System.Globalization;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
@ -14,8 +15,8 @@ namespace RSCacheTool
|
||||||
{
|
{
|
||||||
static class Program
|
static class Program
|
||||||
{
|
{
|
||||||
static string cacheDir = Environment.ExpandEnvironmentVariables(@"%USERPROFILE%\jagexcache\runescape\LIVE\");
|
static string _cacheDir = Environment.ExpandEnvironmentVariables(@"%USERPROFILE%\jagexcache\runescape\LIVE\");
|
||||||
static string outDir = "cache\\";
|
static string _outDir = "cache\\";
|
||||||
|
|
||||||
static int Main(string[] args)
|
static int Main(string[] args)
|
||||||
{
|
{
|
||||||
|
@ -25,7 +26,7 @@ namespace RSCacheTool
|
||||||
int extractArchive = -1, combineArchive = 40;
|
int extractArchive = -1, combineArchive = 40;
|
||||||
string combineFile = "", nameFile = "";
|
string combineFile = "", nameFile = "";
|
||||||
|
|
||||||
OptionSet argsParser = new OptionSet() {
|
OptionSet argsParser = new OptionSet {
|
||||||
{ "h", "show this message", val => { help = true; } },
|
{ "h", "show this message", val => { help = true; } },
|
||||||
|
|
||||||
{ "o", "overwrite existing files, for all actions", val => { overwrite = true; } },
|
{ "o", "overwrite existing files, for all actions", val => { overwrite = true; } },
|
||||||
|
@ -68,10 +69,15 @@ namespace RSCacheTool
|
||||||
|
|
||||||
if (Directory.Exists(parsedPath))
|
if (Directory.Exists(parsedPath))
|
||||||
{
|
{
|
||||||
if (i == 0)
|
switch (i)
|
||||||
outDir = parsedPath;
|
{
|
||||||
else if (i == 1)
|
case 0:
|
||||||
cacheDir = parsedPath;
|
_outDir = parsedPath;
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
_cacheDir = parsedPath;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -100,8 +106,8 @@ namespace RSCacheTool
|
||||||
else if (!error)
|
else if (!error)
|
||||||
{
|
{
|
||||||
//create outdir
|
//create outdir
|
||||||
if (!Directory.Exists(outDir))
|
if (!Directory.Exists(_outDir))
|
||||||
Directory.CreateDirectory(outDir);
|
Directory.CreateDirectory(_outDir);
|
||||||
|
|
||||||
if (extract)
|
if (extract)
|
||||||
ExtractFiles(extractArchive, overwrite);
|
ExtractFiles(extractArchive, overwrite);
|
||||||
|
@ -132,14 +138,15 @@ namespace RSCacheTool
|
||||||
endArchive = archive;
|
endArchive = archive;
|
||||||
}
|
}
|
||||||
|
|
||||||
using (FileStream cacheFile = File.Open(cacheDir + "main_file_cache.dat2", FileMode.Open, FileAccess.Read))
|
using (FileStream cacheFile = File.Open(_cacheDir + "main_file_cache.dat2", FileMode.Open, FileAccess.Read))
|
||||||
{
|
{
|
||||||
for (int archiveIndex = startArchive; archiveIndex <= endArchive; archiveIndex++)
|
for (int archiveIndex = startArchive; archiveIndex <= endArchive; archiveIndex++)
|
||||||
{
|
{
|
||||||
string indexFileString = cacheDir + "main_file_cache.idx" + archiveIndex.ToString();
|
string indexFileString = _cacheDir + "main_file_cache.idx" + archiveIndex;
|
||||||
|
|
||||||
|
if (!File.Exists(indexFileString))
|
||||||
|
continue;
|
||||||
|
|
||||||
if (File.Exists(indexFileString))
|
|
||||||
{
|
|
||||||
FileStream indexFile = File.Open(indexFileString, FileMode.Open, FileAccess.Read);
|
FileStream indexFile = File.Open(indexFileString, FileMode.Open, FileAccess.Read);
|
||||||
|
|
||||||
int fileCount = (int)indexFile.Length / 6;
|
int fileCount = (int)indexFile.Length / 6;
|
||||||
|
@ -204,11 +211,12 @@ namespace RSCacheTool
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!fileError)
|
if (fileError)
|
||||||
{
|
continue;
|
||||||
|
|
||||||
//process file
|
//process file
|
||||||
string outFileDir = outDir + archiveIndex + "\\";
|
string outFileDir = _outDir + archiveIndex + "\\";
|
||||||
string outFileName = fileIndex.ToString();
|
string outFileName = fileIndex.ToString(CultureInfo.InvariantCulture);
|
||||||
|
|
||||||
//remove the first 5 bytes because they are not part of the file
|
//remove the first 5 bytes because they are not part of the file
|
||||||
byte[] tempBuffer = new byte[fileSize - 5];
|
byte[] tempBuffer = new byte[fileSize - 5];
|
||||||
|
@ -253,7 +261,7 @@ namespace RSCacheTool
|
||||||
tempBuffer = new byte[fileSize - 4];
|
tempBuffer = new byte[fileSize - 4];
|
||||||
Array.Copy(buffer, 4, tempBuffer, 0, fileSize - 4);
|
Array.Copy(buffer, 4, tempBuffer, 0, fileSize - 4);
|
||||||
buffer = tempBuffer;
|
buffer = tempBuffer;
|
||||||
fileSize -= 4;
|
//fileSize -= 4;
|
||||||
|
|
||||||
//prepend file header
|
//prepend file header
|
||||||
byte[] magic = {
|
byte[] magic = {
|
||||||
|
@ -316,7 +324,6 @@ namespace RSCacheTool
|
||||||
else
|
else
|
||||||
Console.WriteLine("Skipping file because it already exists.");
|
Console.WriteLine("Skipping file because it already exists.");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Console.WriteLine("Ignoring file because of size or offset.");
|
Console.WriteLine("Ignoring file because of size or offset.");
|
||||||
|
@ -324,7 +331,6 @@ namespace RSCacheTool
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
Console.WriteLine("Done extracting files.");
|
Console.WriteLine("Done extracting files.");
|
||||||
}
|
}
|
||||||
|
@ -334,8 +340,8 @@ namespace RSCacheTool
|
||||||
/// </summary>
|
/// </summary>
|
||||||
static void CombineSounds(int archive, string file, bool overwriteExisting, bool mergeIncomplete)
|
static void CombineSounds(int archive, string file, bool overwriteExisting, bool mergeIncomplete)
|
||||||
{
|
{
|
||||||
string archiveDir = outDir + archive + "\\";
|
string archiveDir = _outDir + archive + "\\";
|
||||||
string soundDir = outDir + "sound\\";
|
string soundDir = _outDir + "sound\\";
|
||||||
|
|
||||||
//gather all index files
|
//gather all index files
|
||||||
string[] indexFiles = Directory.GetFiles(archiveDir, "*.jaga", SearchOption.TopDirectoryOnly);
|
string[] indexFiles = Directory.GetFiles(archiveDir, "*.jaga", SearchOption.TopDirectoryOnly);
|
||||||
|
@ -406,7 +412,7 @@ namespace RSCacheTool
|
||||||
StartInfo = {FileName = "sox.exe", Arguments = "--combine concatenate ~index.ogg"}
|
StartInfo = {FileName = "sox.exe", Arguments = "--combine concatenate ~index.ogg"}
|
||||||
};
|
};
|
||||||
|
|
||||||
chunkFiles.ForEach((str) =>
|
chunkFiles.ForEach(str =>
|
||||||
{
|
{
|
||||||
soxProcess.StartInfo.Arguments += " " + str;
|
soxProcess.StartInfo.Arguments += " " + str;
|
||||||
});
|
});
|
||||||
|
@ -450,7 +456,7 @@ namespace RSCacheTool
|
||||||
//the following is based on even more assumptions than normal made while comparing 2 extracted caches, it's therefore probably the first thing to break
|
//the following is based on even more assumptions than normal made while comparing 2 extracted caches, it's therefore probably the first thing to break
|
||||||
//4B magic number (0x00016902) - 2B a file id? - 2B amount of files (higher than actual entries sometimes) - 2B amount of files
|
//4B magic number (0x00016902) - 2B a file id? - 2B amount of files (higher than actual entries sometimes) - 2B amount of files
|
||||||
|
|
||||||
string resolveFileName = outDir + "17\\5";
|
string resolveFileName = _outDir + "17\\5";
|
||||||
|
|
||||||
if (File.Exists(resolveFileName))
|
if (File.Exists(resolveFileName))
|
||||||
{
|
{
|
||||||
|
@ -511,10 +517,10 @@ namespace RSCacheTool
|
||||||
}
|
}
|
||||||
|
|
||||||
//let's do this!
|
//let's do this!
|
||||||
if (!Directory.Exists(outDir + "sound\\named\\"))
|
if (!Directory.Exists(_outDir + "sound\\named\\"))
|
||||||
Directory.CreateDirectory(outDir + "sound\\named\\");
|
Directory.CreateDirectory(_outDir + "sound\\named\\");
|
||||||
|
|
||||||
foreach (string soundFile in Directory.GetFiles(outDir + "sound\\"))
|
foreach (string soundFile in Directory.GetFiles(_outDir + "sound\\"))
|
||||||
{
|
{
|
||||||
string fileIdString = Path.GetFileNameWithoutExtension(soundFile);
|
string fileIdString = Path.GetFileNameWithoutExtension(soundFile);
|
||||||
|
|
||||||
|
@ -522,32 +528,33 @@ namespace RSCacheTool
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
uint fileId;
|
uint fileId;
|
||||||
if (uint.TryParse(fileIdString, out fileId))
|
if (!uint.TryParse(fileIdString, out fileId))
|
||||||
{
|
continue;
|
||||||
if (fileIdTracks.ContainsKey(fileId))
|
|
||||||
{
|
if (!fileIdTracks.ContainsKey(fileId))
|
||||||
|
continue;
|
||||||
|
|
||||||
int trackId = fileIdTracks[fileId];
|
int trackId = fileIdTracks[fileId];
|
||||||
if (trackIdNames.ContainsKey(trackId))
|
if (!trackIdNames.ContainsKey(trackId))
|
||||||
{
|
continue;
|
||||||
|
|
||||||
string trackName = trackIdNames[trackId];
|
string trackName = trackIdNames[trackId];
|
||||||
string destFile = outDir + "sound\\named\\" + trackName + ".ogg";
|
string destFile = _outDir + "sound\\named\\" + trackName + ".ogg";
|
||||||
|
|
||||||
|
if (File.Exists(destFile) && !overwrite)
|
||||||
|
continue;
|
||||||
|
|
||||||
if (!File.Exists(destFile) || overwrite)
|
|
||||||
File.Copy(soundFile, destFile, true);
|
File.Copy(soundFile, destFile, true);
|
||||||
|
|
||||||
Console.WriteLine(destFile);
|
Console.WriteLine(destFile);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//redundancy, whatever
|
//redundancy, whatever
|
||||||
if (incomplete)
|
if (incomplete)
|
||||||
{
|
{
|
||||||
if (!Directory.Exists(outDir + "sound\\named\\incomplete\\"))
|
if (!Directory.Exists(_outDir + "sound\\named\\incomplete\\"))
|
||||||
Directory.CreateDirectory(outDir + "sound\\named\\incomplete");
|
Directory.CreateDirectory(_outDir + "sound\\named\\incomplete");
|
||||||
|
|
||||||
foreach (string soundFile in Directory.GetFiles(outDir + "sound\\incomplete\\"))
|
foreach (string soundFile in Directory.GetFiles(_outDir + "sound\\incomplete\\"))
|
||||||
{
|
{
|
||||||
string fileIdString = Path.GetFileNameWithoutExtension(soundFile);
|
string fileIdString = Path.GetFileNameWithoutExtension(soundFile);
|
||||||
|
|
||||||
|
@ -555,26 +562,27 @@ namespace RSCacheTool
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
uint fileId;
|
uint fileId;
|
||||||
if (uint.TryParse(fileIdString, out fileId))
|
if (!uint.TryParse(fileIdString, out fileId))
|
||||||
{
|
continue;
|
||||||
if (fileIdTracks.ContainsKey(fileId))
|
|
||||||
{
|
if (!fileIdTracks.ContainsKey(fileId))
|
||||||
|
continue;
|
||||||
|
|
||||||
int trackId = fileIdTracks[fileId];
|
int trackId = fileIdTracks[fileId];
|
||||||
if (trackIdNames.ContainsKey(trackId))
|
if (!trackIdNames.ContainsKey(trackId))
|
||||||
{
|
continue;
|
||||||
|
|
||||||
string trackName = trackIdNames[trackId];
|
string trackName = trackIdNames[trackId];
|
||||||
string destFile = outDir + "sound\\named\\incomplete\\" + trackName + ".ogg";
|
string destFile = _outDir + "sound\\named\\incomplete\\" + trackName + ".ogg";
|
||||||
|
|
||||||
|
if (File.Exists(destFile) && !overwrite)
|
||||||
|
continue;
|
||||||
|
|
||||||
if (!File.Exists(destFile) || overwrite)
|
|
||||||
File.Copy(soundFile, destFile, true);
|
File.Copy(soundFile, destFile, true);
|
||||||
|
|
||||||
Console.WriteLine(destFile);
|
Console.WriteLine(destFile);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
Console.WriteLine("Entry points within resolving file could not be found.");
|
Console.WriteLine("Entry points within resolving file could not be found.");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue