Przeglądaj źródła

* mirc2egg script updated.

Morten Brix Pedersen 23 lat temu
rodzic
commit
08d613d258
2 zmienionych plików z 66 dodań i 65 usunięć
  1. 1 0
      docs/Changelog
  2. 65 65
      scripts/mirc2egg.sed

+ 1 - 0
docs/Changelog

@@ -1,6 +1,7 @@
 pisg (x.xx)
    * Fixed an error in the mIRC6 format which caused pisg to abort on some
      lines.
+   * mirc2egg script updated.
 
 pisg (0.43) - Fri Nov, 22th 2002
    * Add "ShowOnlyTop" option which can be used if you only want to have stats

+ 65 - 65
scripts/mirc2egg.sed

@@ -1,5 +1,5 @@
 #!/bin/sed -f
-# mirc2egg.sed: convert mIRC log to eggdrop format - 31/10/02
+# mirc2egg.sed: convert mIRC log to eggdrop format - 01/12/02
 # Useful in replacing missing eggdrop logs 
 # (supports mIRC 5.x, 6.x and 'Peace and Protection' formats)
 #
@@ -28,17 +28,17 @@
         s/—//g
 
         # Remove seconds from timestamp
-        s/^\[\(.....\)...\]/[\1]/
+        s/^\[\(..:..\):..\]/[\1]/
 
         # PnP: reformat conversations to standard mIRC
-        /^\[.....\] (.*): /{
+        /^\[..:..\] (.*): /{
                 s/(/</1
                 s/):/>/1
-         }
+        }
 
         # Extract channel name from header, convert to lower-case, 
         # place in hold space, delete from pattern space
-        /^\[.....\] \*\*\* Now talking in #/{
+        /^\[..:..\] \*\*\* Now talking in #/{
         s/.*\(#.*\)/\1/1
         y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
         h
@@ -52,64 +52,64 @@
         }
 
         # Change footer into end-of-log mark
-        s/^Session Close: \(...\) \(...\) \(..\) \(.....\)... \(....\)/[\4] --- \1 \2 \3 \5/
+        s/^Session Close: \(...\) \(...\) \(..\) \(..:..\):.. \(....\)/[\4] --- \1 \2 \3 \5/
 
         # Retain conversations, actions and events - purge everything else
-        /^\[.....\] [<*-].*/!d
+        /^\[..:..\] [<*-].*/!d
 
         # Remove op/voice tags from talking/actions
-        s/^\[\(.....\)\] <[@+]/[\1] </
-        s/^\[\(.....\)\] \* [@+]/[\1] \* /
+        s/^\[\(..:..\)\] <[@+]/[\1] </
+        s/^\[\(..:..\)\] \* [@+]/[\1] \* /
 
         # Reformat nick changes (mIRC 5.x)
-        /^\[.....\] \*\*\* .*is now known as/{
+        /^\[..:..\] \*\*\* .*is now known as/{
                 s/is now known as/->/1
-                s/^\[\(.....\)\] \*\*\*/[\1]/
-                s/^\[\(.....\)\]/[\1] Nick change:/
+                s/^\[\(..:..\)\] \*\*\*/[\1]/
+                s/^\[\(..:..\)\]/[\1] Nick change:/
         }
         # Reformat nick changes (mIRC 6.x)
-        /^\[.....\] \* .*is now known as/{
+        /^\[..:..\] \* .*is now known as/{
                 s/is now known as/->/1
-                s/^\[\(.....\)\] \*/[\1]/
-                s/^\[\(.....\)\]/[\1] Nick change:/
+                s/^\[\(..:..\)\] \*/[\1]/
+                s/^\[\(..:..\)\]/[\1] Nick change:/
         }
 
         # Reformat quit actions (PnP)
-        /^\[.....\] \*\*\* Quits: .* (.*@.*\..*\..*)/{
+        /^\[..:..\] \*\*\* Quits: .* (.*@.*\..*\..*)/{
                 s/\*\*\* Quits: //1
                 s/) (/) left irc: /1
                 s/)$//
         }
         # Reformat quit actions, append fake hostmask (mIRC 5.x)
-        /^\[.....\] \*\*\* Quits:/{
+        /^\[..:..\] \*\*\* Quits:/{
                 s/\*\*\* Quits: //1
                 s/] \(.*\) (\(.*\))$/] \1 (username@hostname.org) left irc: \2/
         }
         # Reformat quit actions (mIRC 6.x)
-        /^\[.....\] \* .*) Quit.*)$/{
+        /^\[..:..\] \* .*) Quit.*)$/{
                 s/Quit/left irc:/1
-                s/^\[\(.....\)\] \*/[\1]/
+                s/^\[\(..:..\)\] \*/[\1]/
                 s/(//2
                 s/)$//
         }
 
         # Reformat part actions (mIRC 5.x)
-        /^\[.....\] \*\*\* Parts:/{
+        /^\[..:..\] \*\*\* Parts:/{
                 s/\*\*\* Parts: //1
                 s/) (\(.*\))$/) left irc: \1/
                 s/)$/) left irc:/
         }
 
         # Reformat join actions (mIRC 5.x)
-        /^\[.....\] \*\*\* Joins:/{
+        /^\[..:..\] \*\*\* Joins:/{
                 s/\*\*\* Joins: //1
                 G
                 s/\(.*\)\n\(#.*\)/\1 joined \2./1
         }
         # Reformat join actions (mIRC 6.x)
-        /^\[.....\] \* .*) has joined/{
+        /^\[..:..\] \* .*) has joined/{
                 s/has //1
-                s/^\[\(.....\)\] \*/[\1]/
+                s/^\[\(..:..\)\] \*/[\1]/
                 G
                 s/\(.*\)\n\(.*joined \)\(#.*\)/\2\1/1
                 s/\(.*joined\).*\n\(.*\)/\1 \2/1
@@ -117,22 +117,22 @@
         }
 
         # Reformat kick actions (mIRC 5.x)
-        /^\[.....\] \*\*\* .*was kicked by.*)$/{
+        /^\[..:..\] \*\*\* .*was kicked by.*)$/{
                 s/by \(.*\) (/by \1: (/1
                 s/was //1
                 s/kicked/kicked from /1
-                s/^\[\(.....\)\] \*\*\*/[\1]/
+                s/^\[\(..:..\)\] \*\*\*/[\1]/
                 G 
                 s/\(.*from \)\(.*\)\n\(.*\)/\1\3\2/1
                 s/(//1
                 s/)$//
         }
         # Reformat kick actions (mIRC 6.x)
-        /^\[.....\] \* .*was kicked by.*)$/{
+        /^\[..:..\] \* .*was kicked by.*)$/{
                 s/by \(.*\) (/by \1: (/1
                 s/was //1
                 s/kicked/kicked from /1
-                s/^\[\(.....\)\] \*/[\1]/
+                s/^\[\(..:..\)\] \*/[\1]/
                 G
                 s/\(.*from \)\(.*\)\n\(.*\)/\1\3\2/1
                 s/(//1
@@ -140,25 +140,25 @@
         }
 
         # Delete topic changes made by rejoining servers (mIRC 5.x)
-        /^\[.....\] \*\*\* .*\..*\..*changes topic to/d
+        /^\[..:..\] \*\*\* .*\..*\..*changes topic to/d
         # Delete topic changes made by rejoining servers (mIRC 6.x)
-        /^\[.....\] \* .*\..*\..*changes topic to/d
+        /^\[..:..\] \* .*\..*\..*changes topic to/d
 
         # Reformat topic changes, append fake hostmask (mIRC 5.x)
-        /^\[.....\] \*\*\* .*changes topic to/{
+        /^\[..:..\] \*\*\* .*changes topic to/{
                 s/ changes topic to/!username@hostname.org:/1
-                s/^\[\(.....\)\] \*\*\*/[\1]/1
-                s/^\[\(.....\)\] /[\1] Topic changed on /1
+                s/^\[\(..:..\)\] \*\*\*/[\1]/1
+                s/^\[\(..:..\)\] /[\1] Topic changed on /1
                 G
                 s/\(.*on \)\(.*\)\n\(.*\)/\1\3 by \2/1
                 s/'//1
                 s/'$//
         }
         # Reformat topic changes, append fake hostmask (mIRC 6.x)
-        /^\[.....\] \* .*changes topic to/{
+        /^\[..:..\] \* .*changes topic to/{
                 s/ changes topic to/!username@hostname.org:/1
-                s/^\[\(.....\)\] \*/[\1]/1
-                s/^\[\(.....\)\] /[\1] Topic changed on /1
+                s/^\[\(..:..\)\] \*/[\1]/1
+                s/^\[\(..:..\)\] /[\1] Topic changed on /1
                 G
                 s/\(.*on \)\(.*\)\n\(.*\)/\1\3 by \2/1
                 s/'//1
@@ -166,64 +166,64 @@
         }
 
         # Delete mode changes made by rejoining servers (mIRC 5.x)
-        /^\[.....\] \*\*\* .*\..*\..*sets mode: /d
+        /^\[..:..\] \*\*\* .*\..*\..*sets mode: /d
         # Delete mode changes made by rejoining servers (mIRC 6.x)
-        /^\[.....\] \* .*\..*\..*sets mode: /d
+        /^\[..:..\] \* .*\..*\..*sets mode: /d
 
         # Reformat multiple mode changes, append fake hostmask (mIRC 5.x)
-        /^\[.....\] \*\*\* .*sets mode: [+-][ovbntsmelkip][+-ovbntsmelkip ]/{
+        /^\[..:..\] \*\*\* .*sets mode: [+-][ovbntsmelkip][+-ovbntsmelkip ]/{
                 s/sets mode: //1
-                s/^\[\(.....\)\] \*\*\*/[\1]/
-                s/^\[\(.....\)\] \(.*\) \([+-].*\)/[\1] \2 '\3'/
+                s/^\[\(..:..\)\] \*\*\*/[\1]/
+                s/^\[\(..:..\)\] \(.*\) \([+-].*\)/[\1] \2 '\3'/
                 G
                 s/\] \(.*\) \('.*\)\n\(.*\)/] \3: mode change \2 by \1!username@hostname.org/1
         }
         # Reformat multiple mode changes, append fake hostmask (mIRC 6.x)
-        /^\[.....\] \* .*sets mode: [+-][ovbntsmelkip][+-ovbntsmelkip ]/{
+        /^\[..:..\] \* .*sets mode: [+-][ovbntsmelkip][+-ovbntsmelkip ]/{
                 s/sets mode: //1
-                s/^\[\(.....\)\] \*/[\1]/
-                s/^\[\(.....\)\] \(.*\) \([+-].*\)/[\1] \2 '\3'/
+                s/^\[\(..:..\)\] \*/[\1]/
+                s/^\[\(..:..\)\] \(.*\) \([+-].*\)/[\1] \2 '\3'/
                 G
                 s/\] \(.*\) \('.*\)\n\(.*\)/] \3: mode change \2 by \1!username@hostname.org/1
         }
         # Reformat single mode changes, append fake hostmask (mIRC 5.x)
-        /^\[.....\] \*\*\* .*sets mode: [+-][imtnselp]$/{
+        /^\[..:..\] \*\*\* .*sets mode: [+-][imtnselp]$/{
                 s/sets mode: //1
-                s/^\[\(.....\)\] \*\*\*/[\1]/
-                s/^\[\(.....\)\] \(.*\) \([+-].*\)/[\1] \2 '\3'/
+                s/^\[\(..:..\)\] \*\*\*/[\1]/
+                s/^\[\(..:..\)\] \(.*\) \([+-].*\)/[\1] \2 '\3'/
                 G
                 s/\] \(.*\) \('.*\)\n\(.*\)/] \3: mode change \2 by \1!username@hostname.org/1
         }
         # Reformat single mode changes, append fake hostmask (mIRC 6.x)
-        /^\[.....\] \* .*sets mode: [+-][imtnselp]$/{
+        /^\[..:..\] \* .*sets mode: [+-][imtnselp]$/{
                 s/sets mode: //1
-                s/^\[\(.....\)\] \*/[\1]/
-                s/^\[\(.....\)\] \(.*\) \([+-].*\)/[\1] \2 '\3'/
+                s/^\[\(..:..\)\] \*/[\1]/
+                s/^\[\(..:..\)\] \(.*\) \([+-].*\)/[\1] \2 '\3'/
                 G
                 s/\] \(.*\) \('.*\)\n\(.*\)/] \3: mode change \2 by \1!username@hostname.org/1
         }
 
         # Remove client-induced crap (mIRC 6.x)
-        /^\[.....\] \* Disconnected/d
-        /^\[.....\] \* Attempting to rejoin/d
-        /^\[.....\] \* Rejoined channel/d
-        /^\[.....\] \* Respond to/d
-        /^\[.....\] \* Retrieving #.*info\.\.\./d
-        /^\[.....\] \* Topic is/d
-        /^\[.....\] \* Set by/d
-        /^\[.....\] \* You/d
-        /^\[.....\] \* \/msg/d
-        /^\[.....\] \* Looking up.*user info/d
-        /^\[.....\] \* Timer vote/d
-        /^\[.....\] \* Break:/d
-        /^\[.....\] \* Waiting.*for previous request/d
+        /^\[..:..\] \* Disconnected/d
+        /^\[..:..\] \* Attempting to rejoin/d
+        /^\[..:..\] \* Rejoined channel/d
+        /^\[..:..\] \* Respond to/d
+        /^\[..:..\] \* Retrieving #.*info\.\.\./d
+        /^\[..:..\] \* Topic is/d
+        /^\[..:..\] \* Set by/d
+        /^\[..:..\] \* You/d
+        /^\[..:..\] \* \/msg/d
+        /^\[..:..\] \* Looking up.*user info/d
+        /^\[..:..\] \* Timer vote/d
+        /^\[..:..\] \* Break:/d
+        /^\[..:..\] \* Waiting.*for previous request/d
 
         # Reformat actions
-        s/^\[\(.....\)\] \* /[\1] Action: /
+        s/^\[\(..:..\)\] \* /[\1] Action: /
 
         # Remove remaining crap
-        /^\[.....\] \*/d
-        /^\[.....\] \-/{
+        /^\[..:..\] \*/d
+        /^\[..:..\] \-/{
                 /-\{3\} /!d
         }