提交: 2f41a4f0745ef4ddd42474222b4544178fe9b6f8 - tttidy_py (git)

tidy tool for Template Toolkit

Commit MetaInfo

• 修訂: 2f41a4f0745ef4ddd42474222b4544178fe9b6f8 (tree)
• 時間: 2015-08-18 19:22:49
• 作者: hylom <hylom@user...>
• Commiter: hylom

Log Message

add --debug option, and change Indenter.extract_directives to use regex for directive search

Change Summary

• modified: tttidy.py

差異

--- a/tttidy.py
+++ b/tttidy.py
@@ -14,18 +14,22 @@ USAGE = '''  tttidy - tidy tool for template toolkit
 
 INDENT_LENGTH = 4
 INDENT_CHAR = ' '
-START_TAG = '[%'
-END_TAG = '%]'
+START_TAG = r'\[%-?'
+END_TAG = r'-?%]'
 
 class Indenter(object):
     '''Object for indenting template'''
-    def __init__(self):
+    def __init__(self, debug=False):
         '''Initializer'''
         self.indent_length = INDENT_LENGTH
         self.indent_char = INDENT_CHAR
-        self.start_tag = START_TAG
-        self.end_tag = END_TAG
+        self.start_tag = re.compile(START_TAG)
+        self.end_tag = re.compile(END_TAG)
         self.reset()
+        self.debug = debug
+
+    def debug_print(self, s):
+        sys.stderr.write(s + '\n')
 
     def reset(self):
         self._in_template = False
@@ -53,10 +57,41 @@ class Indenter(object):
                 return line
             else:
                 return line[0:c]
-        ret = [_strip_comment(x) for x in ret]
+        ret = [_strip_comment(x).strip() for x in ret]
         return ret
 
+    def _line_scan(self, line):
+        if self._in_template:
+            #cursor = line.find(self.end_tag)
+            m = self.end_tag.search(line)
+            if m == None:
+                return line
+            else:
+                cursor = m.start()
+                offset = m.end() - m.start()
+                body = line[:cursor]
+                offset = 2
+                rest = line[cursor + offset:]
+                self._in_template = False
+                return body + self._line_scan(rest)
+        else:
+            #cursor = line.find(self.start_tag)
+            m = self.start_tag.search(line)
+            if m == None:
+                return ''
+            else:
+                cursor = m.start()
+                offset = m.end() - m.start()
+                rest = line[cursor + offset:]
+                self._in_template = True
+                return self._line_scan(rest)
+    
     def _calc_indent_level(self, line):
+        if len(line) == 0:
+            return (0, 0)
+
+        self.debug_print(line)
+
         count_if = len(re.findall(u'^(IF|FOREACH)\s', line))
         count_if += len(re.findall(u'\s(IF|FOREACH)\s', line))
         count_if += len(re.findall(u'^BLOCK(\s|;)', line))
@@ -80,6 +115,7 @@ class Indenter(object):
         counter_next = 0
         # case: IF - ELSIF - ELSE - END directives all exists in one line
         if count_if == count_end and count_if > 0 and count_elsif > 0:
+            self.debug_print("if:{} end:{} elsif:{} cc:{} cn:{}".format(count_if, count_end, count_elsif, counter_current, counter_next))
             return (counter_current, counter_next)
 
         # else
@@ -98,31 +134,9 @@ class Indenter(object):
             counter_current -= 1
             counter_next += 1
 
+        self.debug_print("if:{} end:{} elsif:{} cc:{} cn:{}".format(count_if, count_end, count_elsif, counter_current, counter_next))
         return (counter_current, counter_next)
 
-    def _line_scan(self, line):
-        if self._in_template:
-            cursor = line.find(self.end_tag)
-            if cursor == -1:
-                return line
-            else:
-                body = line[:cursor]
-                offset = 2
-                rest = line[cursor + offset:]
-                self._in_template = False
-                return body + self._line_scan(rest)
-        else:
-            cursor = line.find(self.start_tag)
-            if cursor == -1:
-                return ''
-            else:
-                offset = 2
-                if line[cursor+2] == '-':
-                    offset += 1
-                rest = line[cursor + offset:]
-                self._in_template = True
-                return self._line_scan(rest)
-    
 
 def _error_exit(msg=None):
     if msg != None:
@@ -131,10 +145,9 @@ def _error_exit(msg=None):
         sys.stderr.write(USAGE)
     sys.exit(-1)
 
-def indent(template):
+def indent(template, debug=False):
     '''add indent'''
-    indenter = Indenter()
-    #r = indenter.extract_directives(template)
+    indenter = Indenter(debug)
     r = indenter.indent(template)
     return r
 
@@ -151,6 +164,7 @@ def main():
     parser.add_argument('file', type=file)
     parser.add_argument('--unindent', '-u', action='store_true')
     parser.add_argument('--directives', action='store_true')
+    parser.add_argument('--debug', action='store_true')
 
     args = parser.parse_args()
 
@@ -170,7 +184,7 @@ def main():
 
     # do indent
     ret = unindent(args.file)
-    ret = indent(ret)
+    ret = indent(ret, args.debug)
     print "\n".join(ret)