diff --git a/src/sfs/sfs.pas b/src/sfs/sfs.pas
index 3fa92fa728b5537d2d32787e51ceb1e16071d652..0f2ff81379c0802bb6936867fa1ee693d17dc1e5 100644 (file)
--- a/src/sfs/sfs.pas
+++ b/src/sfs/sfs.pas
// òîì ÍÅ ÄÎËÆÅÍ óáèâàòüñÿ íèêàê èíà÷å, ÷åì ïðè ïîìîùè ôàáðèêè!
TSFSVolume = class
protected
+ fRC: Integer; // refcounter for other objects
fFileName: TSFSString;// îáû÷íî èìÿ îðèãèíàëüíîãî ôàéëà
fFileStream: TStream; // îáû÷íî ïîòîê äëÿ ÷òåíèÿ îðèãèíàëüíîãî ôàéëà
fFiles: TObjectList; // TSFSFileInfo èëè íàñëåäíèêè
// åñëè ôàéë íå íàéäåí, âåðíóòü -1.
function FindFile (const fPath, fName: TSFSString): Integer; virtual;
- // ïðè îøèáêàõ êèäàòüñÿ èñêëþ÷åíèÿìè.
- function OpenFileByIndex (const index: Integer): TStream; virtual; abstract;
-
// âîçâðàùàåò êîëè÷åñòâî ôàéëîâ â fFiles
function GetFileCount (): Integer; virtual;
// íèêàêèõ ïàäåíèé íà íåïðàâèëüíûå èíäåêñû!
function GetFiles (index: Integer): TSFSFileInfo; virtual;
+ procedure removeCommonPath (); virtual;
+
public
// pSt íå îáÿçàòåëüíî çàïîìèíàòü, åñëè îí íå íóæåí.
constructor Create (const pFileName: TSFSString; pSt: TStream); virtual;
// òàêæå îíà íîðìàëèçóåò âèä èì¸í.
procedure DoDirectoryRead ();
+ // ïðè îøèáêàõ êèäàòüñÿ èñêëþ÷åíèÿìè.
+ function OpenFileByIndex (const index: Integer): TStream; virtual; abstract;
+
// åñëè íå ñìîãëî îòêóïîðèòü ôàéëî (èëè åù¸ ãäå îøèáëîñü), çàøâûðí¸ò èñêëþ÷åíèå.
function OpenFileEx (const fName: TSFSString): TStream; virtual;
constructor Create (const pVolume: TSFSVolume);
destructor Destroy (); override;
+ property Volume: TSFSVolume read fVolume;
property Count: Integer read GetCount;
// ïðè íåïðàâèëüíîì èíäåêñå ìîë÷à âåðí¸ò NIL.
// ïðè ïðàâèëüíîì òîæå ìîæåò âåðíóòü NIL!
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;
// ðàçîáðàòü òîëñòîå èìÿ ôàéëà, âåðíóòü âèðòóàëüíîå èìÿ ïîñëåäíåãî ñïèñêà
// èëè ïóñòóþ ñòîðîêó, åñëè ñïèñêîâ íå áûëî.
// ïðåîáðàçîâàòü ÷èñëî â ñòðîêó, êðàñèâî ðàçáàâëÿÿ çàïÿòûìè
function Int64ToStrComma (i: Int64): string;
+// `name` will be modified
+// return `true` if file was found
+function sfsFindFileCI (path: string; var name: string): Boolean;
+
// Wildcard matching
// this code is meant to allow wildcard pattern matches. tt is VERY useful
// for matching filename wildcard patterns. tt allows unix grep-like pattern
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
// ïðàâäà: ðàçðåøåíî èñêàòü ôàéëî íå òîëüêî â ôàéëàõ äàííûõ, íî è íà äèñêå.
end;
+// `name` will be modified
+function sfsFindFileCI (path: string; var name: string): Boolean;
+var
+ sr: TSearchRec;
+ bestname: string = '';
+begin
+ if length(path) = 0 then path := '.';
+ while (length(path) > 0) and (path[length(path)] = '/') do Delete(path, length(path), 1);
+ if (length(path) = 0) or (path[length(path)] <> '/') then path := path+'/';
+ if FileExists(path+name) then begin result := true; exit; end;
+ if FindFirst(path+'*', faAnyFile, sr) = 0 then
+ repeat
+ if (sr.name = '.') or (sr.name = '..') then continue;
+ if (sr.attr and faDirectory) <> 0 then continue;
+ if sr.name = name then
+ begin
+ FindClose(sr);
+ result := true;
+ exit;
+ end;
+ if (length(bestname) = 0) and SFSStrEqu(sr.name, name) then bestname := sr.name;
+ until FindNext(sr) <> 0;
+ FindClose(sr);
+ if length(bestname) > 0 then begin result := true; name := bestname; end else result := false;
+end;
+
+
const
// character defines
WILD_CHAR_ESCAPE = '\';
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;
end;
end;
-// <0: s0 < s1
-// =0: s0 = s1
-// >0: s0 > s1
-function SFSStrComp (const s0, s1: TSFSString): Integer;
+function SFSUpCase (ch: Char): Char;
+begin
+ 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);
+ //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;
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();
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;
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 ();
procedure TSFSVolume.Clear ();
begin
+ fRC := 0; //FIXME
fFiles.Clear();
end;
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;
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
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:
try
result := TSFSFileList.Create(vi.fVolume);
+ Inc(vi.fVolume.fRC);
except
if not vi.fPermanent and (vi.fOpenedFilesCount < 1) then volumes[f] := nil;
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.