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 113 by alloc, Sun Feb 25 17:20:22 2007 UTC vs.
Revision 248 by alloc, Mon Nov 26 11:02:28 2007 UTC

#	Line 11 | Line 11 | type
11		Fsep_file:           TFileStream;
12		Fdat_files:          TFiles;
13		Fdat_extensionsmap:  TExtensionsMap;
14	–	FUnloadWhenUnused:   Boolean;
15	–	FDatOpened:          Boolean;
16	–	FRawOpened:          Boolean;
17	–	FSepOpened:          Boolean;
14		protected
15		public
20	–	property UnloadWhenUnused: Boolean Read FUnloadWhenUnused Write FUnloadWhenUnused;
21	–
16		constructor Create(DatFilename: String; ConnectionID: Integer; var Msg: TStatusMessages); override;
17		procedure Close; override;
18
#	Line 34 | Line 28 | type
28		procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream); overload; override;
29
30		function GetDatLinks(FileID: Integer): TDatLinkList; override;
31	+	function GetDatLink(FileID, DatOffset: Integer): TDatLink; override;
32		function GetRawList(FileID: Integer): TRawDataList; override;
33		function GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo; override;
34	+	function GetRawsForType(RawType: String): TRawDataList; override;
35
36	<	procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer);
36	>	procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; var target: TStream); overload;
37	>	procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer); overload;
38		procedure LoadRawFile(FileID, DatOffset: Integer; var Target: TStream); overload; override;
39		procedure UpdateRawFile(FileID, DatOffset: Integer; Src: TStream); overload; override;
40		procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TStream); overload; override;
#	Line 50 | Line 47 | type
47		implementation
48
49		uses
50	<	SysUtils, StrUtils, Data, Functions, RawList;
50	>	SysUtils, StrUtils, Data, Functions, RawList, DatLinks, Math;
51
52
53		(*
#	Line 67 | Line 64 | var
64		Fdat_filesmap: TFilesMap;
65		Fdat_namedfilesmap: TNamedFilesMap;
66		begin
70	–	FUnloadWhenUnused := True;
71	–	FDatOpened := False;
72	–	FRawOpened := False;
67		Msg := SM_UnknownError;
68		if not FileExists(DatFilename) then
69		begin
#	Line 151 | Line 145 | begin
145		Fdat_file.Read(FLevelNumber, 1);
146		FLevelNumber := FLevelNumber div 2;
147
148	<	Fdat_file.Free;
148	>	Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
149	>	fmOpenReadWrite);
150	>	if not (FDataOS = DOS_WIN) then
151	>	Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
152	>	fmOpenReadWrite);
153
154		Msg := SM_OK;
155		FBackend := DB_ONI;
156		FConnectionID := ConnectionID;
157		FChangeRights := [CR_EditDat, CR_EditRaw, CR_AppendRaw];
158	+
159	+	inherited;
160		end;
161
162
#	Line 164 | Line 164 | end;
164
165		procedure TAccess_OniArchive.Close;
166		begin
167	<	if FDatOpened then
167	>	if Assigned(Fdat_file) then
168		Fdat_file.Free;
169	<	if FRawOpened then
169	>	if Assigned(Fraw_file) then
170		Fraw_file.Free;
171	<	if FSepOpened then
171	>	if Assigned(Fsep_file) then
172		Fsep_file.Free;
173		Self.Free;
174		end;
#	Line 232 | Line 232 | var
232		begin
233		list := TStringList.Create;
234		list.Sorted := True;
235	+	if ext = '*' then
236	+	ext := '';
237		for i := 0 to GetFileCount - 1 do
238		begin
239		if ((Length(ext) = 0) or (Pos(Fdat_files[i].Extension, ext) > 0)) and
#	Line 319 | Line 321 | begin
321		begin
322		if not Assigned(Target) then
323		Target := TMemoryStream.Create;
324	<	if not FDatOpened then
323	<	Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
324	<	Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning);
325	<	streampos := Target.Position;
326	<	Target.CopyFrom(Fdat_file, Fdat_files[fileid].Size);
327	<	Target.Seek(streampos, soFromBeginning);
328	<	if UnloadWhenUnused then
324	>	if GetFileInfo(FileID).Size > 0 then
325		begin
326	<	Fdat_file.Free;
327	<	FDatOpened := False;
328	<	end
329	<	else
330	<	FDatOpened := True;
326	>	Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning);
327	>	streampos := Target.Position;
328	>	Target.CopyFrom(Fdat_file, Fdat_files[fileid].Size);
329	>	Target.Seek(streampos, soFromBeginning);
330	>	end;
331		end;
332		end;
333
#	Line 339 | Line 335 | procedure TAccess_OniArchive.UpdateDatFi
335		begin
336		if fileid < GetFileCount then
337		begin
342	–	if not FDatOpened then
343	–	Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
338		Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning);
339		Fdat_file.CopyFrom(Src, Fdat_files[fileid].Size);
346	–	if UnloadWhenUnused then
347	–	begin
348	–	Fdat_file.Free;
349	–	FDatOpened := False;
350	–	end
351	–	else
352	–	FDatOpened := True;
340		end;
341		end;
342
#	Line 361 | Line 348 | begin
348		begin
349		if not Assigned(Target) then
350		Target := TMemoryStream.Create;
364	–	if not FDatOpened then
365	–	Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
351		Fdat_file.Seek(Fdat_files[fileid].DatAddr + offset, soFromBeginning);
352		streampos := Target.Position;
353		Target.CopyFrom(Fdat_file, size);
354		Target.Seek(streampos, soFromBeginning);
370	–	if UnloadWhenUnused then
371	–	begin
372	–	FDatOpened := False;
373	–	Fdat_file.Free;
374	–	end
375	–	else
376	–	FDatOpened := True;
355		end;
356		end;
357
#	Line 381 | Line 359 | procedure TAccess_OniArchive.UpdateDatFi
359		begin
360		if fileid < GetFileCount then
361		begin
384	–	if not FDatOpened then
385	–	Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite);
362		Fdat_file.Seek(Fdat_files[fileid].DatAddr + offset, soFromBeginning);
363		Fdat_file.CopyFrom(Src, Size);
388	–	if UnloadWhenUnused then
389	–	begin
390	–	Fdat_file.Free;
391	–	FDatOpened := False;
392	–	end
393	–	else
394	–	FDatOpened := True;
364		end;
365		end;
366
367
368
369	+	function TAccess_OniArchive.GetDatLink(FileID, DatOffset: Integer): TDatLink;
370	+	var
371	+	link: Integer;
372	+	begin
373	+	Result := DatLinksManager.GetDatLink(FConnectionID, FileID, DatOffset);
374	+	LoadDatFilePart(fileid, Result.SrcOffset, 4, @link);
375	+	if link > 0 then
376	+	Result.DestID := link div 256
377	+	else
378	+	Result.DestID := -1;
379	+	end;
380	+
381	+
382	+	function TAccess_OniArchive.GetDatLinks(FileID: Integer): TDatLinkList;
383	+	var
384	+	i: Integer;
385	+	link: Integer;
386	+	begin
387	+	Result := DatLinksManager.GetDatLinks(FConnectionID, FileID);
388	+	if Length(Result) > 0 then
389	+	begin
390	+	for i := 0 to High(Result) do
391	+	begin
392	+	LoadDatFilePart(fileid, Result[i].SrcOffset, 4, @link);
393	+	if link > 0 then
394	+	Result[i].DestID := link div 256
395	+	else
396	+	Result[i].DestID := -1;
397	+	end;
398	+	end;
399	+	end;
400	+
401	+
402		function TAccess_OniArchive.GetRawList(FileID: Integer): TRawDataList;
403		begin
404		Result := RawLists.GetRawList(FConnectionID, FileID);
405		end;
406
407
408	+	function TAccess_OniArchive.GetRawsForType(RawType: String): TRawDataList;
409	+	var
410	+	i, j: Integer;
411	+	dats: TStrings;
412	+	list: TRawDataList;
413	+	begin
414	+	dats := nil;
415	+	dats := GetFilesList(MidStr(RawType, 1, 4), '', True, ST_IDAsc);
416	+	for i := 0 to dats.Count - 1 do
417	+	begin
418	+	list := GetRawList(StrToInt(MidStr(dats.Strings[i], 1, 5)));
419	+	for j := 0 to Length(list) - 1 do
420	+	begin
421	+	if (list[j].RawType = RawType) and (list[j].RawSize > 0) then
422	+	begin
423	+	SetLength(Result, Length(Result)+1);
424	+	Result[High(Result)] := list[j];
425	+	end;
426	+	end;
427	+	end;
428	+	end;
429	+
430	+
431		function TAccess_OniArchive.GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo;
432		begin
433		Result := RawLists.GetRawInfo(FConnectionID, FileID, DatOffset);
#	Line 410 | Line 435 | end;
435
436
437
438	<
414	<	procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer);
438	>	procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; var target: TStream);
439		begin
440	+	if not Assigned(Target) then
441	+	Target := TMemoryStream.Create;
442		if not LocSep then
443		begin
418	–	if not FRawOpened then
419	–	Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
420	–	fmOpenReadWrite);
444		if RawAddr <= Fraw_file.Size then
445		begin
446		Fraw_file.Seek(RawAddr, soFromBeginning);
447	<	Fraw_file.Read(target^, size);
447	>	Target.CopyFrom(Fraw_file, size);
448	>	Target.Seek(0, soFromBeginning);
449		end;
426	–	if UnloadWhenUnused then
427	–	begin
428	–	FRawOpened := False;
429	–	Fraw_file.Free;
430	–	end
431	–	else
432	–	FRawOpened := True;
450		end
451		else
452		begin
436	–	if not FSepOpened then
437	–	Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
438	–	fmOpenReadWrite);
453		if RawAddr <= Fsep_file.Size then
454		begin
455		Fsep_file.Seek(RawAddr, soFromBeginning);
456	<	Fsep_file.Read(target^, size);
456	>	Target.CopyFrom(Fsep_file, size);
457	>	Target.Seek(0, soFromBeginning);
458		end;
444	–	if UnloadWhenUnused then
445	–	begin
446	–	FSepOpened := False;
447	–	Fsep_file.Free;
448	–	end
449	–	else
450	–	FSepOpened := True;
459		end;
460		end;
461
462	+	procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer);
463	+	var
464	+	data: TStream;
465	+	begin
466	+	data := nil;
467	+	LoadRawOffset(LocSep, RawAddr, Size, data);
468	+	data.Read(Target^, Size);
469	+	data.Free;
470	+	end;
471	+
472		procedure TAccess_OniArchive.LoadRawFile(FileID, DatOffset: Integer; var Target: TStream);
473		var
474		raw_info: TRawDataInfo;
#	Line 463 | Line 481 | begin
481		raw_info := Self.GetRawInfo(FileID, DatOffset);
482		if not raw_info.LocSep then
483		begin
466	–	if not FRawOpened then
467	–	Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
468	–	fmOpenReadWrite);
484		Fraw_file.Seek(raw_info.RawAddr, soFromBeginning);
485		streampos := Target.Position;
486		Target.CopyFrom(Fraw_file, raw_info.RawSize);
487		Target.Seek(streampos, soFromBeginning);
473	–	if UnloadWhenUnused then
474	–	begin
475	–	FRawOpened := False;
476	–	Fraw_file.Free;
477	–	end
478	–	else
479	–	FRawOpened := True;
488		end
489		else
490		begin
483	–	if FUnloadWhenUnused or not FSepOpened then
484	–	Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
485	–	fmOpenReadWrite);
491		Fsep_file.Seek(raw_info.RawAddr, soFromBeginning);
492		streampos := Target.Position;
493		Target.CopyFrom(Fsep_file, raw_info.RawSize);
494		Target.Seek(streampos, soFromBeginning);
490	–	if UnloadWhenUnused then
491	–	begin
492	–	FSepOpened := False;
493	–	Fsep_file.Free;
494	–	end
495	–	else
496	–	FSepOpened := True;
495		end;
496		end;
497		end;
#	Line 507 | Line 505 | begin
505		raw_info := GetRawInfo(FileID, DatOffset);
506		if not raw_info.LocSep then
507		begin
510	–	if not FRawOpened then
511	–	Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
512	–	fmOpenReadWrite);
508		Fraw_file.Seek(raw_info.RawAddr, soFromBeginning);
509	<	Fraw_file.CopyFrom(Src, raw_info.RawSize);
515	<	if UnloadWhenUnused then
516	<	begin
517	<	FRawOpened := False;
518	<	Fraw_file.Free;
519	<	end
520	<	else
521	<	FRawOpened := True;
509	>	Fraw_file.CopyFrom(Src, Min(raw_info.RawSize, Src.Size));
510		end
511		else
512		begin
525	–	if not FSepOpened then
526	–	Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
527	–	fmOpenReadWrite);
513		Fsep_file.Seek(raw_info.RawAddr, soFromBeginning);
514		Fsep_file.CopyFrom(Src, raw_info.RawSize);
530	–	if UnloadWhenUnused then
531	–	begin
532	–	FSepOpened := False;
533	–	Fsep_file.Free;
534	–	end
535	–	else
536	–	FSepOpened := True;
515		end;
516		end;
517		end;
#	Line 556 | Line 534 | begin
534		end;
535		end;
536
537	+
538		procedure TAccess_OniArchive.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream);
539		var
540		raw_info: TRawDataInfo;
#	Line 565 | Line 544 | begin
544		raw_info := GetRawInfo(FileID, DatOffset);
545		if not raw_info.LocSep then
546		begin
568	–	if not FRawOpened then
569	–	Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
570	–	fmOpenReadWrite);
547		Fraw_file.Seek(raw_info.RawAddr + Offset, soFromBeginning);
548		Fraw_file.CopyFrom(Src, Size);
573	–	if UnloadWhenUnused then
574	–	begin
575	–	FRawOpened := False;
576	–	Fraw_file.Free;
577	–	end
578	–	else
579	–	FRawOpened := True;
549		end
550		else
551		begin
583	–	if not FSepOpened then
584	–	Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
585	–	fmOpenReadWrite);
552		Fsep_file.Seek(raw_info.RawAddr + Offset, soFromBeginning);
553		Fsep_file.CopyFrom(Src, Size);
588	–	if UnloadWhenUnused then
589	–	begin
590	–	FSepOpened := False;
591	–	Fsep_file.Free;
592	–	end
593	–	else
594	–	FSepOpened := True;
554		end;
555		end;
556		end;
557
558		function TAccess_OniArchive.AppendRawFile(LocSep: Boolean; Src: TStream): Integer;
559	+	const
560	+	EmptyBytes: Array[0..31] of Byte = (
561	+	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 );
562		begin
563		if not LocSep then
564		begin
565	<	if not FRawOpened then
566	<	Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'),
605	<	fmOpenReadWrite);
565	>	if (Fraw_file.Size mod 32) > 0 then
566	>	Fraw_file.Write(EmptyBytes[0], 32 - (Fraw_file.Size mod 32));
567		Result := Fraw_file.Size;
568		Fraw_file.Seek(0, soFromEnd);
569		Fraw_file.CopyFrom(Src, Src.Size);
570	<	if UnloadWhenUnused then
571	<	begin
611	<	FRawOpened := False;
612	<	Fraw_file.Free;
613	<	end
614	<	else
615	<	FRawOpened := True;
570	>	if (Fraw_file.Size mod 32) > 0 then
571	>	Fraw_file.Write(EmptyBytes[0], 32 - (Fraw_file.Size mod 32));
572		end
573		else
574		begin
575	<	if not FSepOpened then
576	<	Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'),
621	<	fmOpenReadWrite);
575	>	if (Fsep_file.Size mod 32) > 0 then
576	>	Fsep_file.Write(EmptyBytes[0], 32 - (Fsep_file.Size mod 32));
577		Result := Fsep_file.Size;
578		Fsep_file.Seek(0, soFromEnd);
579		Fsep_file.CopyFrom(Src, Src.Size);
580	<	if UnloadWhenUnused then
581	<	begin
627	<	FSepOpened := False;
628	<	Fsep_file.Free;
629	<	end
630	<	else
631	<	FSepOpened := True;
580	>	if (Fsep_file.Size mod 32) > 0 then
581	>	Fsep_file.Write(EmptyBytes[0], 32 - (Fsep_file.Size mod 32));
582		end;
583		end;
584

Diff Legend

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