11using System ;
2- using System . Collections . Concurrent ;
3- using System . Collections . Generic ;
2+ using System . Diagnostics . CodeAnalysis ;
43using System . IO ;
54using System . Linq ;
5+ using System . Runtime . InteropServices ;
66using System . Threading ;
77using System . Threading . Tasks ;
88
99namespace LibBundle
1010{
1111 public class BundleContainer
1212 {
13- [ System . Runtime . InteropServices . DllImport ( "oo2core_8_win64.dll" ) ]
14- public static extern int OodleLZ_Decompress ( byte [ ] buffer , int bufferSize , byte [ ] result , long outputBufferSize , int a , int b , int c , IntPtr d , long e , IntPtr f , IntPtr g , IntPtr h , long i , int ThreadModule ) ;
15- [ System . Runtime . InteropServices . DllImport ( "oo2core_8_win64.dll" ) ]
13+ [ DllImport ( "oo2core_8_win64.dll" ) ]
14+ [ SuppressMessage ( "Interoperability" , "CA1401:不應看得見 P/Invoke" ) ]
15+ public static extern int OodleLZ_Decompress ( byte [ ] buffer , int bufferSize , byte [ ] result , long outputBufferSize , int a , int b , int c , IntPtr d , long e , IntPtr f , IntPtr g , IntPtr h , long i , int ThreadModule ) ;
16+ [ DllImport ( "oo2core_8_win64.dll" ) ]
17+ [ SuppressMessage ( "Interoperability" , "CA1401:不應看得見 P/Invoke" ) ]
1618 public static extern int OodleLZ_Compress ( ENCODE_TYPES format , byte [ ] buffer , long bufferSize , byte [ ] outputBuffer , COMPRESSTION_LEVEL level , IntPtr opts , long offs , long unused , IntPtr scratch , long scratch_size ) ;
1719 public enum ENCODE_TYPES
1820 {
@@ -63,15 +65,15 @@ public enum COMPRESSTION_LEVEL
6365 public int unknown5 ; // 0
6466 public int unknown6 ; // 0
6567
66- //For UnPacking
68+ // For UnPacking
6769 public BundleContainer ( string path )
6870 {
6971 this . path = path ;
7072 var br = new BinaryReader ( File . Open ( path , FileMode . Open , FileAccess . Read , FileShare . ReadWrite ) ) ;
7173 Initialize ( br ) ;
7274 br . Close ( ) ;
7375 }
74- //For UnPacking
76+ // For UnPacking
7577 public BundleContainer ( BinaryReader br )
7678 {
7779 Initialize ( br ) ;
@@ -94,7 +96,7 @@ private void Initialize(BinaryReader br)
9496 unknown6 = br . ReadInt32 ( ) ;
9597 }
9698
97- //For Packing
99+ // For Packing
98100 public BundleContainer ( )
99101 {
100102 offset = 0 ;
@@ -104,36 +106,34 @@ public BundleContainer()
104106 unknown3 = unknown4 = unknown5 = unknown6 = 0 ;
105107 }
106108
107- //UnPacking
109+ // UnPacking
108110 public virtual MemoryStream Read ( string path = null )
109111 {
110- if ( path == null )
111- path = this . path ;
112112 offset = 0 ;
113- var br = new BinaryReader ( File . Open ( path , FileMode . Open , FileAccess . Read , FileShare . ReadWrite ) ) ;
113+ var br = new BinaryReader ( File . OpenRead ( path ?? this . path ) ) ;
114114 var ms = Read ( br ) ;
115115 br . Close ( ) ;
116116 return ms ;
117117 }
118- //UnPacking
118+ // UnPacking
119119 public virtual MemoryStream Read ( BinaryReader br )
120120 {
121121 br . BaseStream . Seek ( offset + 60 , SeekOrigin . Begin ) ;
122122
123123 var chunks = new int [ entry_count ] ;
124- for ( int i = 0 ; i < entry_count ; i ++ )
124+ for ( var i = 0 ; i < entry_count ; i ++ )
125125 chunks [ i ] = br . ReadInt32 ( ) ;
126126
127127 var compressed = new byte [ entry_count ] [ ] ;
128128 for ( int i = 0 ; i < entry_count ; i ++ )
129129 compressed [ i ] = br . ReadBytes ( chunks [ i ] ) ;
130130
131- Parallel . For ( 0 , entry_count , i => {
132- var size = ( i + 1 == entry_count ) ? uncompressed_size - ( chunk_size * ( entry_count - 1 ) ) : chunk_size ; // isLast ?
133- var toSave = new byte [ size + 64 ] ;
134- OodleLZ_Decompress ( compressed [ i ] , compressed [ i ] . Length , toSave , size , 0 , 0 , 0 , IntPtr . Zero , 0 , IntPtr . Zero , IntPtr . Zero , IntPtr . Zero , 0 , 3 ) ;
135- compressed [ i ] = toSave . Take ( size ) . ToArray ( ) ;
136- } ) ;
131+ Parallel . For ( 0 , entry_count , i => {
132+ var size = ( i + 1 == entry_count ) ? uncompressed_size - ( chunk_size * ( entry_count - 1 ) ) : chunk_size ; // isLast ?
133+ var toSave = new byte [ size + 64 ] ;
134+ _ = OodleLZ_Decompress ( compressed [ i ] , compressed [ i ] . Length , toSave , size , 0 , 0 , 0 , IntPtr . Zero , 0 , IntPtr . Zero , IntPtr . Zero , IntPtr . Zero , 0 , 3 ) ;
135+ compressed [ i ] = toSave . Take ( size ) . ToArray ( ) ;
136+ } ) ;
137137
138138 var data = new MemoryStream ( uncompressed_size ) ;
139139 for ( int i = 0 ; i < entry_count ; i ++ )
@@ -144,10 +144,8 @@ public virtual MemoryStream Read(BinaryReader br)
144144
145145 public virtual byte [ ] AppendAndSave ( Stream newData , string path = null )
146146 {
147- if ( path == null )
148- path = this . path ;
149147 offset = 0 ;
150- return AppendAndSave ( newData , File . Open ( path , FileMode . Open , FileAccess . Read , FileShare . ReadWrite ) ) ;
148+ return AppendAndSave ( newData , File . Open ( path ?? this . path , FileMode . Open , FileAccess . Read , FileShare . ReadWrite ) ) ;
151149 }
152150
153151 public virtual byte [ ] AppendAndSave ( Stream newData , Stream originalData )
@@ -158,7 +156,7 @@ public virtual byte[] AppendAndSave(Stream newData, Stream originalData)
158156
159157 var lastCunkCompressedSize = originalData . ReadByte ( ) | originalData . ReadByte ( ) << 8 | originalData . ReadByte ( ) << 16 | originalData . ReadByte ( ) << 24 ; // ReadInt32
160158
161- var lastCunkDecompressedSize = uncompressed_size - ( chunk_size * ( entry_count - 1 ) ) ;
159+ var lastCunkDecompressedSize = uncompressed_size - chunk_size * ( entry_count - 1 ) ;
162160
163161 uncompressed_size = ( int ) ( size_decompressed += newData . Length ) ;
164162 entry_count = uncompressed_size / chunk_size ;
@@ -168,7 +166,7 @@ public virtual byte[] AppendAndSave(Stream newData, Stream originalData)
168166 var msToSave = new MemoryStream ( ) ;
169167 var bw = new BinaryWriter ( msToSave ) ;
170168
171- msToSave . Seek ( 60 + ( entry_count * 4 ) , SeekOrigin . Begin ) ;
169+ msToSave . Seek ( 60 + entry_count * 4 , SeekOrigin . Begin ) ;
172170 var o = new byte [ compressed_size - lastCunkCompressedSize ] ;
173171 originalData . Read ( o ) ;
174172 bw . Write ( o ) ;
@@ -180,19 +178,19 @@ public virtual byte[] AppendAndSave(Stream newData, Stream originalData)
180178
181179 newData . Seek ( 0 , SeekOrigin . Begin ) ;
182180 compressed_size -= lastCunkCompressedSize ;
183- var NewChunkCompressedSizes = new int [ entry_count - ( OldChunkCompressedSizes . Length / 4 ) ] ;
181+ var NewChunkCompressedSizes = new int [ entry_count - OldChunkCompressedSizes . Length / 4 ] ;
184182
185183 var FirstNewDataChunk = new byte [ Math . Min ( chunk_size - lastCunkDecompressedSize , newData . Length ) ] ;
186184 newData . Read ( FirstNewDataChunk ) ;
187- FirstNewDataChunk = lastCunkDecompressedData . Take ( lastCunkDecompressedSize ) . Concat ( FirstNewDataChunk ) . ToArray ( ) ; // Decompressed
185+ FirstNewDataChunk = lastCunkDecompressedData . Take ( lastCunkDecompressedSize ) . Concat ( FirstNewDataChunk ) . ToArray ( ) ;
188186 var CompressedChunk = new byte [ FirstNewDataChunk . Length + 548 ] ;
189187 var CompressedLength = OodleLZ_Compress ( encoder , FirstNewDataChunk , FirstNewDataChunk . Length , CompressedChunk , Compression_Level , IntPtr . Zero , 0 , 0 , IntPtr . Zero , 0 ) ;
190188 compressed_size += NewChunkCompressedSizes [ 0 ] = CompressedLength ;
191- bw . Write ( CompressedChunk , 0 , CompressedLength ) ; // Compressed
189+ bw . Write ( CompressedChunk , 0 , CompressedLength ) ; // The Length is important
192190 var byteArrays = new byte [ NewChunkCompressedSizes . Length ] [ ] ;
193- for ( int i = 1 ; i < NewChunkCompressedSizes . Length ; i ++ )
191+ for ( var i = 1 ; i < NewChunkCompressedSizes . Length ; i ++ )
194192 {
195- var size = ( i + 1 == NewChunkCompressedSizes . Length ) ? uncompressed_size - ( chunk_size * ( entry_count - 1 ) ) : chunk_size ;
193+ var size = ( i + 1 == NewChunkCompressedSizes . Length ) ? uncompressed_size - chunk_size * ( entry_count - 1 ) : chunk_size ;
196194 newData . Read ( byteArrays [ i ] = new byte [ size ] ) ;
197195 }
198196 Parallel . For ( 1 , NewChunkCompressedSizes . Length , i => {
@@ -201,16 +199,14 @@ public virtual byte[] AppendAndSave(Stream newData, Stream originalData)
201199 byteArrays [ i ] = by ;
202200 Interlocked . Add ( ref compressed_size , NewChunkCompressedSizes [ i ] = l ) ;
203201 } ) ;
204- for ( int i = 0 ; i < NewChunkCompressedSizes . Length - 1 ; i ++ )
202+ for ( int i = 1 ; i < NewChunkCompressedSizes . Length ; i ++ )
205203 bw . Write ( byteArrays [ i ] , 0 , NewChunkCompressedSizes [ i ] ) ;
206204
207205 size_compressed = compressed_size ;
208206
209207 msToSave . Seek ( 60 , SeekOrigin . Begin ) ;
210208 bw . Write ( OldChunkCompressedSizes ) ;
211- for ( int i = 0 ; i < NewChunkCompressedSizes . Length ; i ++ )
212- bw . Write ( NewChunkCompressedSizes [ i ] ) ;
213-
209+ foreach ( var t in NewChunkCompressedSizes ) bw . Write ( t ) ;
214210 msToSave . Seek ( 0 , SeekOrigin . Begin ) ;
215211 bw . Write ( uncompressed_size ) ;
216212 bw . Write ( compressed_size ) ;
@@ -232,21 +228,21 @@ public virtual byte[] AppendAndSave(Stream newData, Stream originalData)
232228 return result ;
233229 }
234230
235- //Packing
231+ // Packing
236232 public virtual void Save ( Stream newData , string path )
237233 {
238- var bw = new BinaryWriter ( File . Open ( path , FileMode . Open , FileAccess . Write , FileShare . ReadWrite ) ) ;
234+ var bw = new BinaryWriter ( File . OpenWrite ( path ) ) ;
239235
240236 uncompressed_size = ( int ) ( size_decompressed = newData . Length ) ;
241237 entry_count = uncompressed_size / chunk_size ;
242238 if ( uncompressed_size % chunk_size != 0 ) entry_count ++ ;
243239 head_size = entry_count * 4 + 48 ;
244240
245- bw . BaseStream . Seek ( 60 + ( entry_count * 4 ) , SeekOrigin . Begin ) ;
241+ bw . BaseStream . Seek ( 60 + entry_count * 4 , SeekOrigin . Begin ) ;
246242 newData . Seek ( 0 , SeekOrigin . Begin ) ;
247243 compressed_size = 0 ;
248244 var chunks = new int [ entry_count ] ;
249- for ( int i = 0 ; i < entry_count ; i ++ )
245+ for ( var i = 0 ; i < entry_count ; i ++ )
250246 {
251247 var b = new byte [ i + 1 == entry_count ? uncompressed_size - ( entry_count - 1 ) * chunk_size : chunk_size ] ;
252248 newData . Read ( b , 0 , b . Length ) ;
@@ -258,8 +254,7 @@ public virtual void Save(Stream newData, string path)
258254 size_compressed = compressed_size ;
259255
260256 bw . BaseStream . Seek ( 60 , SeekOrigin . Begin ) ;
261- for ( int i = 0 ; i < entry_count ; i ++ )
262- bw . Write ( chunks [ i ] ) ;
257+ foreach ( var c in chunks ) bw . Write ( c ) ;
263258
264259 bw . BaseStream . Seek ( 0 , SeekOrigin . Begin ) ;
265260 bw . Write ( uncompressed_size ) ;
@@ -279,7 +274,7 @@ public virtual void Save(Stream newData, string path)
279274 bw . Flush ( ) ;
280275 bw . Close ( ) ;
281276 }
282- //Packing
277+ // Packing
283278 public virtual byte [ ] Save ( Stream newData )
284279 {
285280 var msToSave = new MemoryStream ( ) ;
@@ -290,12 +285,12 @@ public virtual byte[] Save(Stream newData)
290285 if ( uncompressed_size % chunk_size != 0 ) entry_count ++ ;
291286 head_size = entry_count * 4 + 48 ;
292287
293- msToSave . Seek ( 60 + ( entry_count * 4 ) , SeekOrigin . Begin ) ;
288+ msToSave . Seek ( 60 + entry_count * 4 , SeekOrigin . Begin ) ;
294289 newData . Seek ( 0 , SeekOrigin . Begin ) ;
295290 compressed_size = 0 ;
296291 var chunks = new int [ entry_count ] ;
297292 var byteArrays = new byte [ entry_count ] [ ] ;
298- for ( int i = 0 ; i < entry_count ; i ++ )
293+ for ( var i = 0 ; i < entry_count ; i ++ )
299294 {
300295 var b = new byte [ i + 1 == entry_count ? uncompressed_size - ( entry_count - 1 ) * chunk_size : chunk_size ] ;
301296 newData . Read ( byteArrays [ i ] = b ) ;
@@ -311,8 +306,7 @@ public virtual byte[] Save(Stream newData)
311306 bw . Write ( byteArrays [ i ] , 0 , chunks [ i ] ) ;
312307
313308 msToSave . Seek ( 60 , SeekOrigin . Begin ) ;
314- for ( int i = 0 ; i < entry_count ; i ++ )
315- bw . Write ( chunks [ i ] ) ;
309+ foreach ( var c in chunks ) bw . Write ( c ) ;
316310
317311 msToSave . Seek ( 0 , SeekOrigin . Begin ) ;
318312 bw . Write ( uncompressed_size ) ;
0 commit comments