vimamsa 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97397b2b0eb7e2d07c23e67d4c9cebeec0df6925f43a70b2d42ad87d2f5383fb
-  data.tar.gz: fe0040694d69b1b860d942fb7cf3bea5fc671ba482b72a991f4d8f6d0031524c
+  metadata.gz: 9bd13f53f2d774550226da6e379842c2d54bde6e8ffa5362d4769940d93a033e
+  data.tar.gz: 5f2db7ad2c5402a816f186e266194f1a7545b1a2a71fd532f9140634835fc3f2
 SHA512:
-  metadata.gz: 749aa7833a6db40dc85620884f2e7be97c3d54b4e681f96255f54aa1a76148d80640f78e194f3b688e80f770c4afedbba9c096ac58a56da455102fc2ece4bcec
-  data.tar.gz: 74df362a22e70517ababecf5a61d29cc5655147f3c163764d264febfb83fa8b65182cb0f2cfc92e26e157ed3e2618c03c53f06c0d73ba5c06a18a4aa4b162201
+  metadata.gz: d41917d0e0cfa9a876579bea6aaaafee3b3eff3757d74c399922a5db71220889f278df03bd1bc3e1177002fa906e3d30792280004dd5270d2b135dd6006f51ca
+  data.tar.gz: c4935e09ecb5a714cb481ac00386e698aee72583030f03cf9b7c182c71066513339c2c0c4aa6f723e00630e659704e95a107007a76af936d08e67a8e6ded5c5f

data/exe/vimamsa

@@ -1,12 +1,9 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 require "ripl/multi_line"
 require "tempfile"
 # Ripl.config[:multi_line_prompt] = ' > '
 require "pathname"
 
-ENV["GTK_THEME"] = "Adwaita:dark"
-# ENV["GTK_THEME"] = "Adwaita:light"
-
 selfpath = __FILE__
 selfpath = File.readlink(selfpath) if File.lstat(selfpath).symlink?
 scriptdir = File.expand_path(File.dirname(selfpath) + "/..")

data/lib/vimamsa/ack.rb

@@ -111,14 +111,15 @@ Will search the following directories:
   gui_one_input_action(nfo, "Search:", "search", callback)
 end
 
-def ack_buffer(instr, b = nil)
-  instr = Shellwords.escape(instr)
+def ack_buffer(_instr, b = nil)
+  instr = Shellwords.escape(_instr)
   bufstr = ""
   for path in vma.get_content_search_paths
     bufstr += run_cmd("ack -Q --type-add=gd=.gd -ki --nohtml --nojs --nojson #{instr} #{path}")
   end
   if bufstr.size > 5
-  create_new_buffer(bufstr,"ack")
+  b = create_new_buffer(bufstr,"ack")
+  highlight_match(b, _instr, color: "#10bd8e")
   else
     message("No results for input:#{instr}")
   end

data/lib/vimamsa/actions.rb

@@ -32,11 +32,14 @@ def missing_callfunc
 end
 
 #TODO: remove
-def call(id)
-  call_action(id)
-end
+# def call(id)
+  # call_action(id)
+# end
+
+$acth = []
 
 def call_action(id)
+  $acth << id
   a = $actions[id]
   if a
     a.method.call()
@@ -45,11 +48,15 @@ def call_action(id)
   end
 end
 
+def last_action
+  return $acth[-1]
+end
+
 def search_actions()
   l = []
-  opt = { :title => "Search actions.", :desc => "Fuzzy search for actions. <up> or <down> to change selcted. <enter> to select current." }
+  opt = { :title => "Search for actions", :desc => "Fuzzy search for actions. <up> or <down> to change selcted. <enter> to select current." }
   $select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
-  
+
   gui_select_update_window(l, $select_keys.collect { |x| x.upcase },
                            "search_actions_select_callback",
                            "search_actions_update_callback",
@@ -109,7 +116,7 @@ def search_actions_select_callback(search_str, idx)
     eval(acc)
   elsif acc.class == Symbol
     debug "Symbol"
-    call(acc)
+    call_action(acc)
   end
 end
 

data/lib/vimamsa/audio.rb

@@ -0,0 +1,58 @@
+require "gstreamer"
+
+# following the example gstreamer-4.2.0/sample/helloworld_e.rb
+class Audio
+  @@playbin = nil
+
+  def self.stop
+    @@playbin.stop if !@@playbin.nil?
+  end
+
+  def self.play(fn)
+    playbin = @@playbin
+    if playbin.nil?
+      playbin = Gst::ElementFactory.make("playbin")
+      if playbin.nil?
+        puts "'playbin' gstreamer plugin missing"
+        return
+      end
+    else
+      if playbin.current_state == "playing"
+        playbin.stop # Stop previous play
+      end
+    end
+
+    # playbin.volume
+    # playbin.volume=1.0
+    # playbin.stream_time
+    # playbin.current_state
+
+    # take the commandline argument and ensure that it is a uri
+    if Gst.valid_uri?(fn)
+      uri = fn
+    else
+      uri = Gst.filename_to_uri(fn)
+    end
+    playbin.uri = uri
+    @@playbin = playbin
+
+    bus = playbin.bus
+    bus.add_watch do |bus, message|
+
+      case message.type
+      when Gst::MessageType::EOS
+        puts "End-of-stream"
+      when Gst::MessageType::ERROR
+        error, debug = message.parse_error
+        puts "Debugging info: #{debug || "none"}"
+        puts "Error: #{error.message}"
+      end
+      true
+    end
+
+    message("Start playing audio: #{fn}")
+
+    # start play back and listed to events
+    playbin.play
+  end
+end

data/lib/vimamsa/buffer.rb

@@ -5,7 +5,6 @@ require "pathname"
 require "openssl"
 require "ripl/multi_line"
 
-$paste_lines = false
 $buffer_history = []
 
 $update_highlight = false
@@ -13,10 +12,9 @@ $update_highlight = false
 $ifuncon = false
 
 class Buffer < String
-
   attr_reader :pos, :lpos, :cpos, :deltas, :edit_history, :fname, :call_func, :pathname, :basename, :dirname, :update_highlight, :marks, :is_highlighted, :syntax_detect_failed, :id, :lang, :images, :last_save
   attr_writer :call_func, :update_highlight
-  attr_accessor :gui_update_highlight, :update_hl_startpos, :update_hl_endpos, :hl_queue, :syntax_parser, :highlights, :gui_reset_highlight, :is_parsing_syntax, :line_ends, :bt, :line_action_handler, :module, :active_kbd_mode, :title, :subtitle
+  attr_accessor :gui_update_highlight, :update_hl_startpos, :update_hl_endpos, :hl_queue, :syntax_parser, :highlights, :gui_reset_highlight, :is_parsing_syntax, :line_ends, :bt, :line_action_handler, :module, :active_kbd_mode, :title, :subtitle, :paste_lines
 
   @@num_buffers = 0
 
@@ -33,6 +31,9 @@ class Buffer < String
     gui_create_buffer(@id, self)
     debug "NEW BUFFER fn=#{fname} ID:#{@id}"
 
+    # If true, we will create new line after this and paste there
+    @paste_lines = false
+
     @module = nil
 
     @last_save = @last_asked_from_user = @file_last_cheked = Time.now
@@ -207,9 +208,7 @@ class Buffer < String
     # If this is done too early, the gutter is not yet drawn which
     # will result in wrong position
     if @audiofiles.size == 1
-      Thread.new {
-        GLib::Idle.add(proc { self.reset_audio_widget_positions })
-      }
+      run_as_idle proc { self.reset_audio_widget_positions }
     end
     $audiof = mf
   end
@@ -401,7 +400,6 @@ class Buffer < String
     gui_set_buffer_contents(@id, self.to_s)
     @images = [] #TODO: if reload
     hpt_scan_images(self)
-    hpt_scan_audio(self)
 
     # add_hl_update(@update_hl_startpos, @update_hl_endpos)
   end
@@ -806,7 +804,7 @@ class Buffer < String
   end
 
   def copy(range_id)
-    $paste_lines = false
+    @paste_lines = false
     debug "range_id: #{range_id}"
     debug range_id.inspect
     range = get_range(range_id)
@@ -969,9 +967,14 @@ class Buffer < String
     set_line_and_column_pos(nil, nil)
   end
 
-  def delete2(range_id)
-    $paste_lines = false
-    range = get_range(range_id)
+  def delete2(range_id, mark = nil)
+    # if mark != nil
+    # debug mark, 2
+    # return
+    # end
+
+    @paste_lines = false
+    range = get_range(range_id, mark: mark)
     return if range == nil
     debug "RANGE"
     debug range.inspect
@@ -983,7 +986,7 @@ class Buffer < String
   end
 
   def delete(op, x = nil)
-    $paste_lines = false
+    @paste_lines = false
     # Delete selection
     if op == SELECTION && visual_mode?
       (startpos, endpos) = get_visual_mode_range2
@@ -1031,7 +1034,7 @@ class Buffer < String
   end
 
   # Ranges to use in delete or copy operations
-  def get_range(range_id)
+  def get_range(range_id, mark: nil)
     range = nil
     if range_id == :to_word_end
       # TODO: better way to make the search than + 150 from current position
@@ -1048,6 +1051,16 @@ class Buffer < String
         range = get_range(:to_word_end)
       end
       # Ripl.start :binding => binding
+
+    elsif range_id == :to_mark
+      debug "TO MARK"
+      start = @line_ends[@lpos]
+      mpos = @marks[mark]
+      if !mpos.nil?
+        range = start..mpos
+      else
+        return nil
+      end
     elsif range_id == :to_line_end
       debug "TO LINE END"
       range = @pos..(@line_ends[@lpos] - 1)
@@ -1071,15 +1084,18 @@ class Buffer < String
     end
     return range if range == nil
     if range.last < range.first
-      range.last = range.first
+      range = range.last..range.first
+      # range.last = range.first
     end
     if range.first < 0
-      range.first = 0
+      # range.first = 0
+      range = 0..range.last
     end
     if range.last >= self.size
-      range.last = self.size - 1
+      # range.last = self.size - 1
+      range = range.first..(self.size - 1)
     end
-    #TODO: sanity check
+    debug range, 2
     return range
   end
 
@@ -1490,6 +1506,10 @@ class Buffer < String
   end
 
   def insert_txt_at(c, pos)
+    if c.nil? or pos.nil?
+      error("input c=nil || pos=nil")
+      return
+    end
     c = c.force_encoding("UTF-8");  #TODO:correct?
     c = "\n" if c == "\r"
     add_delta([pos, INSERT, c.size, c], true)
@@ -1611,26 +1631,32 @@ class Buffer < String
     @clipboard_paste_running = true
     clipboard = vma.gui.window.display.clipboard
     clipboard.read_text_async do |_clipboard, result|
-      text = clipboard.read_text_finish(result)
-      paste_finish(text, at, register)
+      begin
+        text = clipboard.read_text_finish(result)
+      rescue Gio::IOError::NotSupported
+        # Happens when pasting from KeePassX and clipboard cleared
+        debug Gio::IOError::NotSupported
+      else
+        paste_finish(text, at, register)
+      end
     end
   end
 
   def paste_finish(text, at, register)
-    # if text == ""
-    # return if !$clipboard.any?
-    # if register == nil
-    # text = $clipboard[-1]
-    # else
-    # text = $register[register]
-    # end
-    # end
     debug "PASTE: #{text}"
+
+    # If we did not put this text to clipboard
+    if text != $clipboard[-1]
+      @paste_lines = false
+    end
+
+    text = sanitize_input(text)
+
     $clipboard << text
 
     return if text == ""
 
-    if $paste_lines
+    if @paste_lines
       debug "PASTE LINES"
       put_to_new_next_line(text)
     else
@@ -1672,7 +1698,7 @@ class Buffer < String
     add_delta([lrange.begin, DELETE, lrange.end - lrange.begin + 1], true)
     set_clipboard(s)
     update_pos(lrange.begin)
-    $paste_lines = true
+    @paste_lines = true
     #recalc_line_ends
   end
 
@@ -1689,7 +1715,7 @@ class Buffer < String
 
   def copy_active_selection(x = nil)
     debug "!COPY SELECTION"
-    $paste_lines = false
+    @paste_lines = false
     return if !@visual_mode
 
     debug "COPY SELECTION"
@@ -1769,7 +1795,7 @@ class Buffer < String
       debug "copy num_lines:#{num_lines}"
     end
     set_clipboard(self[line_range(@lpos, num_lines)])
-    $paste_lines = true
+    @paste_lines = true
   end
 
   def put_file_path_to_clipboard
@@ -1789,6 +1815,7 @@ class Buffer < String
   end
 
   def end_visual_mode()
+    return if !visual_mode?
     debug "End visual mode"
     #TODO:take previous mode (insert|command) from stack?
     $kbd.set_mode(:command)
@@ -2028,7 +2055,7 @@ class Buffer < String
   end
 end
 
-#TODO
+#TODO: function not used
 def write_to_file(savepath, s)
   if is_path_writable(savepath)
     IO.write(savepath, self.to_s)

data/lib/vimamsa/buffer_manager.rb

@@ -15,6 +15,7 @@ class BufferManager
 
     bindkey "bmgr enter", :bmgr_select
     bindkey "bmgr c", :bmgr_close
+    bindkey "bmgr x", :close_current_buffer
   end
 
   def initialize()
@@ -60,7 +61,7 @@ class BufferManager
     @@cur = self
     @header = []
     @header << "Current buffers:"
-    @header << "keys: <enter> to select, <c> to close buffer"
+    @header << "keys: <enter> to select, <c> to close buffer, <x> exit"
     @header << "=" * 40
 
     s = ""

data/lib/vimamsa/easy_jump.rb

@@ -72,7 +72,7 @@ class EasyJump
       # @kbd.set_mode(:command)
       vma.kbd.remove_keyhandling_override
       @jump_sequence = []
-      vma.gui.clear_overlay()
+      vma.gui.clear_overlay
     end
     return true
   end

data/lib/vimamsa/editor.rb

@@ -26,10 +26,6 @@ def handle_drag_and_drop(fname)
   buf.handle_drag_and_drop(fname)
 end
 
-def mkdir_if_not_exists(_dirpath)
-  dirpath = File.expand_path(_dirpath)
-  Dir.mkdir(dirpath) unless File.exist?(dirpath)
-end
 
 class Editor
   attr_reader :file_content_search_paths, :file_name_search_paths, :gui, :hook, :macro
@@ -49,6 +45,7 @@ class Editor
     @converters = {}
     @paint_stack = []
     @_plugins = {}
+    @errors
   end
 
   def open_file_listener(added)
@@ -96,7 +93,7 @@ class Editor
 
     FileManager.init
     BufferManager.init
-    
+
     @gui.init_menu
 
     mkdir_if_not_exists("~/.vimamsa")
@@ -135,10 +132,11 @@ class Editor
 
     if conf(:enable_lsp)
       require "vimamsa/langservp"
+      require "vimamsa/audio" # TODO:config
       @langsrv["ruby"] = LangSrv.new("ruby")
       @langsrv["cpp"] = LangSrv.new("cpp")
     end
-
+    
     # build_options
 
     fname = nil
@@ -169,7 +167,6 @@ class Editor
     #Load plugins
     require "vimamsa/file_history.rb"
     @fh = FileHistory.new
-    # @_plugins[:FileFinder] = FileFinder.new
     @_plugins[:FileHistory] = @fh
 
     register_plugin(:FileHistory, @fh)
@@ -282,6 +279,11 @@ class Editor
     debug "CAN OPEN?: #{can_open}"
     return can_open
   end
+
+  def error(message)
+    debug "ERORR #{caller[0]} #{str}", 2
+    @errors << [message, caller]
+  end
 end
 
 def _quit()
@@ -389,7 +391,7 @@ def show_key_bindings()
   kbd_s << vma.kbd.to_s
   kbd_s << "\n"
   kbd_s << "===============================================\n"
-  b = create_new_file(nil, kbd_s)
+  b = create_new_buffer(kbd_s, "key-bindings")
   gui_set_file_lang(b.id, "hyperplaintext")
   #
 end
@@ -456,6 +458,11 @@ def minibuffer_delete()
   $minibuffer.delete(BACKWARD_CHAR)
 end
 
+def error(str)
+  puts caller[0]
+  debug "#{caller[0]} ERROR: #{str}", 2
+end
+
 def message(s)
   s = "[#{DateTime.now().strftime("%H:%M")}] #{s}"
   debug s
@@ -502,18 +509,18 @@ def create_new_file(filename = nil, file_contents = "\n")
   vma.kbd.set_mode_to_default
   vma.buffers.set_current_buffer_by_id(buffer.id)
 
-  # Do set_content twice (once in Buffer.new) to force redraw and work around a bug 
+  # Do set_content twice (once in Buffer.new) to force redraw and work around a bug
   # The bug: if switching a child of scrolledWindow to a textview with a file smaller than the window, it won't get drawn properly if in previous (larger) file the ScrolledWindow was scrolled down.
   buffer.set_content(file_contents)
 
   return buffer
 end
 
-def create_new_buffer(file_contents = "\n",prefix="buf")
+def create_new_buffer(file_contents = "\n", prefix = "buf", setcurrent = true)
   debug "NEW BUFFER CREATED"
-  buffer = Buffer.new(file_contents,nil,prefix)
+  buffer = Buffer.new(file_contents, nil, prefix)
   vma.buffers.add(buffer)
-  vma.buffers.set_current_buffer_by_id(buffer.id)
+  vma.buffers.set_current_buffer_by_id(buffer.id) if setcurrent
   buffer.set_content(file_contents)
 
   return buffer
@@ -585,6 +592,10 @@ def open_new_file(filename, file_contents = "")
     message "Switching to: #{filename}"
     vma.buffers.set_current_buffer(b)
   else
+    if !is_path_writable(filename)
+      message("Path #{filename} cannot be written to")
+      return false
+    end
     message "New file opened: #{filename}"
     fname = filename
     bf = load_buffer(fname)
@@ -622,45 +633,7 @@ def get_file_line_pointer(s)
   return nil
 end
 
-def open_url(url)
-  system("xdg-open", url)
-end
-
-def open_with_default_program(url)
-  system("xdg-open", url)
-end
-
-def run_cmd(cmd)
-  tmpf = Tempfile.new("vmarun", "/tmp").path
-  cmd = "#{cmd} > #{tmpf}"
-  debug "CMD:\n#{cmd}"
-  system("bash", "-c", cmd)
-  res_str = File.read(tmpf)
-  return res_str
-end
-
-require "open3"
-
-def exec_cmd(bin_name, arg1 = nil, arg2 = nil, arg3 = nil, arg4 = nil, arg5 = nil)
-  assert_binary_exists(bin_name)
-  if !arg5.nil?
-    p = Open3.popen2(bin_name, arg1, arg2, arg3, arg4, arg5)
-  elsif !arg4.nil?
-    p = Open3.popen2(bin_name, arg1, arg2, arg3, arg4)
-  elsif !arg3.nil?
-    p = Open3.popen2(bin_name, arg1, arg2, arg3)
-  elsif !arg2.nil?
-    p = Open3.popen2(bin_name, arg1, arg2)
-  elsif !arg1.nil?
-    p = Open3.popen2(bin_name, arg1)
-  else
-    p = Open3.popen2(bin_name)
-  end
-
-  ret_str = p[1].read
-  return ret_str
-end
-
+# TODO: Implement using https://github.com/blackwinter/ruby-filemagic
 def file_is_text_file(fpath)
   debug "file_is_text_file(#{fpath})"
   fpath = File.expand_path(fpath)

data/lib/vimamsa/file_finder.rb

@@ -15,12 +15,12 @@ class FileFinder
 
   def initialize()
     vma.hook.register(:shutdown, self.method("save"))
-    @dir_list = vma.marshal_load("file_index")
+    @@dir_list = vma.marshal_load("file_index")
   end
 
   def save()
    debug "SAVE FILE INDEX", 2
-    vma.marshal_save("file_index", @dir_list)
+    vma.marshal_save("file_index", @@dir_list)
   end
 
   def start_gui()
@@ -30,7 +30,7 @@ class FileFinder
     end
     l = []
     $select_keys = ["h", "l", "f", "d", "s", "a", "g", "z"]
-    if @dir_list == nil
+    if @@dir_list == nil
       Thread.new { FileFinder.recursively_find_files() }
     end
 
@@ -71,16 +71,16 @@ class FileFinder
       debug("FIND FILEs IN #{d}")
       dlist = dlist + Dir.glob("#{d}/**/*").select { |e| File.file?(e) and $find_extensions.include?(File.extname(e)) }
       debug("FIND FILEs IN #{d} END")
-    end   #@dir_list = Dir.glob('./**/*').select { |e| File.file? e }
-    debug("END find files2")
-    @dir_list = dlist
+    end
+    @@dir_list = dlist
     debug("END find files")
-    return @dir_list
+    return @@dir_list
   end
 
   def filter_files(search_str)
     dir_hash = {}
-    scores = Parallel.map(@dir_list, in_threads: 8) do |file|
+
+    scores = Parallel.map(@@dir_list, in_threads: 8) do |file|
       [file, srn_dst(search_str, file)]
     end
     for s in scores