ADD: [convers] Support for Uronode convers (untestet)

Author: andreaspeters

CHANGELOG.md

@@ -22,6 +22,7 @@
 - ADD: [mail] Offline mail support for LinBPQ.
 - ADD: Progressbar to show the state of message/file download.
 - ADD: BBS Type in statusbar.
+- ADD: [convers] Support for Uronode convers (untestet)
 
 ## v0.7.0
 

src/flexpacket.lpi

@@ -23,7 +23,7 @@
       <UseVersionInfo Value="True"/>
       <AutoIncrementBuild Value="True"/>
       <MinorVersionNr Value="7"/>
-      <BuildNr Value="2492"/>
+      <BuildNr Value="2494"/>
       <Language Value="0C0C"/>
       <StringTable InternalName="flexpacket" ProductName="flexpacket" ProductVersion="0.7.0"/>
     </VersionInfo>

src/flexpacket.lps

@@ -227,9 +227,8 @@
         <ComponentName Value="FListMails"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="14"/>
-        <TopLine Value="486"/>
+        <TopLine Value="487"/>
         <CursorPos X="25" Y="499"/>
         <UsageCount Value="303"/>
         <Loaded Value="True"/>
@@ -254,9 +253,10 @@
         <ComponentName Value="TFConvers"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="6"/>
-        <TopLine Value="309"/>
-        <CursorPos X="7" Y="325"/>
+        <TopLine Value="257"/>
+        <CursorPos X="56" Y="267"/>
         <UsageCount Value="247"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -339,14 +339,6 @@
       </Unit>
     </Units>
     <JumpHistory HistoryIndex="29">
-      <Position>
-        <Filename Value="umain.pas"/>
-        <Caret Line="883" Column="14" TopLine="860"/>
-      </Position>
-      <Position>
-        <Filename Value="umain.pas"/>
-        <Caret Line="186" Column="30" TopLine="173"/>
-      </Position>
       <Position>
         <Filename Value="umain.pas"/>
         <Caret Line="755" Column="43" TopLine="737"/>
@@ -459,6 +451,14 @@
         <Filename Value="umain.pas"/>
         <Caret Line="186" Column="30" TopLine="173"/>
       </Position>
+      <Position>
+        <Filename Value="uconvers.pas"/>
+        <Caret Line="233" Column="56" TopLine="214"/>
+      </Position>
+      <Position>
+        <Filename Value="uconvers.pas"/>
+        <Caret Line="271" Column="54" TopLine="263"/>
+      </Position>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>

src/flexpacket.res

@@ -9,6 +9,7 @@ object TFConvers: TTFConvers
   DoubleBuffered = True
   ParentDoubleBuffered = False
   Position = poDesktopCenter
+  LCLVersion = '4.4.0.0'
   OnClose = FormClose
   OnResize = FormResize
   OnShow = FormShow
@@ -38,7 +39,7 @@ object TFConvers: TTFConvers
     end
     object ToolButton1: TToolButton
       Left = 27
-      Height = 26
+      Height = 8
       Top = 0
       Caption = 'ToolButton1'
       Style = tbsSeparator
@@ -52,7 +53,7 @@ object TFConvers: TTFConvers
     Panels = <>
   end
   object PairSplitter1: TPairSplitter
-    Cursor = crVSplit
+    Cursor = crDefault
     Left = 2
     Height = 479
     Top = 26
@@ -71,6 +72,7 @@ object TFConvers: TTFConvers
       ClientWidth = 580
       ClientHeight = 400
       object PairSplitter2: TPairSplitter
+        Cursor = crDefault
         Left = 0
         Height = 400
         Top = 0

src/uconvers.lfm

@@ -206,6 +206,7 @@ function TTFConvers.Colorerize(const Data: AnsiString): AnsiString;
 
   Regex := TRegExpr.Create;
   try
+    // Try LinBPQ
     Regex.Expression := '(?:(\d{2}\s*:\s*\d{2})\s+)?([A-Z0-9]+)\s*:\s*(.*)';
     Regex.ModifierI := False;
     if Regex.Exec(Data) then
@@ -218,18 +219,24 @@ function TTFConvers.Colorerize(const Data: AnsiString): AnsiString;
           Result := Format(#27'[36m %-7s : '#27'[0m%s', [callsign, msg])
         else
           Result := Format(#27'[36m %-5s %-7s : '#27'[0m%s', [clock, callsign, msg]);
+        Exit;
       end;
+
+    // Try UROnode
+    Regex.Expression := '(<\S+>):(.*)';
+    Regex.ModifierI := False;
+    if Regex.Exec(Data) then
+      if Regex.SubExprMatchCount >= 2 then
+      begin
+        callsign := Regex.Match[1];
+        msg := Regex.Match[2];
+        Result := Format(#27'[36m %-7s : '#27'[0m%s', [callsign, msg]);
+        Exit;
+      end;
+
   finally
     Regex.Free;
   end;
-
-//  if Message then
-//  begin
-//    if Pos(#13, Data) > 0 then
-//      Result := StringReplace(Result, #13, #13 + ESC+'[36m', [rfReplaceAll]);
-//    if Pos(':', Data) > 0 then
-//      Result := StringReplace(Result, ':', ESC+'[0m :', [rfReplaceAll]);
-//  end;
 end;
 
 procedure TTFConvers.AddBuddies(const Callsign: AnsiString);
@@ -261,7 +268,7 @@ procedure TTFConvers.CheckLeft(const Data: AnsiString);
   if (Length(Data) <= 0) then
     Exit;
 
-  if Pos('*** Left', Data) > 0 then
+  if (Pos('*** Left', Data) > 0) or (Pos('left channel', Data) > 0) then
   begin
     Callsign := GetCallsign(Data);
     if Length(Callsign) > 0 then
@@ -282,7 +289,7 @@ procedure TTFConvers.CheckJoined(const Data: AnsiString);
   if (Length(Data) <= 0) then
     Exit;
 
-  if Pos('*** Joined', Data) > 0 then
+  if (Pos('*** Joined', Data) > 0) or (Pos('joined channel', Data) > 0) then
   begin
     Callsign := GetCallsign(Data);
     if Length(Callsign) > 0 then
@@ -299,11 +306,13 @@ function TTFConvers.GetUsername(const Data: AnsiString): AnsiString;
 begin
   Regex := TRegExpr.Create;
   try
-    Regex.Expression := '.*\s:\s(.*)(?:\*\*\* Joined Chat).*';
+    // Try LinBPQ
+    Regex.Expression := '\s:\s(.*)(?:\*\*\* Joined Chat)';
     Regex.ModifierI := False;
     if Regex.Exec(Data) then
       if Regex.SubExprMatchCount >= 1 then
         Result := Trim(Regex.Match[1]);
+
   finally
     Regex.Free;
   end;
@@ -319,11 +328,26 @@ function TTFConvers.GetCallsign(const Data: AnsiString): AnsiString;
 
   Regex := TRegExpr.Create;
   try
+    // Try LinBPQ
     Regex.Expression := '((?:\d{1})?[A-Z]{1,3}\d{1,3}[A-Z]{0,4}(?:-\d{1,2})?)';
     Regex.ModifierI := False;
     if Regex.Exec(Data) then
       if Regex.SubExprMatchCount >= 1 then
+      begin
+        Result := Trim(Regex.Match[1]);
+        Exit;
+      end;
+
+    // Try UROnode
+    Regex.Expression := '\*\*\*\s*(?:\(\d{1,2}:\d{2}\)\s*)?(\S+?)(?:@\S+)?\s+joined channel\s';
+    Regex.ModifierI := False;
+    if Regex.Exec(Data) then
+      if Regex.SubExprMatchCount >= 1 then
+      begin
         Result := Trim(Regex.Match[1]);
+        Exit;
+      end;
+
   finally
     Regex.Free;
   end;