client, pager: remove unnecessary std/streams

2 files changed, 7 insertions, 12 deletions

diff --git a/src/local/client.nim b/src/local/client.nim
index dc79438e..f5e722e3 100644
--- a/src/local/client.nim
+++ b/src/local/client.nim
@@ -5,7 +5,6 @@ import std/options
 import std/os
 import std/posix
 import std/selectors
-import std/streams
 import std/strutils
 import std/tables
 import std/unicode
@@ -712,10 +711,9 @@ proc clearConsole(client: Client) =
 
 proc dumpBuffers(client: Client) =
   client.headlessLoop()
-  let ostream = newFileStream(stdout)
   for container in client.pager.containers:
     try:
-      client.pager.drawBuffer(container, ostream)
+      client.pager.drawBuffer(container, stdout)
       client.pager.handleEvents(container)
     except IOError:
       client.console.log("Error in buffer", $container.url)
diff --git a/src/local/pager.nim b/src/local/pager.nim
index c1bd18c0..e9e95895 100644
--- a/src/local/pager.nim
+++ b/src/local/pager.nim
@@ -5,7 +5,6 @@ import std/os
 import std/osproc
 import std/posix
 import std/selectors
-import std/streams
 import std/tables
 import std/unicode
 
@@ -416,11 +415,11 @@ proc showAlerts*(pager: Pager) =
       pager.inputBuffer == "" and pager.precnum == 0:
     pager.refreshStatusMsg()
 
-proc drawBuffer*(pager: Pager; container: Container; ostream: Stream) =
+proc drawBuffer*(pager: Pager; container: Container; ofile: File) =
   var format = Format()
   container.readLines(proc(line: SimpleFlexibleLine) =
     if line.formats.len == 0:
-      ostream.write(line.str & "\n")
+      ofile.write(line.str & "\n")
     else:
       var x = 0
       var w = 0
@@ -438,8 +437,8 @@ proc drawBuffer*(pager: Pager; container: Container; ostream: Stream) =
       if i < line.str.len:
         s &= pager.term.processOutputString(line.str.substr(i), w)
       s &= pager.term.processFormat(format, Format()) & "\n"
-      ostream.write(s))
-  ostream.flush()
+      ofile.write(s))
+  ofile.flushFile()
 
 proc redraw(pager: Pager) {.jsfunc.} =
   pager.redraw = true
@@ -787,8 +786,7 @@ proc runProcessCapture(cmd: string; outs: var string): bool =
   let file = popen(cmd, "r")
   if file == nil:
     return false
-  let fs = newFileStream(file)
-  outs = fs.readAll()
+  outs = file.readAll()
   let rv = pclose(file)
   if rv == -1:
     return false
@@ -799,8 +797,7 @@ proc runProcessInto(cmd, ins: string): bool =
   let file = popen(cmd, "w")
   if file == nil:
     return false
-  let fs = newFileStream(file)
-  fs.write(ins)
+  file.write(ins)
   let rv = pclose(file)
   if rv == -1:
     return false