X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fsfs%2Fsfs.pas;h=14919a4cb2f1f8df67e57cd56554a5d719bf4dc9;hb=d9eff35f5ba4fe70350c84ba06796d6a92396c3b;hp=3fa92fa728b5537d2d32787e51ceb1e16071d652;hpb=2fdb1deb5facdcfadb85ab28050bc02451cf7ba8;p=d2df-sdl.git diff --git a/src/sfs/sfs.pas b/src/sfs/sfs.pas index 3fa92fa..14919a4 100644 --- a/src/sfs/sfs.pas +++ b/src/sfs/sfs.pas @@ -37,6 +37,7 @@ type // òîì ÍÅ ÄÎËÆÅÍ óáèâàòüñÿ íèêàê èíà÷å, ÷åì ïðè ïîìîùè ôàáðèêè! TSFSVolume = class protected + fRC: Integer; // refcounter for other objects fFileName: TSFSString;// îáû÷íî èìÿ îðèãèíàëüíîãî ôàéëà fFileStream: TStream; // îáû÷íî ïîòîê äëÿ ÷òåíèÿ îðèãèíàëüíîãî ôàéëà fFiles: TObjectList; // TSFSFileInfo èëè íàñëåäíèêè @@ -64,9 +65,6 @@ type // åñëè ôàéë íå íàéäåí, âåðíóòü -1. function FindFile (const fPath, fName: TSFSString): Integer; virtual; - // ïðè îøèáêàõ êèäàòüñÿ èñêëþ÷åíèÿìè. - function OpenFileByIndex (const index: Integer): TStream; virtual; abstract; - // âîçâðàùàåò êîëè÷åñòâî ôàéëîâ â fFiles function GetFileCount (): Integer; virtual; @@ -75,6 +73,8 @@ type // íèêàêèõ ïàäåíèé íà íåïðàâèëüíûå èíäåêñû! function GetFiles (index: Integer): TSFSFileInfo; virtual; + procedure removeCommonPath (); virtual; + public // pSt íå îáÿçàòåëüíî çàïîìèíàòü, åñëè îí íå íóæåí. constructor Create (const pFileName: TSFSString; pSt: TStream); virtual; @@ -87,6 +87,9 @@ type // òàêæå îíà íîðìàëèçóåò âèä èì¸í. procedure DoDirectoryRead (); + // ïðè îøèáêàõ êèäàòüñÿ èñêëþ÷åíèÿìè. + function OpenFileByIndex (const index: Integer): TStream; virtual; abstract; + // åñëè íå ñìîãëî îòêóïîðèòü ôàéëî (èëè åù¸ ãäå îøèáëîñü), çàøâûðí¸ò èñêëþ÷åíèå. function OpenFileEx (const fName: TSFSString): TStream; virtual; @@ -134,6 +137,7 @@ type constructor Create (const pVolume: TSFSVolume); destructor Destroy (); override; + property Volume: TSFSVolume read fVolume; property Count: Integer read GetCount; // ïðè íåïðàâèëüíîì èíäåêñå ìîë÷à âåðí¸ò NIL. // ïðè ïðàâèëüíîì òîæå ìîæåò âåðíóòü NIL! @@ -193,10 +197,7 @@ function SFSFileList (const dataFileName: TSFSString): TSFSFileList; function SFSReplacePathDelims (const s: TSFSString; newDelim: TSFSChar): TSFSString; // èãíîðèðóåò ðåãèñòð ñèìâîëîâ -// <0: s0 < s1 -// =0: s0 = s1 -// >0: s0 > s1 -function SFSStrComp (const s0, s1: TSFSString): Integer; +function SFSStrEqu (const s0, s1: TSFSString): Boolean; // ðàçîáðàòü òîëñòîå èìÿ ôàéëà, âåðíóòü âèðòóàëüíîå èìÿ ïîñëåäíåãî ñïèñêà // èëè ïóñòóþ ñòîðîêó, åñëè ñïèñêîâ íå áûëî. @@ -225,6 +226,11 @@ function WildMatch (pattern, text: TSFSString): Boolean; function WildListMatch (wildList, text: TSFSString; delimChar: AnsiChar=':'): Integer; function HasWildcards (const pattern: TSFSString): Boolean; +// this will compare only last path element from sfspath +function SFSDFPathEqu (sfspath: string; path: string): Boolean; + +function SFSUpCase (ch: Char): Char; + var // ïðàâäà: ðàçðåøåíî èñêàòü ôàéëî íå òîëüêî â ôàéëàõ äàííûõ, íî è íà äèñêå. @@ -517,7 +523,7 @@ begin vi := TVolumeInfo(volumes[f]); if not onlyPerm or vi.fPermanent then begin - if SFSStrComp(vi.fPackName, dataFileName) = 0 then + if SFSStrEqu(vi.fPackName, dataFileName) then begin result := f; exit; @@ -544,12 +550,89 @@ begin end; end; -// <0: s0 < s1 -// =0: s0 = s1 -// >0: s0 > s1 -function SFSStrComp (const s0, s1: TSFSString): Integer; +function SFSUpCase (ch: Char): Char; begin - result := AnsiCompareText(s0, s1); + if ch < #128 then + begin + if (ch >= 'a') and (ch <= 'z') then Dec(ch, 32); + end + else + begin + if (ch >= #224) and (ch <= #255) then + begin + Dec(ch, 32); + end + else + begin + case ch of + #184, #186, #191: Dec(ch, 16); + #162, #179: Dec(ch); + end; + end; + end; + result := ch; +end; + +function SFSStrEqu (const s0, s1: TSFSString): Boolean; +var + i: Integer; +begin + //result := (AnsiCompareText(s0, s1) == 0); + result := false; + if length(s0) <> length(s1) then exit; + for i := 1 to length(s0) do + begin + if SFSUpCase(s0[i]) <> SFSUpCase(s1[i]) then exit; + end; + result := true; +end; + +// this will compare only last path element from sfspath +function SFSDFPathEqu (sfspath: string; path: string): Boolean; +{var + i: Integer;} +begin + result := SFSStrEqu(sfspath, path); +(* + if not result and (length(sfspath) > 1) then + begin + i := length(sfspath); + while i > 1 do + begin + while (i > 1) and (sfspath[i-1] <> '/') do Dec(i); + if i <= 1 then exit; + writeln('{', sfspath, '} [', Copy(sfspath, i, length(sfspath)), '] : [', path, ']'); + result := SFSStrEqu(Copy(sfspath, i, length(sfspath)), path); + end; + end; +*) +end; + +// adds '/' too +function normalizePath (fn: string): string; +var + i: Integer; +begin + result := ''; + i := 1; + while i <= length(fn) do + begin + if (fn[i] = '.') and ((length(fn)-i = 0) or (fn[i+1] = '/') or (fn[i+1] = '\')) then + begin + i := i+2; + continue; + end; + if (fn[i] = '/') or (fn[i] = '\') then + begin + if (length(result) > 0) and (result[length(result)] <> '/') then result := result+'/'; + end + else + begin + result := result+fn[i]; + end; + Inc(i); + end; + if (length(result) > 0) and (result[length(result)] <> '/') then result := result+'/'; end; function SFSReplacePathDelims (const s: TSFSString; newDelim: TSFSChar): TSFSString; @@ -588,22 +671,29 @@ var used: Boolean; // ôëàæîê çàþçàíîñòè ïîòîêà êåì-òî åù¸ begin if fFactory <> nil then fFactory.Recycle(fVolume); - fVolume := nil; fFactory := nil; fPackName := ''; - - // òèïà ìóñîðîñáîðíèê: åñëè íàø ïîòîê áîëåå íèêåì íå þçàåòñÿ, - // òî óãðîáèòü åãî íàôèã. - me := volumes.IndexOf(self); - used := false; - f := volumes.Count-1; - while not used and (f >= 0) do + if fVolume <> nil then used := (fVolume.fRC <> 0) else used := false; + fVolume := nil; + fFactory := nil; + fPackName := ''; + + // òèïà ìóñîðîñáîðíèê: åñëè íàø ïîòîê áîëåå íèêåì íå þçàåòñÿ, òî óãðîáèòü åãî íàôèã + if not used then begin - if (f <> me) and (volumes[f] <> nil) then + me := volumes.IndexOf(self); + f := volumes.Count-1; + while not used and (f >= 0) do begin - used := (TVolumeInfo(volumes[f]).fStream = fStream); - if not used then - used := (TVolumeInfo(volumes[f]).fVolume.fFileStream = fStream); + if (f <> me) and (volumes[f] <> nil) then + begin + used := (TVolumeInfo(volumes[f]).fStream = fStream); + if not used then + begin + used := (TVolumeInfo(volumes[f]).fVolume.fFileStream = fStream); + end; + if used then break; + end; + Dec(f); end; - Dec(f); end; if not used then FreeAndNil(fStream); // åñëè áîëüøå íèêåì íå þçàíî, ïðèøèá¸ì inherited Destroy(); @@ -641,8 +731,10 @@ constructor TSFSFileInfo.Create (pOwner: TSFSVolume); begin inherited Create(); fOwner := pOwner; - fPath := ''; fName := ''; - fSize := 0; fOfs := 0; + fPath := ''; + fName := ''; + fSize := 0; + fOfs := 0; if pOwner <> nil then pOwner.fFiles.Add(self); end; @@ -657,66 +749,46 @@ end; constructor TSFSVolume.Create (const pFileName: TSFSString; pSt: TStream); begin inherited Create(); + fRC := 0; fFileStream := pSt; fFileName := pFileName; fFiles := TObjectList.Create(true); end; +procedure TSFSVolume.removeCommonPath (); +begin +end; + procedure TSFSVolume.DoDirectoryRead (); var - fl: TStringList; //!!!FIXME! change to list of wide TSFSStrings or so! - f, c, n: Integer; + f, c: Integer; sfi: TSFSFileInfo; - tmp, fn, ext: TSFSString; + tmp: TSFSString; begin - fl := nil; fFileName := ExpandFileName(SFSReplacePathDelims(fFileName, '/')); - try - ReadDirectory(); - fFiles.Pack(); + ReadDirectory(); + fFiles.Pack(); - // check for duplicate file names - fl := TStringList.Create(); fl.Sorted := true; - for f := 0 to fFiles.Count-1 do + for f := 0 to fFiles.Count-1 do + begin + sfi := TSFSFileInfo(fFiles[f]); + // normalize name & path + sfi.fPath := SFSReplacePathDelims(sfi.fPath, '/'); + if (sfi.fPath <> '') and (sfi.fPath[1] = '/') then Delete(sfi.fPath, 1, 1); + if (sfi.fPath <> '') and (sfi.fPath[Length(sfi.fPath)] <> '/') then sfi.fPath := sfi.fPath+'/'; + tmp := SFSReplacePathDelims(sfi.fName, '/'); + c := Length(tmp); while (c > 0) and (tmp[c] <> '/') do Dec(c); + if c > 0 then begin - sfi := TSFSFileInfo(fFiles[f]); - - // normalize name & path - sfi.fPath := SFSReplacePathDelims(sfi.fPath, '/'); - if (sfi.fPath <> '') and (sfi.fPath[1] = '/') then Delete(sfi.fPath, 1, 1); - if (sfi.fPath <> '') and (sfi.fPath[Length(sfi.fPath)] <> '/') then sfi.fPath := sfi.fPath+'/'; - tmp := SFSReplacePathDelims(sfi.fName, '/'); - c := Length(tmp); while (c > 0) and (tmp[c] <> '/') do Dec(c); - if c > 0 then - begin - // split path and name - Delete(sfi.fName, 1, c); // cut name - tmp := Copy(tmp, 1, c); // get path - if tmp = '/' then tmp := ''; // just delimiter; ignore it - sfi.fPath := sfi.fPath+tmp; - end; - - // check for duplicates - if fl.Find(sfi.fPath+sfi.fName, c) then - begin - n := 0; tmp := sfi.fName; - c := Length(tmp); while (c > 0) and (tmp[c] <> '.') do Dec(c); - if c < 1 then c := Length(tmp)+1; - fn := Copy(tmp, 1, c-1); ext := Copy(tmp, c, Length(tmp)); - repeat - tmp := fn+'_'+IntToStr(n)+ext; - if not fl.Find(sfi.fPath+tmp, c) then break; - Inc(n); - until false; - sfi.fName := tmp; - end; - fl.Add(sfi.fName); + // split path and name + Delete(sfi.fName, 1, c); // cut name + tmp := Copy(tmp, 1, c); // get path + if tmp = '/' then tmp := ''; // just delimiter; ignore it + sfi.fPath := sfi.fPath+tmp; end; - fl.Free(); - except - fl.Free(); - raise; + sfi.fPath := normalizePath(sfi.fPath); end; + removeCommonPath(); end; destructor TSFSVolume.Destroy (); @@ -728,6 +800,7 @@ end; procedure TSFSVolume.Clear (); begin + fRC := 0; //FIXME fFiles.Clear(); end; @@ -742,8 +815,8 @@ begin Dec(result); if fFiles[result] <> nil then begin - if (SFSStrComp(fPath, TSFSFileInfo(fFiles[result]).fPath) = 0) and - (SFSStrComp(fName, TSFSFileInfo(fFiles[result]).fName) = 0) then exit; + if SFSStrEqu(fPath, TSFSFileInfo(fFiles[result]).fPath) and + SFSStrEqu(fName, TSFSFileInfo(fFiles[result]).fName) then exit; end; end; result := -1; @@ -807,6 +880,7 @@ var begin f := FindVolumeInfoByVolumeInstance(fVolume); ASSERT(f <> -1); + if fVolume <> nil then Dec(fVolume.fRC); Dec(TVolumeInfo(volumes[f]).fOpenedFilesCount); // óáü¸ì çàïèñü, åñëè îíà âðåìåííàÿ, è â íåé íåò áîëüøå íè÷åãî îòêðûòîãî if not TVolumeInfo(volumes[f]).fPermanent and @@ -854,8 +928,7 @@ begin end; -function SFSAddDataFileEx (dataFileName: TSFSString; ds: TStream; - top, permanent: Integer): Integer; +function SFSAddDataFileEx (dataFileName: TSFSString; ds: TStream; top, permanent: Integer): Integer; // dataFileName ìîæåò èìåòü ïðåôèêñ òèïà "zip:" (ñì. âûøå: IsMyPrefix). // ìîæåò âûêèíóòü èñêëþ÷åíèå! // top: @@ -1171,6 +1244,7 @@ begin try result := TSFSFileList.Create(vi.fVolume); + Inc(vi.fVolume.fRC); except if not vi.fPermanent and (vi.fOpenedFilesCount < 1) then volumes[f] := nil; end; @@ -1180,7 +1254,7 @@ end; initialization factories := TObjectList.Create(true); volumes := TObjectList.Create(true); -finalization +//finalization //volumes.Free(); // it fails for some reason... Runtime 217 (^C hit). wtf?! //factories.Free(); // not need to be done actually... end.