Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-11-27 07:34:00 +08:00
Code Issues Projects Releases Wiki Activity

(NoaOpener): password query moved to separate method.

Browse Source
This commit is contained in:
morkt 2016-10-29 05:36:51 +04:00
parent 5dbddd1273
commit 8238e0fa20
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ArcFormats/Entis/ArcNOA.cs
View File

@ -2,7 +2,7 @@
//! \date Thu Apr 23 15:57:17 2015 //! \date Thu Apr 23 15:57:17 2015
//! \brief Entis GLS engine archives implementation. //! \brief Entis GLS engine archives implementation.
// //
// Copyright (C) 2015 by morkt // Copyright (C) 2015-2016 by morkt
// //
// Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
@ -95,21 +95,7 @@ namespace GameRes.Formats.Entis
if (!reader.HasEncrypted) if (!reader.HasEncrypted)
return new ArcFile (file, this, reader.Dir); return new ArcFile (file, this, reader.Dir);
var options = Query<NoaOptions> (arcStrings.ArcEncryptedNotice); var password = GetArcPassword (file.Name);
string password = null;
if (!string.IsNullOrEmpty (options.PassPhrase))
{
password = options.PassPhrase;
}
else if (!string.IsNullOrEmpty (options.Scheme))
{
Dictionary<string, string> filemap;
if (KnownKeys.TryGetValue (options.Scheme, out filemap))
{
var filename = Path.GetFileName (file.Name).ToLowerInvariant();
filemap.TryGetValue (filename, out password);
}
}
if (string.IsNullOrEmpty (password)) if (string.IsNullOrEmpty (password))
return new ArcFile (file, this, reader.Dir); return new ArcFile (file, this, reader.Dir);
return new NoaArchive (file, this, reader.Dir, password); return new NoaArchive (file, this, reader.Dir, password);
@ -147,6 +133,31 @@ namespace GameRes.Formats.Entis
return input; return input;
} }
string GetArcPassword (string arc_name)
{
var title = FormatCatalog.Instance.LookupGame (arc_name, @"..\*.exe");
if (string.IsNullOrEmpty (title) || !KnownKeys.ContainsKey (title))
{
var options = Query<NoaOptions> (arcStrings.ArcEncryptedNotice);
if (!string.IsNullOrEmpty (options.PassPhrase))
{
return options.PassPhrase;
}
title = options.Scheme;
}
string password = null;
if (!string.IsNullOrEmpty (title))
{
Dictionary<string, string> filemap;
if (KnownKeys.TryGetValue (title, out filemap))
{
var filename = Path.GetFileName (arc_name).ToLowerInvariant();
filemap.TryGetValue (filename, out password);
}
}
return password;
}
Stream DecodeNemesis (Stream input) Stream DecodeNemesis (Stream input)
{ {
var decoder = new NemesisDecodeContext(); var decoder = new NemesisDecodeContext();