浏览代码

[commons] some fixes

Exilon 3 年之前
父节点
当前提交
87133cd55b
共有 4 个文件被更改,包括 9 次插入10 次删除
  1. 2 1
      Quick.Commons.pas
  2. 2 3
      Quick.Data.Redis.pas
  3. 4 6
      Quick.YAML.pas
  4. 1 0
      QuickLib.inc

+ 2 - 1
Quick.Commons.pas

@@ -94,6 +94,7 @@ const
   {$ELSE}
   {$ELSE}
   EventStr : array[0..8] of string = ('INFO','SUCC','WARN','ERROR','DEBUG','DONE','TRACE','CRITICAL','EXCEPTION');
   EventStr : array[0..8] of string = ('INFO','SUCC','WARN','ERROR','DEBUG','DONE','TRACE','CRITICAL','EXCEPTION');
   {$ENDIF}
   {$ENDIF}
+  CRLF = #13#10;
 type
 type
   TPasswordComplexity = set of (pfIncludeNumbers,pfIncludeSigns);
   TPasswordComplexity = set of (pfIncludeNumbers,pfIncludeSigns);
 
 
@@ -1748,7 +1749,7 @@ begin
     for value in aArray do
     for value in aArray do
     begin
     begin
       sb.Append(value);
       sb.Append(value);
-      sb.Append(#10#13);
+      sb.Append(CRLF);
     end;
     end;
     Result := sb.ToString;
     Result := sb.ToString;
   finally
   finally

+ 2 - 3
Quick.Data.Redis.pas

@@ -1,13 +1,13 @@
 { ***************************************************************************
 { ***************************************************************************
 
 
-  Copyright (c) 2015-2021 Kike Pérez
+  Copyright (c) 2015-2022 Kike Pérez
 
 
   Unit        : Quick.Data.Redis
   Unit        : Quick.Data.Redis
   Description : Redis client
   Description : Redis client
   Author      : Kike Pérez
   Author      : Kike Pérez
   Version     : 1.0
   Version     : 1.0
   Created     : 22/02/2020
   Created     : 22/02/2020
-  Modified    : 15/10/2021
+  Modified    : 07/03/2022
 
 
   This file is part of QuickLib: https://github.com/exilon/QuickLib
   This file is part of QuickLib: https://github.com/exilon/QuickLib
 
 
@@ -161,7 +161,6 @@ implementation
 const
 const
 
 
   DEF_REDIS_PORT = 6379;
   DEF_REDIS_PORT = 6379;
-  CRLF = #13#10;
   DEF_CONNECTIONTIMEOUT = 30000;
   DEF_CONNECTIONTIMEOUT = 30000;
   DEF_READTIMETOUT = 10000;
   DEF_READTIMETOUT = 10000;
 
 

+ 4 - 6
Quick.YAML.pas

@@ -1,13 +1,13 @@
 { ***************************************************************************
 { ***************************************************************************
 
 
-  Copyright (c) 2015-2020 Kike Pérez
+  Copyright (c) 2015-2022 Kike Pérez
 
 
   Unit        : Quick.YAML
   Unit        : Quick.YAML
   Description : YAML Object parser
   Description : YAML Object parser
   Author      : Kike Pérez
   Author      : Kike Pérez
   Version     : 1.1
   Version     : 1.1
   Created     : 17/04/2019
   Created     : 17/04/2019
-  Modified    : 03/07/2020
+  Modified    : 07/03/2022
 
 
   This file is part of QuickLib: https://github.com/exilon/QuickLib
   This file is part of QuickLib: https://github.com/exilon/QuickLib
 
 
@@ -247,10 +247,8 @@ type
 implementation
 implementation
 
 
 const
 const
-  CRLF = #13#10;
   NUM_INDENT = 2;
   NUM_INDENT = 2;
 
 
-
 { TYamlAncestor }
 { TYamlAncestor }
 
 
 procedure TYamlAncestor.AddDescendant(const aDescendent: TYamlAncestor);
 procedure TYamlAncestor.AddDescendant(const aDescendent: TYamlAncestor);
@@ -512,7 +510,7 @@ begin
   try
   try
     vIndex := 0;
     vIndex := 0;
     //normalize tabs
     //normalize tabs
-    data := StringReplace(aData,#9,Spaces(4),[rfReplaceAll]);
+    data := StringReplace(aData,#9,Spaces(NUM_INDENT),[rfReplaceAll]);
     {$IFNDEF LINUX}
     {$IFNDEF LINUX}
     for line in data.Split([#13]) do yaml.Add(StringReplace(line,#10,'',[rfReplaceAll]));
     for line in data.Split([#13]) do yaml.Add(StringReplace(line,#10,'',[rfReplaceAll]));
     {$ELSE}
     {$ELSE}
@@ -541,7 +539,7 @@ begin
   try
   try
     vIndex := 0;
     vIndex := 0;
     //normalize tabs
     //normalize tabs
-    data := StringReplace(aData,#9,Spaces(4),[rfReplaceAll]);
+    data := StringReplace(aData,#9,Spaces(NUM_INDENT),[rfReplaceAll]);
     {$IFNDEF LINUX}
     {$IFNDEF LINUX}
     for line in data.Split([#13]) do yaml.Add(StringReplace(line,#10,'',[rfReplaceAll]));
     for line in data.Split([#13]) do yaml.Add(StringReplace(line,#10,'',[rfReplaceAll]));
     {$ELSE}
     {$ELSE}

+ 1 - 0
QuickLib.inc

@@ -173,6 +173,7 @@
   {.$DEFINE DEBUG_OBJPOOL}
   {.$DEFINE DEBUG_OBJPOOL}
   {.$DEFINE DEBUG_PARAMETERS}
   {.$DEFINE DEBUG_PARAMETERS}
   {.$DEFINE DEBUG_REDIS}
   {.$DEFINE DEBUG_REDIS}
+  {.$DEFINE DEBUG_IOC}
 {$ENDIF}
 {$ENDIF}
 
 
 {.$DEFINE QUICK_HINTSOFF}
 {.$DEFINE QUICK_HINTSOFF}