Proper URL handling

1 files changed, 42 insertions, 16 deletions

diff --git a/src/render/rendertext.nim b/src/render/rendertext.nim
index a421f509..4c6b56ec 100644
--- a/src/render/rendertext.nim
+++ b/src/render/rendertext.nim
@@ -1,3 +1,5 @@
+import streams
+
 import io/cell
 import utils/twtstr
 
@@ -6,35 +8,59 @@ proc renderPlainText*(text: string): FlexibleGrid =
   template add_format() =
     if af:
       af = false
-      result.addFormat(y, result[y].str.len, format)
+      result.addFormat(result.high, result[^1].str.len, format)
 
+  result.addLine()
   var i = 0
-  var x = 0
-  var y = 0
   var af = false
   while i < text.len:
-    if text[i] == '\n':
+    case text[i]
+    of '\n':
       if i != text.len - 1:
         add_format
         result.addLine()
-        inc y
-        x = 0
-      inc i
-    elif text[i] == '\r':
-      inc i
-    elif text[i] == '\t':
+    of '\r': discard
+    of '\t':
       add_format
       for i in 0..8:
         result[^1].str &= ' '
-      inc i
-    elif text[i] == '\e':
+    of '\e':
       i = format.parseAnsiCode(text, i)
       af = true
     elif text[i].isControlChar():
       add_format
-      result[y].str &= '^' & text[i].getControlLetter()
-      inc i
+      result[^1].str &= '^' & text[i].getControlLetter()
+    else:
+      add_format
+      result[^1].str &= text[i]
+    inc i
+
+proc renderStream*(stream: Stream): FlexibleGrid =
+  var format = newFormatting()
+  template add_format() =
+    if af:
+      af = false
+      result.addFormat(result.high, result[^1].str.len, format)
+
+  result.addLine()
+  var af = false
+  while not stream.atEnd():
+    let c = stream.readChar()
+    case c
+    of '\n':
+      add_format
+      result.addLine()
+    of '\r': discard
+    of '\t':
+      add_format
+      for i in 0..8:
+        result[^1].str &= ' '
+    of '\e':
+      format.parseAnsiCode(stream)
+      af = true
+    elif c.isControlChar():
+      add_format
+      result[^1].str &= '^' & c.getControlLetter()
     else:
       add_format
-      result[y].str &= text[i]
-      inc i
+      result[^1].str &= c