Changeset 230 for Common

Timestamp:

Apr 14, 2011, 12:45:52 PM (14 years ago)

Author:

george

Message:

• Přidáno: Třída UThreading zajišťující udržování seznamu alokovaných vláken.
• Upraveno: Třída TURI nyní využívá vlastní konstantu DirSeparator.

Location:

Common

Files:

• Common.lpk (modified) (2 diffs)
• Common.pas (modified) (1 diff)
• UThreading.pas (added)
• UURI.pas (modified) (11 diffs)

Common/Common.lpk

@@ -18 +18 @@
     <License Value="GNU/GPL"/>
     <Version Minor="2"/>
-    <Files Count="6">
+    <Files Count="7">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -43 +43 @@
         <UnitName Value="UURI"/>
       </Item6>
+      <Item7>
+        <Filename Value="UThreading.pas"/>
+        <UnitName Value="UThreading"/>
+      </Item7>
     </Files>
     <Type Value="RunAndDesignTime"/>

Common/Common.pas

@@ -9 +9 @@
 uses
     StopWatch, UCommon, UDebugLog, UDelay, UPrefixMultiplier, UURI, 
-  LazarusPackageIntf;
+  UThreading, LazarusPackageIntf;
 
 implementation

Common/UURI.pas

@@ -9 +9 @@
 uses
   Classes, SysUtils;
+
+const
+  URIPathSeparator = '/';
 
 type
@@ -21 +24 @@
     Items: TStringList;
     IsAbsolute: Boolean;
+    DirSeparator: string;
     procedure Assign(Source: TPath);
     constructor Create;
@@ -137 +141 @@
   I: Integer;
 begin
-  if IsAbsolute then Result := DirectorySeparator
+  if IsAbsolute then Result := DirSeparator
     else Result := '';
   for I := 0 to Items.Count - 1 do
-    Result := Result + Items[I] + DirectorySeparator;
+    Result := Result + Items[I] + DirSeparator;
 end;
 
@@ -149 +153 @@
   Items.Clear;
   if Length(AValue) > 0 then begin
-    if AValue[1] = DirectorySeparator then begin
+    if AValue[1] = DirSeparator then begin
       IsAbsolute := True;
       Delete(AValue, 1, 1);
     end else IsAbsolute := False;
-    while Pos(DirectorySeparator, AValue) > 0 do begin
-      Name := Copy(AValue, 1, Pos(DirectorySeparator, AValue) - 1);
-      Delete(AValue, 1, Pos(DirectorySeparator, AValue));
+    while Pos(DirSeparator, AValue) > 0 do begin
+      Name := Copy(AValue, 1, Pos(DirSeparator, AValue) - 1);
+      Delete(AValue, 1, Pos(DirSeparator, AValue));
       Items.Add(Name);
     end;
@@ -167 +171 @@
   IsAbsolute := Source.IsAbsolute;
   Items.Assign(Source.Items);
+  DirSeparator := Source.DirSeparator;
 end;
 
@@ -172 +177 @@
 begin
   Items := TStringList.Create;
+  DirSeparator := DirectorySeparator;
 end;
 
@@ -188 +194 @@
   if Path.Combine <> '' then begin
     Result := Result + '//' + Authority;
-    if Path.Drive <> '' then Result := Result + '/';
+    if Scheme = 'file' then Result := Result + URIPathSeparator;
     Result := Result + Path.Combine;
   end;
   if Query <> '' then Result := Result + '?' + Query;
   if Fragment <> '' then Result := Result + '#' + Fragment;
-  StringReplace(Result, '\', '/', [rfReplaceAll]);
 end;
 
@@ -204 +209 @@
   if Copy(Value, 1, 2) = '//' then begin
     Value := Copy(Value, 3, Length(Value));
-    LeftCutString(Value, Authority, '/');
+    LeftCutString(Value, Authority, URIPathSeparator);
   end;
   RightCutString(Value, Fragment, '#');
   RightCutString(Value, Query, '?', '=&');
-  if (Length(Value) > 2) and (Value[2] = DriveSeparator) then
-    Delete(Value, 1, 1); // Remove beginning slash
+  //if Scheme = 'file' then Delete(Value, 1, 1); // Remove beginning slash
   Path.Parse(Value);
 end;
@@ -216 +220 @@
 begin
   Path := TFileName.Create;
+  Path.Directory.DirSeparator := URIPathSeparator;
 end;
 
@@ -278 +283 @@
   end else LeftCutString(Value, HostAddr, '', '.');
   Host := HostAddr;
-  LeftCutString(Value, TempPath, '', '/.');
+  LeftCutString(Value, TempPath, '', URIPathSeparator + '.');
   Path.Parse(TempPath);
 end;
@@ -311 +316 @@
     Extension := ExtensionSeparator + Extension;
   end else Extension := '';
-  if Pos(DirectorySeparator, AValue) > 0 then RightCutString(AValue, Name, DirectorySeparator)
+  if Pos(Directory.DirSeparator, AValue) > 0 then
+    RightCutString(AValue, Name, Directory.DirSeparator)
     else begin
       Name := AValue;