Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2025-01-12 04:49:32 +08:00
Code Issues Projects Releases Wiki Activity

added ZIP settings for archive creation.

Browse Source 
also ignore directories in entries list.
This commit is contained in:
morkt 2016-03-06 03:28:58 +04:00
parent 55d72aa9bb
commit 66dc447ddb
4 changed files with 56 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ArcFormats/ArcZIP.cs
View File

@ -30,6 +30,8 @@ using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using GameRes.Formats.Properties;
using GameRes.Formats.Strings;
namespace GameRes.Formats.PkWare namespace GameRes.Formats.PkWare
{ {
@ -97,7 +99,8 @@ namespace GameRes.Formats.PkWare
var zip = new ZipArchive (input, ZipArchiveMode.Read, false, Encodings.cp932); var zip = new ZipArchive (input, ZipArchiveMode.Read, false, Encodings.cp932);
try try
{ {
var dir = zip.Entries.Select (z => new ZipEntry (z) as Entry).ToList(); var dir = zip.Entries.Where (z => !z.FullName.EndsWith ("/"))
.Select (z => new ZipEntry (z) as Entry).ToList();
return new PkZipArchive (file, this, dir, zip); return new PkZipArchive (file, this, dir, zip);
} }
catch catch
@ -147,9 +150,18 @@ namespace GameRes.Formats.PkWare
public override ResourceOptions GetDefaultOptions () public override ResourceOptions GetDefaultOptions ()
{ {
Encoding enc;
try
{
enc = Encoding.GetEncoding (Settings.Default.ZIPEncodingCP);
}
catch
{
enc = Encodings.cp932;
}
return new ZipOptions { return new ZipOptions {
CompressionLevel = CompressionLevel.Optimal, CompressionLevel = Settings.Default.ZIPCompression,
FileNameEncoding = Encodings.cp932, FileNameEncoding = enc,
}; };
} }
@ -158,7 +170,8 @@ namespace GameRes.Formats.PkWare
public override void Create (Stream output, IEnumerable<Entry> list, ResourceOptions options, public override void Create (Stream output, IEnumerable<Entry> list, ResourceOptions options,
EntryCallback callback) EntryCallback callback)
{ {
var zip_options = (ZipOptions)options; var zip_options = GetOptions<ZipOptions> (options);
int callback_count = 0;
using (var zip = new ZipArchive (output, ZipArchiveMode.Create, true, zip_options.FileNameEncoding)) using (var zip = new ZipArchive (output, ZipArchiveMode.Create, true, zip_options.FileNameEncoding))
{ {
foreach (var entry in list) foreach (var entry in list)
@ -167,6 +180,8 @@ namespace GameRes.Formats.PkWare
using (var input = File.OpenRead (entry.Name)) using (var input = File.OpenRead (entry.Name))
using (var zip_file = zip_entry.Open()) using (var zip_file = zip_entry.Open())
{ {
if (null != callback)
callback (++callback_count, entry, arcStrings.MsgAddingFile);
input.CopyTo (zip_file); input.CopyTo (zip_file);
} }
} }

26
ArcFormats/Properties/Settings.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.34209 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@ -477,5 +477,29 @@ namespace GameRes.Formats.Properties {
this["YPFScheme"] = value; this["YPFScheme"] = value;
} }
} }
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Optimal")]
public global::System.IO.Compression.CompressionLevel ZIPCompression {
get {
return ((global::System.IO.Compression.CompressionLevel)(this["ZIPCompression"]));
}
set {
this["ZIPCompression"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("932")]
public int ZIPEncodingCP {
get {
return ((int)(this["ZIPEncodingCP"]));
}
set {
this["ZIPEncodingCP"] = value;
}
}
} }
} }

6
ArcFormats/Properties/Settings.settings
View File

@ -116,5 +116,11 @@
<Setting Name="YPFScheme" Type="System.String" Scope="User"> <Setting Name="YPFScheme" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)" />
</Setting> </Setting>
<Setting Name="ZIPCompression" Type="System.IO.Compression.CompressionLevel" Scope="User">
<Value Profile="(Default)">Optimal</Value>
</Setting>
<Setting Name="ZIPEncodingCP" Type="System.Int32" Scope="User">
<Value Profile="(Default)">932</Value>
</Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>

6
ArcFormats/app.config
View File

@ -118,6 +118,12 @@
<setting name="YPFScheme" serializeAs="String"> <setting name="YPFScheme" serializeAs="String">
<value /> <value />
</setting> </setting>
<setting name="ZIPCompression" serializeAs="String">
<value>Optimal</value>
</setting>
<setting name="ZIPEncodingCP" serializeAs="String">
<value>932</value>
</setting>
</GameRes.Formats.Properties.Settings> </GameRes.Formats.Properties.Settings>
</userSettings> </userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>