X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fsfs%2Fsfs.pas;h=69e4368573d2546f6ddbaaceff5da34d34ae5fbf;hb=41d480b02f4d0257f13a87810c0053b8b0df3b13;hp=3776a0036d7742c6df3160222d12328f5d35e3b1;hpb=20428038ea09152f824e5947da1d550a4774207e;p=d2df-sdl.git diff --git a/src/sfs/sfs.pas b/src/sfs/sfs.pas index 3776a00..69e4368 100644 --- a/src/sfs/sfs.pas +++ b/src/sfs/sfs.pas @@ -1,6 +1,7 @@ // streaming file system (virtual) {$MODE DELPHI} {.$R-} +{.$DEFINE SFS_VOLDEBUG} unit sfs; interface @@ -168,6 +169,9 @@ procedure SFSUnregisterVolumeFactory (factory: TSFSVolumeFactory); // ïðèíèìàåòñÿ âî âíèìàíèå òîëüêî ïîñëåäíÿÿ òðóáà. function SFSAddDataFile (const dataFileName: TSFSString; top: Boolean=false): Boolean; +// äîáàâèòü ñáîðíèê âðåìåííî +function SFSAddDataFileTemp (const dataFileName: TSFSString; top: Boolean=false): Boolean; + // äîáàâèòü â ïîñòîÿííûé ñïèñîê ñáîðíèê èç ïîòîêà ds. // åñëè âîçâðàùàåò èñòèíó, òî SFS ñòàíîâèòñÿ âëÿäåëüöåì ïîòîêà ds è ñàìà // óãðîáèò ñåé ïîòîê ïî íåîáõîäèìîñòè. @@ -195,6 +199,16 @@ function SFSFileOpen (const fName: TSFSString): TStream; // ïîñëå èñïîëüçîâàíèÿ, íàòóðàëüíî, èòåðàòîð íàäî ãðîõíóòü %-) function SFSFileList (const dataFileName: TSFSString): TSFSFileList; +// çàïðåòèòü îñâîáîæäåíèå âðåìåííûõ òîìîâ (ìîæíî âûçûâàòü ðåêóðñèâíî) +procedure sfsGCDisable (); + +// ðàçðåøèòü îñâîáîæäåíèå âðåìåííûõ òîìîâ (ìîæíî âûçûâàòü ðåêóðñèâíî) +procedure sfsGCEnable (); + +// for completeness sake +procedure sfsGCCollect (); + + function SFSReplacePathDelims (const s: TSFSString; newDelim: TSFSChar): TSFSString; // èãíîðèðóåò ðåãèñòð ñèìâîëîâ function SFSStrEqu (const s0, s1: TSFSString): Boolean; @@ -206,6 +220,10 @@ function SFSGetLastVirtualName (const fn: TSFSString): string; // ïðåîáðàçîâàòü ÷èñëî â ñòðîêó, êðàñèâî ðàçáàâëÿÿ çàïÿòûìè 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 @@ -226,11 +244,10 @@ 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; +function utf8to1251 (s: TSFSString): TSFSString; + var // ïðàâäà: ðàçðåøåíî èñêàòü ôàéëî íå òîëüêî â ôàéëàõ äàííûõ, íî è íà äèñêå. @@ -267,6 +284,33 @@ begin 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 = '\'; @@ -441,6 +485,63 @@ type var factories: TObjectList; // TSFSVolumeFactory volumes: TObjectList; // TVolumeInfo + gcdisabled: Integer = 0; // >0: disabled + + +procedure sfsGCCollect (); +var + f, c: Integer; + vi: TVolumeInfo; + used: Boolean; +begin + // collect garbage + f := 0; + while f < volumes.Count do + begin + vi := TVolumeInfo(volumes[f]); + if vi = nil then continue; + if (not vi.fPermanent) and (vi.fVolume.fRC = 0) and (vi.fOpenedFilesCount = 0) then + begin + // this volume probably can be removed + used := false; + c := volumes.Count-1; + while not used and (c >= 0) do + begin + if (c <> f) and (volumes[c] <> nil) then + begin + used := (TVolumeInfo(volumes[c]).fStream = vi.fStream); + if not used then used := (TVolumeInfo(volumes[c]).fVolume.fFileStream = vi.fStream); + if used then break; + end; + Dec(c); + end; + if not used then + begin + {$IFDEF SFS_VOLDEBUG}writeln('000: destroying volume "', TVolumeInfo(volumes[f]).fPackName, '"');{$ENDIF} + volumes.extract(vi); // remove from list + vi.Free; // and kill + f := 0; + continue; + end; + end; + Inc(f); // next volume + end; +end; + +procedure sfsGCDisable (); +begin + Inc(gcdisabled); +end; + +procedure sfsGCEnable (); +begin + Dec(gcdisabled); + if gcdisabled <= 0 then + begin + gcdisabled := 0; + sfsGCCollect(); + end; +end; // ðàçáèòü èìÿ ôàéëà íà ÷àñòè: ïðåôèêñ ôàéëîâîé ñèñòåìû, èìÿ ôàéëà äàííûõ, @@ -587,25 +688,31 @@ begin result := true; end; -// this will compare only last path element from sfspath -function SFSDFPathEqu (sfspath: string; path: string): Boolean; -{var - i: Integer;} +// adds '/' too +function normalizePath (fn: string): string; +var + i: Integer; begin - result := SFSStrEqu(sfspath, path); -(* - if not result and (length(sfspath) > 1) then + result := ''; + i := 1; + while i <= length(fn) do begin - i := length(sfspath); - while i > 1 do + if (fn[i] = '.') and ((length(fn)-i = 0) or (fn[i+1] = '/') or (fn[i+1] = '\')) then 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); + 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; @@ -690,10 +797,14 @@ begin if fOwner <> nil then begin Dec(fOwner.fOpenedFilesCount); - if not fOwner.fPermanent and (fOwner.fOpenedFilesCount < 1) then + if (gcdisabled = 0) and not fOwner.fPermanent and (fOwner.fOpenedFilesCount < 1) then begin f := volumes.IndexOf(fOwner); - if f <> -1 then volumes[f] := nil; // this will destroy the volume + if f <> -1 then + begin + {$IFDEF SFS_VOLDEBUG}writeln('001: destroying volume "', TVolumeInfo(volumes[f]).fPackName, '"');{$ENDIF} + volumes[f] := nil; // this will destroy the volume + end; end; end; end; @@ -734,58 +845,34 @@ 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 + f := 0; + while f < fFiles.Count 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); + if (length(sfi.fPath) = 0) and (length(sfi.fName) = 0) then sfi.Free else Inc(f); end; removeCommonPath(); end; @@ -882,8 +969,11 @@ begin if fVolume <> nil then Dec(fVolume.fRC); Dec(TVolumeInfo(volumes[f]).fOpenedFilesCount); // óáü¸ì çàïèñü, åñëè îíà âðåìåííàÿ, è â íåé íåò áîëüøå íè÷åãî îòêðûòîãî - if not TVolumeInfo(volumes[f]).fPermanent and - (TVolumeInfo(volumes[f]).fOpenedFilesCount < 1) then volumes[f] := nil; + if (gcdisabled = 0) and not TVolumeInfo(volumes[f]).fPermanent and (TVolumeInfo(volumes[f]).fOpenedFilesCount < 1) then + begin + {$IFDEF SFS_VOLDEBUG}writeln('002: destroying volume "', TVolumeInfo(volumes[f]).fPackName, '"');{$ENDIF} + volumes[f] := nil; + end; inherited Destroy(); end; @@ -976,7 +1066,7 @@ begin except FreeAndNil(st); // óäàëèì íåèñïîëüçóåìûé âðåìåííûé òîì. - if not vi.fPermanent and (vi.fOpenedFilesCount < 1) then volumes[result] := nil; + if (gcdisabled = 0) and not vi.fPermanent and (vi.fOpenedFilesCount < 1) then volumes[result] := nil; raise; end; // óðà. îòêðûëè ôàéë. êèäàåì â âîçäóõ ÷åï÷èêè, ïðîäîëæàåì ðàçâëå÷åíèå. @@ -1007,7 +1097,7 @@ begin end; if ds <> nil then st := ds - else st := TFileStream.Create(fn, fmOpenRead or fmShareDenyWrite); + else st := TFileStream.Create(fn, fmOpenRead or {fmShareDenyWrite}fmShareDenyNone); st.Position := 0; volumes.Pack(); @@ -1058,8 +1148,7 @@ begin vi.fOpenedFilesCount := 0; end; -function SFSAddSubDataFile (const virtualName: TSFSString; ds: TStream; - top: Boolean = false): Boolean; +function SFSAddSubDataFile (const virtualName: TSFSString; ds: TStream; top: Boolean=false): Boolean; var tv: Integer; begin @@ -1073,7 +1162,7 @@ begin end; end; -function SFSAddDataFile (const dataFileName: TSFSString; top: Boolean = false): Boolean; +function SFSAddDataFile (const dataFileName: TSFSString; top: Boolean=false): Boolean; var tv: Integer; begin @@ -1086,6 +1175,20 @@ begin end; end; +function SFSAddDataFileTemp (const dataFileName: TSFSString; top: Boolean=false): Boolean; +var + tv: Integer; +begin + try + if top then tv := -1 else tv := 1; + SFSAddDataFileEx(dataFileName, nil, tv, 0); + result := true; + except + result := false; + end; +end; + + function SFSExpandDirName (const s: TSFSString): TSFSString; var @@ -1142,7 +1245,7 @@ var cdir := SFSReplacePathDelims(SFSExpandDirName(cdir), '/'); if cdir[Length(cdir)] <> '/' then cdir := cdir+'/'; try - result := TFileStream.Create(cdir+dfn, fmOpenRead or fmShareDenyWrite); + result := TFileStream.Create(cdir+dfn, fmOpenRead or {fmShareDenyWrite}fmShareDenyNone); exit; except end; @@ -1172,7 +1275,7 @@ begin ps := TOwnedPartialStream.Create(vi, result, 0, result.Size, true); except result.Free(); - if not vi.fPermanent and (vi.fOpenedFilesCount < 1) then volumes[f] := nil; + if (gcdisabled = 0) and not vi.fPermanent and (vi.fOpenedFilesCount < 1) then volumes[f] := nil; result := CheckDisk(); // îáëîì ñ datafile, ïðîâåðèì äèñê if result = nil then raise ESFSError.Create('file not found: "'+fName+'"'); exit; @@ -1245,15 +1348,133 @@ begin result := TSFSFileList.Create(vi.fVolume); Inc(vi.fVolume.fRC); except - if not vi.fPermanent and (vi.fOpenedFilesCount < 1) then volumes[f] := nil; + if (gcdisabled = 0) and not vi.fPermanent and (vi.fOpenedFilesCount < 1) then volumes[f] := nil; + end; +end; + + +// ////////////////////////////////////////////////////////////////////////// // +// utils +// `ch`: utf8 start +// -1: invalid utf8 +function utf8CodeLen (ch: Word): Integer; +begin + if ch < $80 then begin result := 1; exit; end; + if (ch and $FE) = $FC then begin result := 6; exit; end; + if (ch and $FC) = $F8 then begin result := 5; exit; end; + if (ch and $F8) = $F0 then begin result := 4; exit; end; + if (ch and $F0) = $E0 then begin result := 3; exit; end; + if (ch and $E0) = $C0 then begin result := 2; exit; end; + result := -1; // invalid +end; + + +function utf8Valid (s: string): Boolean; +var + pos, len: Integer; +begin + result := false; + pos := 1; + while pos <= length(s) do + begin + len := utf8CodeLen(Byte(s[pos])); + if len < 1 then exit; // invalid sequence start + if pos+len-1 > length(s) then exit; // out of chars in string + Dec(len); + Inc(pos); + // check other sequence bytes + while len > 0 do + begin + if (Byte(s[pos]) and $C0) <> $80 then exit; + Dec(len); + Inc(pos); + end; + end; + result := true; +end; + + +// ////////////////////////////////////////////////////////////////////////// // +const + // TODO: move this to a separate file + uni2wint: array [128..255] of Word = ( + $0402,$0403,$201A,$0453,$201E,$2026,$2020,$2021,$20AC,$2030,$0409,$2039,$040A,$040C,$040B,$040F, + $0452,$2018,$2019,$201C,$201D,$2022,$2013,$2014,$003F,$2122,$0459,$203A,$045A,$045C,$045B,$045F, + $00A0,$040E,$045E,$0408,$00A4,$0490,$00A6,$00A7,$0401,$00A9,$0404,$00AB,$00AC,$00AD,$00AE,$0407, + $00B0,$00B1,$0406,$0456,$0491,$00B5,$00B6,$00B7,$0451,$2116,$0454,$00BB,$0458,$0405,$0455,$0457, + $0410,$0411,$0412,$0413,$0414,$0415,$0416,$0417,$0418,$0419,$041A,$041B,$041C,$041D,$041E,$041F, + $0420,$0421,$0422,$0423,$0424,$0425,$0426,$0427,$0428,$0429,$042A,$042B,$042C,$042D,$042E,$042F, + $0430,$0431,$0432,$0433,$0434,$0435,$0436,$0437,$0438,$0439,$043A,$043B,$043C,$043D,$043E,$043F, + $0440,$0441,$0442,$0443,$0444,$0445,$0446,$0447,$0448,$0449,$044A,$044B,$044C,$044D,$044E,$044F + ); + + +function decodeUtf8Char (s: TSFSString; var pos: Integer): char; +var + b, c: Integer; +begin + (* The following encodings are valid, except for the 5 and 6 byte + * combinations: + * 0xxxxxxx + * 110xxxxx 10xxxxxx + * 1110xxxx 10xxxxxx 10xxxxxx + * 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx + * 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx + * 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx + *) + result := '?'; + if pos > length(s) then exit; + + b := Byte(s[pos]); + Inc(pos); + if b < $80 then begin result := char(b); exit; end; + + // mask out unused bits + if (b and $FE) = $FC then b := b and $01 + else if (b and $FC) = $F8 then b := b and $03 + else if (b and $F8) = $F0 then b := b and $07 + else if (b and $F0) = $E0 then b := b and $0F + else if (b and $E0) = $C0 then b := b and $1F + else exit; // invalid utf8 + + // now continue + while pos <= length(s) do + begin + c := Byte(s[pos]); + if (c and $C0) <> $80 then break; // no more + b := b shl 6; + b := b or (c and $3F); + Inc(pos); + end; + + // done, try 1251 + for c := 128 to 255 do if uni2wint[c] = b then begin result := char(c and $FF); exit; end; + // alas +end; + + +function utf8to1251 (s: TSFSString): TSFSString; +var + pos: Integer; +begin + if not utf8Valid(s) then begin result := s; exit; end; + pos := 1; + while pos <= length(s) do + begin + if Byte(s[pos]) >= $80 then break; + Inc(pos); end; + if pos > length(s) then begin result := s; exit; end; // nothing to do here + result := ''; + pos := 1; + while pos <= length(s) do result := result+decodeUtf8Char(s, pos); 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.