Add filtering

Author: ianb

static/commands.coffee

@@ -1,5 +1,3 @@
-commands = window.commands = {}
-
 class CommandSet
 
   constructor: ->
@@ -23,19 +21,17 @@ class CommandSet
   add: (name, func) ->
     this.commands[name] = func
 
-  addFilter: (type, name, matchFunc, obj) ->
-    if not (type of this.filters)
-      this.filters[type] = {}
-    if not (name of this.filters[type])
-      this.filters[type][name] = []
-    this.filters[type][name].push([matchFunc, obj])
+  addFilter: (name, matchFunc, obj) ->
+    if not (name of this.filters)
+      this.filters[name] = []
+    this.filters[name].push([matchFunc, obj])
 
-  match: (type, name, thing) ->
+  match: (name, thing) ->
     result = []
     for matchName in [name, '*']
-      if this.filters[type][matchName]
-        for matchFunc, obj in this.filters[type][matchName]
-          if not matchFunc or matchFunc(thing)
+      if this.filters[matchName]
+        for [matchFunc, obj] in this.filters[matchName]
+          if (not matchFunc?) or matchFunc(thing)
             result.push(obj)
     return result
 
@@ -80,18 +76,45 @@ commandSet.add '', (command, outputer, console) ->
   outputer(code: 0)
 
 
-commandSet.addFilter 'output', 'ls', null, {
+commandSet.addFilter 'ls', null, {
     complete: false,
     filterStdout: (callback, command, data) ->
       lines = data.split(/\n/)
-      result = $('<span></span>')
       for line in lines
-        a = $('<a></a>')
-        a.attr('href', command.cwd + '/' + line)
-        a.text(line)
-        a.addClass('file')
-        result.append(a)
-      callback(result)
+        if not line
+          continue
+        result = $('<span class="file"></span>')
+        parts = parseLs(line)
+        result.attr(parts)
+        result.text(parts.filename)
+        callback(result)
+        callback($('<br>'))
+    changeCommand: (command) ->
+      command.args.push('-l')
   }
 
+getMatch = (regex, line) ->
+  m = regex.exec(line)
+  if m
+    rest = line.substr(m.index + m[0].length)
+    rest = rest.replace(/^\s+/, '')
+    return [m[0], rest]
+  else
+    return [null, line]
+
+parseLs = (line) ->
+  results = {}
+  [results.perms, rest] = getMatch(/[drwx-]+/, line)
+  [huh, rest] = getMatch(/\d+/, rest)
+  [results.user, rest] = getMatch(/[a-zA-Z][a-zA-Z0-9_-]*/, rest)
+  [results.group, rest] = getMatch(/[a-zA-Z][a-zA-Z0-9_-]*/, rest)
+  [results.size, rest] = getMatch(/[0-9]+[MKG]?/, rest)
+  [results.date, rest] = getMatch(/\d\d\d\d-\d\d-\d\d/, rest)
+  [results.time, rest] = getMatch(/\d\d:\d\d/, rest)
+  if rest.search(/->/) != -1
+    m = /^(.*)\s+->\s+(.*)$/.exec(rest)
+    results.symlink = m[1]
+    rest = m[2]
+  results.filename = rest
+  return results
 

static/commands.js

@@ -10,6 +10,8 @@ $( () ->
       mainConsole.focus()
     )
 
+  $('.file').live('click', expandFile);
+
 )
 
 processEnv = null
@@ -187,7 +189,8 @@ class Console
       return result
 
   clearConsole: ->
-    $('.command-set, .incomplete-command-set', this.el).remove()
+    #$('.command-set, .incomplete-command-set', this.el).remove()
+    $('.output', this.el).html('')
     this.scroller.reinitialise()
     this.scroller.scrollToBottom()
     this.persist()
@@ -225,6 +228,8 @@ class Console
       # alt-R
       return false
 
+  commandRegistry: {}
+
   runInputCommand: ->
     inputEl = $('input.input', this.el)
     input = inputEl.val()
@@ -248,6 +253,13 @@ class Console
         this.writeEl(div)
         parts = node.toArgsNoInterpolate()
         command = new Command(parts[0], parts[1...], this.cwd(), this.env())
+        this.commandRegistry[sym] = command
+        filters = commandSet.match(command.command, command)
+        if filters.length
+          for filter in filters
+            if filter.changeCommand
+              ## FIXME: should be asyncable
+              filter.changeCommand(command)
         command.runCommand(
           callback: this.boundReceiver,
           id: this.callbackId + '.' + sym,
@@ -314,6 +326,7 @@ class Console
     p.save('history', this.history)
     p.save('cwd', this.cwd())
     p.save('env', this.env())
+    p.save('genSym', genSym.counter)
 
   restore: ->
     p = this.persister
@@ -324,29 +337,57 @@ class Console
     this.scroller.reinitialise()
     this.scroller.scrollToBottom()
     this.persistRestored = true
+    c = p.get('genSym', 0)
+    if c > genSym.counter
+      genSym.counter = c
 
   dataReceived: (id, data) ->
     console.log 'data', id, data
+    command = this.commandRegistry[id]
+    if command
+      filters = commandSet.match(command.command, command)
+    else
+      filters = []
     if data.stdout? or data.stderr?
       if data.stdout?
         cls = 'stdout'
       else
         cls = 'stderr'
-      this.write(data.stdout || data.stderr, cls, id)
+      matched = false
+      if filters.length
+        for filter in filters
+          ## FIXME: check for .complete
+          if data.stdout and filter.filterStdout
+            filter.filterStdout(((el) =>
+                this.writeEl(el, id)
+              ),
+              command,
+              data.stdout)
+            matched = true
+            break
+          if data.stderr and filter.filterStderr
+            filter.filterStderr(((el) =>
+                this.writeEl(el)
+              ),
+              command,
+              data.stderr)
+            matched = true
+            break
+      if not matched
+        this.write(data.stdout || data.stderr, cls, id)
       # Ignore the other stuff
     if data.code? and id
       el = $('#' + id, this.el)
       el.removeClass('incomplete-command-set')
       el.addClass('command-set')
       el = $('.cmd', el)
-      if el.attr('title').search(/pid/) != -1
+      if (el.attr('title') || '').search(/pid/) != -1
         title = el.attr('title')
         title = title.replace(/pid\:\s*\d+\s*/, '')
         el.attr('title', title)
       this.persistSoon()
     if data.pid? and id
       el = $('.cmd', $('#' + id, this.el))
-      console.log 'el', el
       el.attr(title: 'pid: ' + data.pid + ' ' + el.attr('title'))
 
 expandWildcard = (callback, pattern, cwd, env) ->
@@ -368,7 +409,6 @@ expandWildcard = (callback, pattern, cwd, env) ->
   command.getOutput(
     ((stdout, stderr) ->
       files = stdout.split('\u0000')
-      console.log 'result', stdout, files
       doc = new Node('span')
       for file in files
         if file.substr(0, 2) == './'
@@ -425,3 +465,7 @@ class Persister
       return JSON.parse(v)
     else
       return defaultValue
+
+expandFile = (event) ->
+  ## FIXME: expand to show some more info
+  $(event.target).css("background-color": "#f00")