Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-12-05 03:15:36 +08:00
Code Issues Projects Releases Wiki Activity

supply filename to FileNotFoundException when possible.

Browse Source
This commit is contained in:
morkt 2016-10-24 19:57:58 +04:00
parent 3034d55d47
commit c97985e5d0
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArcFormats/Entis/ImageERI.cs
View File

@ -300,7 +300,7 @@ namespace GameRes.Formats.Entis
{ {
var ref_info = ReadMetaData (ref_src) as EriMetaData; var ref_info = ReadMetaData (ref_src) as EriMetaData;
if (null == ref_info) if (null == ref_info)
throw new FileNotFoundException ("Referenced image not found"); throw new FileNotFoundException ("Referenced image not found", ref_file);
ref_info.FileName = ref_file; ref_info.FileName = ref_file;
var ref_reader = ReadImageData (ref_src, ref_info); var ref_reader = ReadImageData (ref_src, ref_info);
AddImageBuffer (meta, reader.Data, ref_info, ref_reader.Data); AddImageBuffer (meta, reader.Data, ref_info, ref_reader.Data);

4
ArcFormats/KiriKiri/ImageTLG.cs
View File

@ -109,6 +109,10 @@ namespace GameRes.Formats.KiriKiri
if (null != blended_image) if (null != blended_image)
return blended_image; return blended_image;
} }
catch (FileNotFoundException X)
{
Trace.WriteLine (string.Format ("{0}: {1}", X.Message, X.FileName), "[TlgFormat.Read]");
}
catch (Exception X) catch (Exception X)
{ {
Trace.WriteLine (X.Message, "[TlgFormat.Read]"); Trace.WriteLine (X.Message, "[TlgFormat.Read]");

6
GameRes/FileSystem.cs
View File

@ -303,7 +303,7 @@ namespace GameRes
{ {
Entry entry = null; Entry entry = null;
if (!m_dir.TryGetValue (filename, out entry)) if (!m_dir.TryGetValue (filename, out entry))
throw new FileNotFoundException(); throw new FileNotFoundException ("Unable to find the specified file.", filename);
return entry; return entry;
} }
@ -373,7 +373,7 @@ namespace GameRes
var dir_name = filename + PathDelimiter; var dir_name = filename + PathDelimiter;
if (m_dir.Keys.Any (n => n.StartsWith (dir_name))) if (m_dir.Keys.Any (n => n.StartsWith (dir_name)))
return new SubDirEntry (filename); return new SubDirEntry (filename);
throw new FileNotFoundException(); throw new FileNotFoundException ("Unable to find the specified file.", filename);
} }
static readonly Regex path_re = new Regex (@"\G[/\\]?([^/\\]+)([/\\])"); static readonly Regex path_re = new Regex (@"\G[/\\]?([^/\\]+)([/\\])");
@ -678,7 +678,7 @@ namespace GameRes
{ {
var entry = m_vfs.Top.FindFile (desired[Count-1]); var entry = m_vfs.Top.FindFile (desired[Count-1]);
if (entry is SubDirEntry) if (entry is SubDirEntry)
throw new FileNotFoundException(); throw new FileNotFoundException ("Unable to find the specified file.", desired[Count-1]);
m_vfs.ChDir (entry); m_vfs.ChDir (entry);
} }
m_vfs.Top.CurrentDirectory = desired.Last(); m_vfs.Top.CurrentDirectory = desired.Last();