WebSVN – userdetect2 – Diff – /trunk/UserDetect2/UD2_Obj.pas

 {$INCLUDE 'UserDetect2.inc'}
 uses
   Windows, SysUtils, Classes, IniFiles, Contnrs, Dialogs, UD2_PluginIntf,
-  UD2_PluginStatus, UD2_Utils;
+  UD2_PluginStatus, UD2_Utils, UD2_Parsing;
 type
   TUD2IdentificationEntry = class;
   TUD2Plugin = class(TObject)
     property IniFileName: string read FIniFileName;
     property Errors: TStrings read FErrors;
     property LoadedPlugins: TObjectList{<TUD2Plugin>} read FLoadedPlugins;
     property IniFile: TMemIniFile read FIniFile;
     procedure GetAllDetectedIDs(outSL: TStrings);
+    function FulfilsEverySubterm(conds: TUD2TDFConditionArray; slIdNames: TStrings=nil): boolean; overload;
-    function FulfilsEverySubterm(idTerm: WideString; slIdNames: TStrings=nil): boolean;
+    function FulfilsEverySubterm(idTerm: WideString; slIdNames: TStrings=nil): boolean; overload;
-    procedure CheckTerm(idTermAndCmd: string; commandSLout: TStrings; slIdNames: TStrings=nil);
+    function CheckTerm(idTermAndCmd: string; slIdNames: TStrings=nil): TUD2CommandArray;
     function FindPluginByMethodNameOrGuid(idMethodName: string): TUD2Plugin;
-    procedure GetCommandList(ShortTaskName: string; outSL: TStrings);
+    function GetCommandList(ShortTaskName: string): TUD2CommandArray;
     procedure HandlePluginDir(APluginDir, AFileMask: string);
     procedure GetTaskListing(outSL: TStrings);
     constructor Create(AIniFileName: string);
     destructor Destroy; override;
     function TaskExists(ShortTaskName: string): boolean;
 end;
 { TUD2IdentificationEntry }
 procedure TUD2IdentificationEntry.GetIdNames(sl: TStrings);
+var
+  cond: TUD2TDFCondition;
 begin
-  if DynamicDataUsed then
+  cond.idMethodName := Plugin.IdentificationMethodName;
-  begin
+  cond.idStr := IdentificationString;
-    sl.Add(Plugin.IdentificationMethodName+'('+DynamicData+'):'+IdentificationString);
+  cond.dynamicDataUsed := DynamicDataUsed;
-    sl.Add(Plugin.PluginGUIDString+'('+DynamicData+'):'+IdentificationString);
+  cond.dynamicData := DynamicData;
-  end
+  sl.Add(UD2_CondToStr(cond));
-  else
-  begin
-    sl.Add(Plugin.IdentificationMethodName+':'+IdentificationString);
+  cond.idMethodName := Plugin.PluginGUIDString;
-    sl.Add(Plugin.PluginGUIDString+':'+IdentificationString);
+  sl.Add(UD2_CondToStr(cond));
-  end;
 end;
 constructor TUD2IdentificationEntry.Create(AIdentificationString: WideString;
   APlugin: TUD2Plugin);
 begin
       ude.GetIdNames(outSL);
     end;
   end;
 end;
+function TUD2.FulfilsEverySubterm(conds: TUD2TDFConditionArray; slIdNames: TStrings=nil): boolean;
+begin
+  result := FulfilsEverySubterm(UD2_CondsToStr(conds), slIdNames);
+end;
 function TUD2.FulfilsEverySubterm(idTerm: WideString; slIdNames: TStrings=nil): boolean;
-const
-  CASE_SENSITIVE_FLAG = '$CASESENSITIVE$';
 var
-  x, a, b: TArrayOfString;
   i: integer;
   p: TUD2Plugin;
-  idName: WideString;
   cleanUpStringList: boolean;
-  caseSensitive: boolean;
+  conds: TUD2TDFConditionArray;
-  dynamicData: string;
+  cond: TUD2TDFCondition;
-  idMethodName: string;
+  idName: string;
 begin
   cleanUpStringList := slIdNames = nil;
   try
     if cleanUpStringList then
     begin
       slIdNames := TStringList.Create;
       GetAllDetectedIDs(slIdNames);
     end;
-    SetLength(x, 0);
-    if Pos(':', idTerm) = 0 then
-    begin
-      // Exclude stuff like "Description"
+    conds := UD2P_ParseConditions(idTerm);
-      result := false;
-      Exit;
-    end;
-    x := SplitString('&&', idTerm);
     result := true;
-    for i := Low(x) to High(x) do
+    for i := Low(conds) to High(conds) do
     begin
-      idName := x[i];
+      cond := conds[i];
-      /// --- Start Dynamic Extension
-      // xxxxxx ( xxxxx ):  xxxxxxxxxxxx
-      // xxxxx  ( xx:xx ):  xxxxx:xxx(x)
-      // xxxxxxxxxxxx    :  xxxxx(xxx)xx
-      SetLength(a, 0);
-      a := SplitString('(', idName);
+      if cond.dynamicDataUsed then
-      if (Length(a) >= 2) and (Pos(':', a[0]) = 0) then
       begin
-        SetLength(b, 0);
-        b := SplitString('):', a[1]);
-        if Length(b) >= 2 then
-        begin
-          dynamicData := b[0];
-          idMethodName := a[0];
-          p := FindPluginByMethodNameOrGuid(idMethodName);
+        p := FindPluginByMethodNameOrGuid(cond.idMethodName);
-          if Assigned(p) then
+        if Assigned(p) then
-          begin
+        begin
-            if p.InvokeDynamicCheck(dynamicData) then
+          if p.InvokeDynamicCheck(cond.dynamicData) then
-            begin
+          begin
-              // Reload the identifications
+            // Reload the identifications
-              slIdNames.Clear;
+            slIdNames.Clear;
-              GetAllDetectedIDs(slIdNames);
+            GetAllDetectedIDs(slIdNames);
-            end;
+          end;
-          end;
+        end;
-        end;
+      end;
-      end;
-      /// --- End Dynamic Extension
-      if Pos(CASE_SENSITIVE_FLAG, idName) >= 1 then
-      begin
-        idName := StringReplace(idName, CASE_SENSITIVE_FLAG, '', [rfReplaceAll]);
-        caseSensitive := true;
+      idName := UD2_CondToStr(cond);
-      end
-      else
-      begin
-        caseSensitive := false;
-      end;
-      if (not caseSensitive and (slIdNames.IndexOf(idName) = -1)) or
+      if (not cond.caseSensitive and (slIdNames.IndexOf(idName) = -1)) or
-         (caseSensitive and (IndexOf_CS(slIdNames, idName) = -1)) then
+         (cond.caseSensitive and (IndexOf_CS(slIdNames, idName) = -1)) then
       begin
         result := false;
         break;
       end;
     end;
       Exit;
     end;
   end;
 end;
-procedure TUD2.GetCommandList(ShortTaskName: string; outSL: TStrings);
+function TUD2.GetCommandList(ShortTaskName: string): TUD2CommandArray;
 var
-  i: integer;
+  i, j, l: integer;
   slSV, slIdNames: TStrings;
+  tmpCmds: TUD2CommandArray;
 begin
+  SetLength(result, 0);
+  SetLength(tmpCmds, 0);
   slIdNames := TStringList.Create;
   try
     GetAllDetectedIDs(slIdNames);
     slSV := TStringList.Create;
     try
       FIniFile.ReadSectionValues(ShortTaskName, slSV);
       for i := 0 to slSV.Count-1 do
       begin
-        CheckTerm(slSV.Strings[i], outSL, slIdNames);
+        tmpCmds := CheckTerm(slSV.Strings[i], slIdNames);
+        for j := Low(tmpCmds) to High(tmpCmds) do
+        begin
+          l := Length(result);
+          SetLength(result, l+1);
+          result[l] := tmpCmds[j];
+        end;
       end;
     finally
       slSV.Free;
     end;
   finally
     slIdNames.Free;
   end;
 end;
-procedure TUD2.CheckTerm(idTermAndCmd: string; commandSLout: TStrings; slIdNames: TStrings=nil);
+function TUD2.CheckTerm(idTermAndCmd: string; slIdNames: TStrings=nil): TUD2CommandArray;
 var
-  nameVal: TArrayOfString;
-  idTerm, cmd: string;
   slIdNamesCreated: boolean;
+  ent: TUD2TDFEntry;
 begin
+  SetLength(result, 0);
   slIdNamesCreated := false;
   try
     if not Assigned(slIdNames) then
     begin
       slIdNamesCreated := true;
       slIdNames := TStringList.Create;
       GetAllDetectedIDs(slIdNames);
     end;
-    SetLength(nameVal, 0);
-    // We are doing the interpretation of the line ourselves, because
+    if not UD2P_ParseTdfLine(idTermAndCmd, ent) then Exit;
-    // TStringList.Values[] would not allow multiple command lines with the
+    if FulfilsEverySubterm(ent.ids, slIdNames) then
-    // same key (idTerm)
+    begin
-    // TODO xxx: big problem when we want to check environment variables, since our idTerm would contain '=' !
-    nameVal := SplitString('=', idTermAndCmd);
-    if Length(nameVal) < 2 then exit;
-    idTerm := nameVal[0];
+      result := ent.commands;
-    cmd    := nameVal[1];
+    end;
-    if FulfilsEverySubterm(idTerm, slIdNames) then commandSLout.Add(cmd);
   finally
     if slIdNamesCreated then slIdNames.Free;
   end;
 end;

Subversion Repositories userdetect2

userdetect2/trunk/UserDetect2/UD2_Obj.pas – Rev 84 → 85