Changeset 2124 for cobra/trunk/Supplements/le.cobra

Timestamp:

07/04/09 08:46:25 (3 years ago)

Author:

Chuck.Esterbrook

Message:

Enhance le.cobra to support old Mac style text files.

Files:

• cobra/trunk/Supplements/le.cobra (modified) (6 diffs)

cobra/trunk/Supplements/le.cobra

@@ -3 +3 @@
 le.cobra
 
-"line endings" - Report the line endings of text files as 'dos', 'unix', 'both' or '?'.
+"line endings" - Report the line endings of text files as 'dos', 'unix', 'oldmac', 'both' or '?'.
 
 Skips binary files and reports files with unknown extensions.
@@ -42 +42 @@
     var _action as Action
 
-    var _crLfRegEx = Regex(r'\r\n')
-    var _notCrLfRegEx = Regex(r'[^\r]\n')
+    var _crLfRegEx = Regex(r'\r\n')  # dos / windows
+    var _notCrLfRegEx = Regex(r'[^\r]\n')  # unix / mac / linux / etc
+    var _crRegEx = Regex(r'\r')  # old mac
 
     var _exts = Set<of String>()
@@ -167 +168 @@
         _exts.add(ext)
         if ext in .binExtensions
-            print 'skipping bin file      : [fi]'
+            print 'skipping bin file        : [fi]'
         else if ext in .textExtensions or ext == ''
             # In practice, I find that files without extensions are text files.
             # Usually captured text output from a command or a shell script.
             type = .lineEndingsType(fi)
-            pad = if(type=='dos', ' ', '')
+            pad = if(type=='dos', '   ', if(type=='unix', '  ', ''))  # 'oldmac' is longest
             print 'found text file ([type]) [pad]: [fi]'
             .act(type, fi)
         else
-            print 'unknown file type      : "[ext]" for [fi]'
+            print 'unknown file type        : "[ext]" for [fi]'
 
     def lineEndingsType(fi as FileInfo) as String
-        ensure result in ['unix', 'dos', 'both', '?']
+        ensure result in ['unix', 'dos', 'both', 'oldmac', '?']
         text = File.readAllText(fi.fullName)
         match = _crLfRegEx.match(text)
@@ -202 +203 @@
         if isDos, return 'dos'
         if isUnix, return 'unix'
+        match = _crRegEx.match(text)
+        if match.success
+            matchText = match.groups[0].value
+            assert matchText == '\r'
+            # print 'OldMac ([CobraCore.toTechString(matchText)])'
+            return 'oldmac'
         return '?'
 
@@ -212 +219 @@
                 if type not in ['unix', '?']
                     text = File.readAllText(fi.fullName)
-                    text = text.replace('\r', '')
+                    if type == 'oldmac', text = text.replace('\r', '\n')
+                    else, text = text.replace('\r', '')
             on Action.ToDos
                 if type not in ['dos', '?']
                     text = File.readAllText(fi.fullName)
-                    text = text.replace('\r', '').replace('\n', '\r\n')
+                    if type == 'oldmac', text = text.replace('\r', '\r\n')
+                    else, text = text.replace('\r', '').replace('\n', '\r\n')
         if text
             suffix = '-convert-line-endings-' + DateTime.now.toString('yyyy-MM-dd')
@@ -225 +234 @@
                 File.delete(fi.fullName)
                 File.move(newName, fi.fullName)
-                print '                         Converted'
+                print '                           Converted'
 
     def summarizeExtensions