claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ArchiveTools, DatFile] Ensure output filenames are legal

Browse Source
This commit is contained in:
Matt Nadareski
2016-11-01 15:50:32 -07:00
parent dd3768cbbb
commit 6d5217355e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SabreTools.Helper/Dats/DatFile.cs
View File

@@ -4494,7 +4494,7 @@ namespace SabreTools.Helper.Dats
{ {
string infile = pathsToFiles[i]; string infile = pathsToFiles[i];
Rom outrom = romsInGame[i]; Rom outrom = romsInGame[i];
string outfile = Path.Combine(outDir, outrom.Machine.Name, outrom.Name); string outfile = Path.Combine(outDir, Style.RemovePathUnsafeCharacters(outrom.Machine.Name), outrom.Name);
// Make sure the output folder is created // Make sure the output folder is created
Directory.CreateDirectory(Path.GetDirectoryName(outfile)); Directory.CreateDirectory(Path.GetDirectoryName(outfile));
@@ -4517,6 +4517,7 @@ namespace SabreTools.Helper.Dats
{ {
string infile = pathsToFiles[i]; string infile = pathsToFiles[i];
Rom outrom = romsInGame[i]; Rom outrom = romsInGame[i];
outrom.Machine.Name = Style.RemovePathUnsafeCharacters(outrom.Machine.Name);
ArchiveTools.WriteTorrentGZ(infile, outDir, romba, logger); ArchiveTools.WriteTorrentGZ(infile, outDir, romba, logger);
} }
break; break;

4
SabreTools.Helper/Tools/ArchiveTools.cs
View File

@@ -898,7 +898,7 @@ namespace SabreTools.Helper.Tools
} }
// Get the output archive name from the first rebuild rom // Get the output archive name from the first rebuild rom
string archiveFileName = Path.Combine(outDir, roms[0].Machine.Name + (roms[0].Machine.Name.EndsWith(".tar") ? "" : ".tar")); string archiveFileName = Path.Combine(outDir, Style.RemovePathUnsafeCharacters(roms[0].Machine.Name) + (roms[0].Machine.Name.EndsWith(".tar") ? "" : ".tar"));
// Set internal variables // Set internal variables
Stream tarstream = new MemoryStream(); Stream tarstream = new MemoryStream();
@@ -1224,7 +1224,7 @@ namespace SabreTools.Helper.Tools
} }
// Get the output archive name from the first rebuild rom // Get the output archive name from the first rebuild rom
string archiveFileName = Path.Combine(outDir, roms[0].Machine.Name + (roms[0].Machine.Name.EndsWith(".zip") ? "" : ".zip")); string archiveFileName = Path.Combine(outDir, Style.RemovePathUnsafeCharacters(roms[0].Machine.Name) + (roms[0].Machine.Name.EndsWith(".zip") ? "" : ".zip"));
// Set internal variables // Set internal variables
Stream writeStream = null; Stream writeStream = null;