--- oup/current/DataAccess/Access_OniArchive.pas 2007/02/25 17:20:22 113 +++ oup/current/DataAccess/Access_OniArchive.pas 2007/12/16 14:44:16 252 @@ -11,14 +11,8 @@ type Fsep_file: TFileStream; Fdat_files: TFiles; Fdat_extensionsmap: TExtensionsMap; - FUnloadWhenUnused: Boolean; - FDatOpened: Boolean; - FRawOpened: Boolean; - FSepOpened: Boolean; protected public - property UnloadWhenUnused: Boolean Read FUnloadWhenUnused Write FUnloadWhenUnused; - constructor Create(DatFilename: String; ConnectionID: Integer; var Msg: TStatusMessages); override; procedure Close; override; @@ -34,10 +28,13 @@ type procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream); overload; override; function GetDatLinks(FileID: Integer): TDatLinkList; override; + function GetDatLink(FileID, DatOffset: Integer): TDatLink; override; function GetRawList(FileID: Integer): TRawDataList; override; function GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo; override; + function GetRawsForType(RawType: String): TRawDataList; override; - procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer); + procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; var target: TStream); overload; + procedure LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer); overload; procedure LoadRawFile(FileID, DatOffset: Integer; var Target: TStream); overload; override; procedure UpdateRawFile(FileID, DatOffset: Integer; Src: TStream); overload; override; procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TStream); overload; override; @@ -50,7 +47,7 @@ type implementation uses - SysUtils, StrUtils, Data, Functions, RawList; + SysUtils, StrUtils, Data, Functions, RawList, DatLinks, Math; (* @@ -67,9 +64,6 @@ var Fdat_filesmap: TFilesMap; Fdat_namedfilesmap: TNamedFilesMap; begin - FUnloadWhenUnused := True; - FDatOpened := False; - FRawOpened := False; Msg := SM_UnknownError; if not FileExists(DatFilename) then begin @@ -77,7 +71,7 @@ begin Exit; end; FFileName := DatFilename; - Fdat_file := TFileStream.Create(FFileName, fmOpenRead); + Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite); Fdat_file.Read(Fdat_header, SizeOf(Fdat_header)); header_pc := True; header_mac := True; @@ -151,12 +145,18 @@ begin Fdat_file.Read(FLevelNumber, 1); FLevelNumber := FLevelNumber div 2; - Fdat_file.Free; + Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'), + fmOpenReadWrite); + if not (FDataOS = DOS_WIN) then + Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'), + fmOpenReadWrite); Msg := SM_OK; FBackend := DB_ONI; FConnectionID := ConnectionID; FChangeRights := [CR_EditDat, CR_EditRaw, CR_AppendRaw]; + + inherited; end; @@ -164,11 +164,11 @@ end; procedure TAccess_OniArchive.Close; begin - if FDatOpened then + if Assigned(Fdat_file) then Fdat_file.Free; - if FRawOpened then + if Assigned(Fraw_file) then Fraw_file.Free; - if FSepOpened then + if Assigned(Fsep_file) then Fsep_file.Free; Self.Free; end; @@ -232,6 +232,8 @@ var begin list := TStringList.Create; list.Sorted := True; + if ext = '*' then + ext := ''; for i := 0 to GetFileCount - 1 do begin if ((Length(ext) = 0) or (Pos(Fdat_files[i].Extension, ext) > 0)) and @@ -319,19 +321,13 @@ begin begin if not Assigned(Target) then Target := TMemoryStream.Create; - if not FDatOpened then - Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite); - Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning); - streampos := Target.Position; - Target.CopyFrom(Fdat_file, Fdat_files[fileid].Size); - Target.Seek(streampos, soFromBeginning); - if UnloadWhenUnused then + if GetFileInfo(FileID).Size > 0 then begin - Fdat_file.Free; - FDatOpened := False; - end - else - FDatOpened := True; + Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning); + streampos := Target.Position; + Target.CopyFrom(Fdat_file, Fdat_files[fileid].Size); + Target.Seek(streampos, soFromBeginning); + end; end; end; @@ -339,17 +335,8 @@ procedure TAccess_OniArchive.UpdateDatFi begin if fileid < GetFileCount then begin - if not FDatOpened then - Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite); Fdat_file.Seek(Fdat_files[fileid].DatAddr, soFromBeginning); Fdat_file.CopyFrom(Src, Fdat_files[fileid].Size); - if UnloadWhenUnused then - begin - Fdat_file.Free; - FDatOpened := False; - end - else - FDatOpened := True; end; end; @@ -361,19 +348,10 @@ begin begin if not Assigned(Target) then Target := TMemoryStream.Create; - if not FDatOpened then - Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite); Fdat_file.Seek(Fdat_files[fileid].DatAddr + offset, soFromBeginning); streampos := Target.Position; Target.CopyFrom(Fdat_file, size); Target.Seek(streampos, soFromBeginning); - if UnloadWhenUnused then - begin - FDatOpened := False; - Fdat_file.Free; - end - else - FDatOpened := True; end; end; @@ -381,28 +359,75 @@ procedure TAccess_OniArchive.UpdateDatFi begin if fileid < GetFileCount then begin - if not FDatOpened then - Fdat_file := TFileStream.Create(FFileName, fmOpenReadWrite); Fdat_file.Seek(Fdat_files[fileid].DatAddr + offset, soFromBeginning); Fdat_file.CopyFrom(Src, Size); - if UnloadWhenUnused then - begin - Fdat_file.Free; - FDatOpened := False; - end - else - FDatOpened := True; end; end; +function TAccess_OniArchive.GetDatLink(FileID, DatOffset: Integer): TDatLink; +var + link: Integer; +begin + Result := DatLinksManager.GetDatLink(FConnectionID, FileID, DatOffset); + LoadDatFilePart(fileid, Result.SrcOffset, 4, @link); + if link > 0 then + Result.DestID := link div 256 + else + Result.DestID := -1; +end; + + +function TAccess_OniArchive.GetDatLinks(FileID: Integer): TDatLinkList; +var + i: Integer; + link: Integer; +begin + Result := DatLinksManager.GetDatLinks(FConnectionID, FileID); + if Length(Result) > 0 then + begin + for i := 0 to High(Result) do + begin + LoadDatFilePart(fileid, Result[i].SrcOffset, 4, @link); + if link > 0 then + Result[i].DestID := link div 256 + else + Result[i].DestID := -1; + end; + end; +end; + + function TAccess_OniArchive.GetRawList(FileID: Integer): TRawDataList; begin Result := RawLists.GetRawList(FConnectionID, FileID); end; +function TAccess_OniArchive.GetRawsForType(RawType: String): TRawDataList; +var + i, j: Integer; + dats: TStrings; + list: TRawDataList; +begin + dats := nil; + dats := GetFilesList(MidStr(RawType, 1, 4), '', True, ST_IDAsc); + for i := 0 to dats.Count - 1 do + begin + list := GetRawList(StrToInt(MidStr(dats.Strings[i], 1, 5))); + for j := 0 to Length(list) - 1 do + begin + if (list[j].RawType = RawType) and (list[j].RawSize > 0) then + begin + SetLength(Result, Length(Result)+1); + Result[High(Result)] := list[j]; + end; + end; + end; +end; + + function TAccess_OniArchive.GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo; begin Result := RawLists.GetRawInfo(FConnectionID, FileID, DatOffset); @@ -410,47 +435,40 @@ end; - -procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer); +procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; var target: TStream); begin + if not Assigned(Target) then + Target := TMemoryStream.Create; if not LocSep then begin - if not FRawOpened then - Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'), - fmOpenReadWrite); if RawAddr <= Fraw_file.Size then begin Fraw_file.Seek(RawAddr, soFromBeginning); - Fraw_file.Read(target^, size); + Target.CopyFrom(Fraw_file, size); + Target.Seek(0, soFromBeginning); end; - if UnloadWhenUnused then - begin - FRawOpened := False; - Fraw_file.Free; - end - else - FRawOpened := True; end else begin - if not FSepOpened then - Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'), - fmOpenReadWrite); if RawAddr <= Fsep_file.Size then begin Fsep_file.Seek(RawAddr, soFromBeginning); - Fsep_file.Read(target^, size); + Target.CopyFrom(Fsep_file, size); + Target.Seek(0, soFromBeginning); end; - if UnloadWhenUnused then - begin - FSepOpened := False; - Fsep_file.Free; - end - else - FSepOpened := True; end; end; +procedure TAccess_OniArchive.LoadRawOffset(LocSep: Boolean; RawAddr, Size: Integer; target: Pointer); +var + data: TStream; +begin + data := nil; + LoadRawOffset(LocSep, RawAddr, Size, data); + data.Read(Target^, Size); + data.Free; +end; + procedure TAccess_OniArchive.LoadRawFile(FileID, DatOffset: Integer; var Target: TStream); var raw_info: TRawDataInfo; @@ -463,37 +481,17 @@ begin raw_info := Self.GetRawInfo(FileID, DatOffset); if not raw_info.LocSep then begin - if not FRawOpened then - Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'), - fmOpenReadWrite); Fraw_file.Seek(raw_info.RawAddr, soFromBeginning); streampos := Target.Position; Target.CopyFrom(Fraw_file, raw_info.RawSize); Target.Seek(streampos, soFromBeginning); - if UnloadWhenUnused then - begin - FRawOpened := False; - Fraw_file.Free; - end - else - FRawOpened := True; end else begin - if FUnloadWhenUnused or not FSepOpened then - Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'), - fmOpenReadWrite); Fsep_file.Seek(raw_info.RawAddr, soFromBeginning); streampos := Target.Position; Target.CopyFrom(Fsep_file, raw_info.RawSize); Target.Seek(streampos, soFromBeginning); - if UnloadWhenUnused then - begin - FSepOpened := False; - Fsep_file.Free; - end - else - FSepOpened := True; end; end; end; @@ -507,33 +505,13 @@ begin raw_info := GetRawInfo(FileID, DatOffset); if not raw_info.LocSep then begin - if not FRawOpened then - Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'), - fmOpenReadWrite); Fraw_file.Seek(raw_info.RawAddr, soFromBeginning); - Fraw_file.CopyFrom(Src, raw_info.RawSize); - if UnloadWhenUnused then - begin - FRawOpened := False; - Fraw_file.Free; - end - else - FRawOpened := True; + Fraw_file.CopyFrom(Src, Min(raw_info.RawSize, Src.Size)); end else begin - if not FSepOpened then - Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'), - fmOpenReadWrite); Fsep_file.Seek(raw_info.RawAddr, soFromBeginning); Fsep_file.CopyFrom(Src, raw_info.RawSize); - if UnloadWhenUnused then - begin - FSepOpened := False; - Fsep_file.Free; - end - else - FSepOpened := True; end; end; end; @@ -556,6 +534,7 @@ begin end; end; + procedure TAccess_OniArchive.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream); var raw_info: TRawDataInfo; @@ -565,70 +544,41 @@ begin raw_info := GetRawInfo(FileID, DatOffset); if not raw_info.LocSep then begin - if not FRawOpened then - Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'), - fmOpenReadWrite); Fraw_file.Seek(raw_info.RawAddr + Offset, soFromBeginning); Fraw_file.CopyFrom(Src, Size); - if UnloadWhenUnused then - begin - FRawOpened := False; - Fraw_file.Free; - end - else - FRawOpened := True; end else begin - if not FSepOpened then - Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'), - fmOpenReadWrite); Fsep_file.Seek(raw_info.RawAddr + Offset, soFromBeginning); Fsep_file.CopyFrom(Src, Size); - if UnloadWhenUnused then - begin - FSepOpened := False; - Fsep_file.Free; - end - else - FSepOpened := True; end; end; end; function TAccess_OniArchive.AppendRawFile(LocSep: Boolean; Src: TStream): Integer; +const + EmptyBytes: Array[0..31] of Byte = ( + 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 ); begin if not LocSep then begin - if not FRawOpened then - Fraw_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.raw'), - fmOpenReadWrite); + if (Fraw_file.Size mod 32) > 0 then + Fraw_file.Write(EmptyBytes[0], 32 - (Fraw_file.Size mod 32)); Result := Fraw_file.Size; Fraw_file.Seek(0, soFromEnd); Fraw_file.CopyFrom(Src, Src.Size); - if UnloadWhenUnused then - begin - FRawOpened := False; - Fraw_file.Free; - end - else - FRawOpened := True; + if (Fraw_file.Size mod 32) > 0 then + Fraw_file.Write(EmptyBytes[0], 32 - (Fraw_file.Size mod 32)); end else begin - if not FSepOpened then - Fsep_file := TFileStream.Create(AnsiReplaceStr(FFileName, '.dat', '.sep'), - fmOpenReadWrite); + if (Fsep_file.Size mod 32) > 0 then + Fsep_file.Write(EmptyBytes[0], 32 - (Fsep_file.Size mod 32)); Result := Fsep_file.Size; Fsep_file.Seek(0, soFromEnd); Fsep_file.CopyFrom(Src, Src.Size); - if UnloadWhenUnused then - begin - FSepOpened := False; - Fsep_file.Free; - end - else - FSepOpened := True; + if (Fsep_file.Size mod 32) > 0 then + Fsep_file.Write(EmptyBytes[0], 32 - (Fsep_file.Size mod 32)); end; end;