diff options
| -rw-r--r-- | controllers/interfaces/repl.rb | 25 | ||||
| -rw-r--r-- | controllers/session.rb | 16 | ||||
| -rw-r--r-- | static/cartridges/default.yml | 2 |
3 files changed, 16 insertions, 27 deletions
diff --git a/controllers/interfaces/repl.rb b/controllers/interfaces/repl.rb index 9415674..ee6234b 100644 --- a/controllers/interfaces/repl.rb +++ b/controllers/interfaces/repl.rb @@ -4,19 +4,20 @@ require 'pry' require 'rainbow' require_relative '../../logic/helpers/hash' +require_relative '../../logic/cartridge/affixes' module NanoBot module Controllers module Interfaces module REPL def self.start(cartridge, session) - prefix = build_prefix(cartridge) - postfix = build_postfix(cartridge) + prefix = Logic::Cartridge::Affixes.get(cartridge, :repl, :output, :prefix) + suffix = Logic::Cartridge::Affixes.get(cartridge, :repl, :output, :suffix) if Logic::Helpers::Hash.fetch(cartridge, %i[behaviors boot instruction]) session.print(prefix) unless prefix.nil? session.boot(mode: 'repl') - session.print(postfix) unless postfix.nil? + session.print(suffix) unless suffix.nil? session.print("\n") end @@ -29,9 +30,9 @@ module NanoBot ) Pry.commands.block_command(/(.*)/, 'handler') do |line| - session.print(postfix) unless postfix.nil? + session.print(prefix) unless prefix.nil? session.evaluate_and_print(line, mode: 'repl') - session.print(postfix) unless postfix.nil? + session.print(suffix) unless suffix.nil? session.print("\n") session.flush end @@ -39,20 +40,6 @@ module NanoBot Pry.start end - def self.build_prefix(cartridge) - repl = Logic::Helpers::Hash.fetch(cartridge, %i[interfaces repl]) - return "\n" if repl.nil? || !repl.key?(:prefix) # default - - repl[:prefix] - end - - def self.build_postfix(cartridge) - repl = Logic::Helpers::Hash.fetch(cartridge, %i[interfaces repl]) - return "\n" if repl.nil? || !repl.key?(:postfix) # default - - repl[:postfix] - end - def self.build_prompt(prompt) result = '' diff --git a/controllers/session.rb b/controllers/session.rb index d61fdd5..3d5d707 100644 --- a/controllers/session.rb +++ b/controllers/session.rb @@ -82,17 +82,19 @@ module NanoBot ready = false @provider.evaluate(input) do |output, finished| - output = Logic::Cartridge::Interaction.output( - @cartridge, mode.to_sym, output, streaming, finished - ) - - output[:message] = Components::Adapter.apply(:output, output[:message]) - updated_at = Time.now if finished - @state[:history] << output + @state[:history] << Marshal.load(Marshal.dump(output)) + + output = Logic::Cartridge::Interaction.output( + @cartridge, mode.to_sym, output, streaming, finished + ) + + output[:message] = Components::Adapter.apply(:output, output[:message]) + self.print(output[:message]) unless streaming + ready = true flush elsif streaming diff --git a/static/cartridges/default.yml b/static/cartridges/default.yml index df609ed..9a89a4b 100644 --- a/static/cartridges/default.yml +++ b/static/cartridges/default.yml @@ -2,9 +2,9 @@ interfaces: repl: output: + stream: true suffix: "\n" prefix: "\n" - stream: true prompt: - text: '🤖' - text: '> ' |