ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/oup/current/DataAccess/Access_OniArchive.pas

Comparing oup/current/DataAccess/Access_OniArchive.pas (file contents):
Revision 116 by alloc, Mon Feb 26 22:57:02 2007 UTC vs.
Revision 231 by alloc, Wed Jun 20 22:24:04 2007 UTC

#	Line 15 | Line 15 | type
15		FDatOpened:          Boolean;
16		FRawOpened:          Boolean;
17		FSepOpened:          Boolean;
18	+	procedure SetUnloadWhenUnused(doit: Boolean);
19		protected
20		public
21	<	property UnloadWhenUnused: Boolean Read FUnloadWhenUnused Write FUnloadWhenUnused;
21	>	property UnloadWhenUnused: Boolean Read FUnloadWhenUnused Write SetUnloadWhenUnused;
22
23		constructor Create(DatFilename: String; ConnectionID: Integer; var Msg: TStatusMessages); override;
24		procedure Close; override;
#	Line 38 | Line 39 | type
39		function GetRawList(FileID: Integer): TRawDataList; override;
40		function GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo; override;
41
42	<	procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer);
42	>	procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; var target: TStream); overload;
43	>	procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer); overload;
44		procedure LoadRawFile(FileID, DatOffset: Integer; var Target: TStream); overload; override;
45		procedure UpdateRawFile(FileID, DatOffset: Integer; Src: TStream); overload; override;
46		procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TStream); overload; override;
#	Line 51 | Line 53 | type
53		implementation
54
55		uses
56	<	SysUtils, StrUtils, Data, Functions, RawList, DatLinks;
56	>	SysUtils, StrUtils, Data, Functions, RawList, DatLinks, Math;
57
58
59		(*
#	Line 158 | Line 160 | begin
160		FBackend := DB_ONI;
161		FConnectionID := ConnectionID;
162		FChangeRights := [CR_EditDat, CR_EditRaw, CR_AppendRaw];
163	+
164	+	inherited;
165		end;
166
167
168
169
170	+	procedure TAccess_OniArchive.SetUnloadWhenUnused(doit: Boolean);
171	+	begin
172	+	FUnloadWhenUnused := doit;
173	+	if FUnloadWhenUnused then
174	+	begin
175	+	if FDatOpened then
176	+	begin
177	+	FDatOpened := False;
178	+	Fdat_file.Free;
179	+	end;
180	+	if FRawOpened then
181	+	begin
182	+	FRawOpened := False;
183	+	Fraw_file.Free;
184	+	end;
185	+	if FSepOpened then
186	+	begin
187	+	FSepOpened := False;
188	+	Fsep_file.Free;
189	+	end;
190	+	end
191	+	else
192	+	begin
193	+	if not FDatOpened then
194	+	begin
195	+	Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
196	+	FDatOpened := True;
197	+	end;
198	+	if not FRawOpened then
199	+	begin
200	+	Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
201	+	fmOpenReadWrite);
202	+	FRawOpened := True;
203	+	end;
204	+	if (not FSepOpened) and (FDataOS <> DOS_WIN) then
205	+	begin
206	+	Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
207	+	fmOpenReadWrite);
208	+	FSepOpened := True;
209	+	end;
210	+	end;
211	+	end;
212	+
213	+
214	+
215	+
216	+
217		procedure TAccess_OniArchive.Close;
218		begin
219		if FDatOpened then
#	Line 318 | Line 369 | var
369		begin
370		if fileid < GetFileCount then
371		begin
372	<	if not Assigned(Target) then
322	<	Target := TMemoryStream.Create;
323	<	if not FDatOpened then
324	<	Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
325	<	Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning);
326	<	streampos := Target.Position;
327	<	Target.CopyFrom(Fdat_file, Fdat_files[fileid].Size);
328	<	Target.Seek(streampos, soFromBeginning);
329	<	if UnloadWhenUnused then
372	>	if GetFileInfo(FileID).Size > 0 then
373		begin
374	<	Fdat_file.Free;
375	<	FDatOpened := False;
376	<	end
377	<	else
378	<	FDatOpened := True;
374	>	if not Assigned(Target) then
375	>	Target := TMemoryStream.Create;
376	>	if not FDatOpened then
377	>	Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
378	>	Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning);
379	>	streampos := Target.Position;
380	>	Target.CopyFrom(Fdat_file, Fdat_files[fileid].Size);
381	>	Target.Seek(streampos, soFromBeginning);
382	>	if UnloadWhenUnused then
383	>	begin
384	>	Fdat_file.Free;
385	>	FDatOpened := False;
386	>	end
387	>	else
388	>	FDatOpened := True;
389	>	end;
390		end;
391		end;
392
#	Line 444 | Line 498 | end;
498
499
500
501	<
448	<	procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer);
501	>	procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; var target: TStream);
502		begin
503	+	if not Assigned(Target) then
504	+	Target := TMemoryStream.Create;
505		if not LocSep then
506		begin
507		if not FRawOpened then
#	Line 455 | Line 510 | begin
510		if RawAddr <= Fraw_file.Size then
511		begin
512		Fraw_file.Seek(RawAddr, soFromBeginning);
513	<	Fraw_file.Read(target^, size);
513	>	Target.CopyFrom(Fraw_file, size);
514	>	Target.Seek(0, soFromBeginning);
515		end;
516		if UnloadWhenUnused then
517		begin
#	Line 473 | Line 529 | begin
529		if RawAddr <= Fsep_file.Size then
530		begin
531		Fsep_file.Seek(RawAddr, soFromBeginning);
532	<	Fsep_file.Read(target^, size);
532	>	Target.CopyFrom(Fsep_file, size);
533	>	Target.Seek(0, soFromBeginning);
534		end;
535		if UnloadWhenUnused then
536		begin
#	Line 485 | Line 542 | begin
542		end;
543		end;
544
545	+	procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer);
546	+	var
547	+	data: TStream;
548	+	begin
549	+	data := nil;
550	+	LoadRawOffset(LocSep, RawAddr, Size, data);
551	+	data.Read(Target^, Size);
552	+	data.Free;
553	+	end;
554	+
555		procedure TAccess_OniArchive.LoadRawFile(FileID, DatOffset: Integer; var Target: TStream);
556		var
557		raw_info: TRawDataInfo;
#	Line 545 | Line 612 | begin
612		Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
613		fmOpenReadWrite);
614		Fraw_file.Seek(raw_info.RawAddr, soFromBeginning);
615	<	Fraw_file.CopyFrom(Src, raw_info.RawSize);
615	>	Fraw_file.CopyFrom(Src, Min(raw_info.RawSize, Src.Size));
616		if UnloadWhenUnused then
617		begin
618		FRawOpened := False;
#	Line 590 | Line 657 | begin
657		end;
658		end;
659
660	+
661		procedure TAccess_OniArchive.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream);
662		var
663		raw_info: TRawDataInfo;
#	Line 631 | Line 699 | begin
699		end;
700
701		function TAccess_OniArchive.AppendRawFile(LocSep: Boolean; Src: TStream): Integer;
702	+	const
703	+	EmptyBytes: Array[0..31] of Byte = (
704	+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 );
705		begin
706		if not LocSep then
707		begin
708		if not FRawOpened then
709		Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
710		fmOpenReadWrite);
711	+	if (Fraw_file.Size mod 32) > 0 then
712	+	Fraw_file.Write(EmptyBytes[0], 32 - (Fraw_file.Size mod 32));
713		Result := Fraw_file.Size;
714		Fraw_file.Seek(0, soFromEnd);
715		Fraw_file.CopyFrom(Src, Src.Size);
716	+	if (Fraw_file.Size mod 32) > 0 then
717	+	Fraw_file.Write(EmptyBytes[0], 32 - (Fraw_file.Size mod 32));
718		if UnloadWhenUnused then
719		begin
720		FRawOpened := False;
#	Line 653 | Line 728 | begin
728		if not FSepOpened then
729		Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
730		fmOpenReadWrite);
731	+	if (Fsep_file.Size mod 32) > 0 then
732	+	Fsep_file.Write(EmptyBytes[0], 32 - (Fsep_file.Size mod 32));
733		Result := Fsep_file.Size;
734		Fsep_file.Seek(0, soFromEnd);
735		Fsep_file.CopyFrom(Src, Src.Size);
736	+	if (Fsep_file.Size mod 32) > 0 then
737	+	Fsep_file.Write(EmptyBytes[0], 32 - (Fsep_file.Size mod 32));
738		if UnloadWhenUnused then
739		begin
740		FSepOpened := False;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)