Support HTMl output (#20)

lnishan · lnishan · commit e57d96da9525 · 2017-11-01T16:42:48.000+08:00
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ In root directory (same directory as `SQLGitHub.py`),
 Create and edit `config.py`:  
 ```python
 token = "your token here"  # can be obtained from https://github.com/settings/tokens
-output = "str"  # or "csv" for csv output
+output = "str"  # or "csv", "html"
 ```
 
 4. Start SQLGitHub  
diff --git a/components/table.py b/components/table.py
@@ -22,6 +22,26 @@
 import itertools
 
 
+class EscapeHtml:
+    MAPPING = {u"&": u"&amp;",
+               u"<": u"&lt;",
+               u">": u"&gt;",
+               u"\"": u"&quot;",
+               u"\'": u"&#39;",
+               u"\n": u"<br>\n"}
+
+    @classmethod
+    def Escape(cls, ch):
+        return cls.MAPPING[ch] if cls.MAPPING.has_key(ch) else ch
+
+    @classmethod
+    def EscapeUnicodeStr(cls, unicode_str):
+        ret = u""
+        for ch in unicode_str:
+            ret += cls.Escape(ch)
+        return ret
+
+
 class SgTable:
     """A class to store tables."""
 
@@ -93,6 +113,23 @@ def InCsv(self):
             ret += u"\n" + self._GetCsvRepr(row)
         return ret
 
+    def InHtml(self):
+        ret = u"<html>\n<head><meta charset=\"utf-8\">\n<title>SQLGitHub Result</title>\n</head>\n<body>\n"
+
+        ret += u"<table border=1>"
+        ret += u"<tr>"
+        for field in self._fields:
+            ret += u"<td>" + EscapeHtml.EscapeUnicodeStr(field) + u"</td>"
+        ret += u"</tr>\n"
+        for row in self._table:
+            ret += u"<tr>"
+            for val in row:
+                unicode_str = val if isinstance(val, unicode) else unicode(str(val), "utf-8")
+                ret += u"<td>" + EscapeHtml.EscapeUnicodeStr(unicode_str) + u"</td>"
+            ret += u"</tr>\n"
+        ret += u"</table>\n</html>"
+        return ret
+
     def GetVals(self, field):
         idx = [i for i, f in enumerate(self._fields) if f == field][0]
         return [row[idx] for row in self._table]
diff --git a/components/top_level.py b/components/top_level.py
@@ -12,6 +12,7 @@
 
 import definition
 import parser
+import utilities as util
 import tokenizer
 
 
@@ -48,10 +49,7 @@ def Execute(self, sql, measure_time=True, display_result=True):
             else:
                 exec_time = time.time() - start_time
                 if display_result:
-                    if self._output == "str":
-                        print(result)
-                    elif self._output == "csv":
-                        print(result.InCsv())
+                    util.PrintResult(result, self._output)
                     print("-")
                     print("Total rows: %d" % (len(result)))
                     if measure_time:
diff --git a/components/utilities.py b/components/utilities.py
@@ -1,6 +1,14 @@
 """Utilities for general operations."""
 
 
+def PrintResult(table, output):
+    if output == "str":
+        print(table)
+    elif output == "csv":
+        print(table.InCsv())
+    elif output == "html":
+        print(table.InHtml())
+
 def IsNumeric(num_str):
     try:
         val = int(num_str)
@@ -40,11 +48,3 @@ def Unescape(ch):
         return "\\%"
     elif ch == "_":
         return "\\_"
-
-def EscapeHtml(ch):
-    mapping = {u"&": u"&amp;",
-               u"<": u"&lt;",
-               u">": u"&gt;",
-               u"\"": u"&quot;",
-               u"\'": u"&#39;"}
-    return mapping[ch] if mapping.has_key(ch) else ch
diff --git a/query.py b/query.py
@@ -4,6 +4,7 @@
 
 import config_loader
 from components import top_level
+from components import utilities as util
 
 arg_parser = argparse.ArgumentParser()
 arg_parser.add_argument("sql", type=unicode, help="a line of sql for query")
@@ -14,7 +15,4 @@
     token, output = config_loader.Load("config")
     sqlserv = top_level.SQLGitHub(token, output)
     result, exec_time = sqlserv.Execute(args.sql, display_result=False)
-    if output == "str":
-        print(result)
-    elif output == "csv":
-        print(result.InCsv())
+    util.PrintResult(result, output)
