unixcmd 0.1.0 → 0.2.1

data/lib/unixcmd/cmd.rb

@@ -1,17 +1,29 @@
+# encoding: UTF-8
+
+require 'thread'
+
+
 $accels = Gtk::AccelGroup.new
 
 $actMap = Hash.new
 
-require 'thread'
+$actMap['<unixcmd>/panel/reload'] = Proc.new { $wnd.curpanel.reload }
 
-#require_relative './copier.rb'
-#require_relative './copyctrl.rb'
-#require_relative './fileinfodlg.rb'
+$actMap['<unixcmd>/file/copy']   = Proc.new do
+  cmd_file_copy $wnd.curpanel.selection, $wnd.curpanel.path, $wnd.otherpanel.path
+end
 
-$actMap['<unixcmd>/panel/reload'] = Proc.new { $wnd.curpanel.reload }
+$actMap['<unixcmd>/file/move']   = Proc.new do
+  cmd_file_move $wnd.curpanel.selection, $wnd.curpanel.path, $wnd.otherpanel.path
+end
+
+$actMap['<unixcmd>/file/remove'] = Proc.new do
+  cmd_file_remove $wnd.curpanel.selection, $wnd.curpanel.path
+end
 
-$actMap['<unixcmd>/file/copy']   = Proc.new { cmd_file_copy $wnd.curpanel.selection, $wnd.curpanel.path, $wnd.otherpanel.path }
-$actMap['<unixcmd>/file/remove'] = Proc.new { cmd_file_remove $wnd.curpanel.selection }
+$actMap['<unixcmd>/file/mkdir'] = Proc.new do
+  cmd_file_mkdir $wnd.curpanel.path
+end
 
 $actMap['<unixcmd>/file/view'] = Proc.new { cmd_file_view $wnd.selected_file }
 $actMap['<unixcmd>/file/edit'] = Proc.new { cmd_file_edit $wnd.selected_file }
@@ -20,151 +32,145 @@ $actMap['<unixcmd>/file/info'] = Proc.new { cmd_file_info $wnd.selected_file }
 
 $actMap['<unixcmd>/app/quit']  = Proc.new { $wnd.destroy }
 
-$actMap['<unixcmd>/test/print_selection'] = Proc.new { p $wnd.curpanel.selection }
+$actMap['<unixcmd>/test/print_selection'] = Proc.new { p $wnd.curpanel.selection; $wnd.cmd "cd #{$wnd.curpanel.path.to_s}" }
 
 $actMap.each_key do |key|
   $accels.connect(key, &$actMap[key])
 end
 
-#module MyCopyModel
-#  include CopyModel
-#
-#  def cp(src, dst)
-#    return if src == dst
-#
-#    p [:cp, [src, dst]]
-#
-#    srcfile    = File.new src.expand_path, 'rb'
-#    dstfile    = File.new dst.expand_path, 'wb'
-#    copied_sum = 0
-#    size       = srcfile.stat.size
-#    block_size = $cfg['copy']['block_size'] 
-#    time_start = Time::now.to_f
-#    elapsed    = 0.0
-#
-#    begin 
-#      copied = IO::copy_stream srcfile, dstfile, block_size
-#      copied_sum += copied
-#
-#      view.file_progress copied_sum.to_f/size.to_f
-#
-#      elapsed = Time::now.to_f - time_start
-#      view.file_speed (copied_sum/elapsed).to_i if elapsed > 0
-#    end while copied > 0
-#
-#    nil
-#  end
-#
-#  def mkdir(path)
-#    p [:mkdir, [path]]
-#    path.mkdir
-#  end
-#end
-
-#module MyCopyView
-#  include CopyView
-#
-#  class << View
-#    @queue
-#
-#    def queue=(queue) @queue = queue end
-#
-#    def start() end
-#    def end() @queue.push [:end] end
-#
-#    def file_start(src, dst) @queue.push [:file_start, [src, dst]] end
-#
-#    def file_end() end
-#
-#    def file_progress(percent) @queue.push [:file_progress, [percent]] end
-#    def progress(percent) @queue.push [:progress, [percent]] end
-#    def dir_create(path) @queue.push [:dir_create, [path]] end
-#
-#    def file_speed(speed) @queue.push [:file_speed, [speed]] end
-#  end
-#end
+[ 'copydlg', 'removedlg', 'movedlg', 'mkdirdlg' ].each do |lib|
+  if Unixcmd.devel
+    require_relative "./#{lib}"
+  else
+    require lib
+  end
+end
 
 def cmd_file_copy(files, srcdir, dstdir)
-#  (dlg = CopyOptionsDlg.new files, srcdir, dstdir).run do |res|
-#  case res
-#    when Gtk::Dialog::RESPONSE_CANCEL, Gtk::Dialog::RESPONSE_DELETE_EVENT
-#      dlg.destroy
-#      return
-#    when Gtk::Dialog::RESPONSE_OK then dlg.destroy
-#    else
-#      raise ArgumentError, res.to_s
-#  end
-#  end
-#
-#  queue = Queue.new
-#
-#  copier = Copier.new dlg.files, dlg.src, dlg.dst, false, false
-#  copier.view = MyCopyView
-#  copier.model = MyCopyModel
-#  copier.view.queue = queue
-#
-#  dlg = CopyDlg.new
-#
-#  cpthread = Thread.new do
-#    begin
-#      copier.run
-#    rescue => err
-#      print 'error: '
-#      p err.hash[:type]
-#
-#      if err.hash[:type] == :not_exist
-#          p err.hash[:path]
-#          #err.hash[:stop] = true
-#      end
-#
-#      if err.hash[:type] == :srcdstdifftype
-#          p err.hash[:src]
-#          p err.hash[:dst]
-#          #err.hash[:stop] = true
-#      end
-#
-#      if err.hash[:type] == :access_denied
-#          p err.hash[:path]
-#          #err.hash[:stop] = true
-#      end
-#
-#      if err.hash[:type] == :exist
-#          p err.hash[:path]
-#          err.hash[:overwrite] = true if err.hash[:path].basename.to_s == '6'
-#          #err.hash[:stop] = true
-#      end
-#
-#      err.continue
-#    end
-#  end
-#
-#  cpthread.abort_on_exception = true
-#
-#  idle = Gtk.idle_add do
-#    if !queue.empty?
-#      call = queue.pop
-#      args = call[1]
-#
-#      dlg.dispatch_model_call call[0], args
-#    end
-#
-#    true
-#  end
-#
-#  dlg.run do |res|
-#    case res
-#      when Gtk::Dialog::RESPONSE_CANCEL then copy.stop
-#    end
-#  end
-#
-#  Gtk.idle_remove idle
-#  cpthread.join
-#  cpthread.exit
+  files_s = files.map do |file|
+    file.to_s
+  end
+
+  dlg = CopyDlg.new files_s, dstdir.to_s
+  res = dlg.run
+
+  flags = ''
+
+  flags << '-r ' if dlg.recursive?
+  flags << '-a ' if dlg.archive?
+  flags << '-v ' if dlg.verbose?
+  flags.strip!
+
+  dstdir = Pathname.new(dlg.dest)
+
+  unless res == 0
+    dlg.destroy
+    return
+  end
+
+  cpthread = Thread.new do
+    Dir.chdir(srcdir.expand_path.to_s) do
+      $wnd.cmd "cp #{flags} #{files_s.join ' '} #{dstdir.to_s}"
+    end
+  end
+
+  cpthread.abort_on_exception = true
+  cpthread.join
+  cpthread.exit
+
+  dlg.destroy
+end
+
+def cmd_file_move(files, srcdir, dstdir)
+  files_s = files.map do |file|
+    file.to_s
+  end
+
+  dlg = MoveDlg.new files_s, dstdir
+  res = dlg.run
+
+  flags = ''
+
+  flags << '-v ' if dlg.verbose?
+  flags.strip!
+
+  unless res == 0
+    dlg.destroy
+    return
+  end
+
+  mvthread = Thread.new do
+    Dir.chdir(srcdir.expand_path.to_s) do
+      puts $wnd.cmd "mv #{flags} #{files_s.join ' '} #{dstdir.to_s}"
+    end
+  end
+
+  mvthread.abort_on_exception = true
+  mvthread.join
+  mvthread.exit
+
+  dlg.destroy
 end
 
-def cmd_file_remove(files)
-  files.each do |file|
+def cmd_file_remove(files, dir)
+  files_s = files.map do |file|
+    file.to_s
+  end
+
+  dlg = RemoveDlg.new files_s
+  res = dlg.run
+
+  flags = ''
+
+  flags << '-r ' if dlg.recursive?
+  flags << '-v ' if dlg.verbose?
+  flags.strip!
+
+  unless res == 0
+    dlg.destroy
+    return
+  end
+
+  thread = Thread.new do
+    Dir.chdir(dir.expand_path.to_s) do
+      $wnd.cmd "rm #{flags} #{files_s.join ' '}"
+    end
   end
+
+  thread.abort_on_exception = true
+  thread.join
+  thread.exit
+
+  dlg.destroy
+end
+
+def cmd_file_mkdir(dir)
+  dlg = MkDirDlg.new
+  res = dlg.run
+
+  flags = ''
+
+  flags << '-v ' if dlg.verbose?
+  flags.strip!
+
+  dirname = dlg.dirname
+
+  unless res == 0
+    dlg.destroy
+    return
+  end
+
+  thread = Thread.new do
+    Dir.chdir(dir.expand_path.to_s) do
+      $wnd.cmd "mkdir #{flags} #{dirname}"
+    end
+  end
+
+  thread.abort_on_exception = true
+  thread.join
+  thread.exit
+
+  dlg.destroy
 end
 
 def cmd_file_view(file)

data/lib/unixcmd/copydlg.rb

@@ -0,0 +1,79 @@
+# encoding: UTF-8
+
+class CopyDlg
+  FILES_FEW = 3
+
+  @builder
+  @dlg
+  @srcline
+  @srclist
+  @dstline
+  @dstentry
+  @flags
+  @singlesrc
+  @fewsrc
+
+  def initialize files, dest
+    @builder = Gtk::Builder.new
+    @builder.add_from_file 'data/forms/copydlg.glade'
+    @dlg = @builder.get_object 'CopyDlg'
+    @srcline = @builder.get_object 'SrcLine'
+    @srclist = @builder.get_object 'SrcList'
+    @dstline = @builder.get_object 'DstLine'
+    @dstentry = @builder.get_object 'DstEntry'
+
+    @singlesrc = files.count == 1
+    @fewsrc = files.count <= FILES_FEW
+
+    unless @singlesrc == true
+      @dstline.text = dest
+    else
+      @dstentry.text = dest
+    end
+
+    unless @fewsrc == true
+      @srcline.hide
+      @srclist.show
+
+      files.each do |file|
+        row = @srclist.model.append
+        row[0] = file
+      end
+    else
+      @srcline.text = files.join ' '
+    end
+
+    @flags = {
+      :recursive => @builder.get_object('RecursiveFlag'),
+      :archive => @builder.get_object('ArchiveFlag'),
+      :verbose => @builder.get_object('VerboseFlag'),
+    }
+  end
+
+  def run
+    @dlg.run
+  end
+
+  def destroy
+    @dlg.destroy
+  end
+
+  def recursive?
+    @flags[:recursive].active?
+  end
+
+  def archive?
+    @flags[:archive].active?
+  end
+
+  def verbose?
+    @flags[:verbose].active?
+  end
+
+  def dest
+    @singlesrc == true ? @dstentry.text : @dstline.text
+  end
+end
+
+# vim: sw=2 sts=2 ts=8:
+

data/lib/unixcmd/devel.rb

@@ -0,0 +1 @@
+

data/lib/unixcmd/dirview.rb

@@ -1,6 +1,7 @@
 require 'launchy'
 require 'mime/types'
-require 'unixcmd/aux'
+
+require_relative './aux'
 
 
 class CmdDirWidget < Gtk::Frame
@@ -70,14 +71,14 @@ class CmdDirWidget < Gtk::Frame
     def path() @path end
     def expanded_path() @path.expand_path end
 
-    def back() chdir(@path + Pathname.new('..')) end
+    def back() chdir @path + '..' end
 
     def reload
         model = @view.model
 
         model.clear
 
-        @view.columns[0].set_visible(false)
+        @view.columns[0].set_visible false
 
         files = expanded_path.entries.sort 
 
@@ -97,17 +98,17 @@ class CmdDirWidget < Gtk::Frame
 
             row[0] = file.to_s
 
-            if full_path.directory? then
+            if full_path.directory?
                 row[1] = file.to_s + '/'
                 row[3] = '<DIR>'
             else
                 row[1] = file.basename('.*').to_s
-                row[3] = full_path.stat.size.to_i.to_szstr
+                row[3] = full_path.exist? ? full_path.size.to_i.to_szstr : 0.to_szstr
             end
 
             row[2] = file.extname
-            row[4] = Time.at(full_path.stat.mtime).strftime '%x %R'
-            row[5] = full_path.stat.mode.to_rwx
+            row[4] = Time.at(full_path.mtime).strftime '%x %R' if full_path.exist?
+            row[5] = full_path.stat.mode.to_rwx if full_path.exist?
             row[6] = Gdk::Pixbuf.new file_icon_path.to_s
             row[7] = 0
         end
@@ -121,7 +122,7 @@ class CmdDirWidget < Gtk::Frame
 
         file = iter.get_value 0
 
-        if (expanded_path + Pathname.new(file)).directory? then
+        if (expanded_path + Pathname.new(file)).directory?
             chdir @path + Pathname.new(file)
         else
             Launchy.open (expanded_path + Pathname.new(file)).to_s
@@ -136,11 +137,11 @@ class CmdDirWidget < Gtk::Frame
 
         reload
 
-        if path == old_path.parent then
+        if path == old_path.parent
             dirname = old_path.basename
 
             @view.model.each do |model, path, iter|
-                if iter.get_value(0) == dirname.to_s then
+                if iter.get_value(0) == dirname.to_s
                     @view.selection.select_path path
                     @view.set_cursor path, nil, false
                     break
@@ -149,7 +150,7 @@ class CmdDirWidget < Gtk::Frame
 
         end
 
-        if @view.selection.count_selected_rows == 0 then
+        if @view.selection.count_selected_rows == 0
             @view.selection.select_iter @view.model.iter_first
             @view.set_cursor @view.model.iter_first.path, nil, false
         end

data/lib/unixcmd/mkdirdlg.rb

@@ -0,0 +1,38 @@
+# encoding: UTF-8
+
+class MkDirDlg
+  @builder
+  @dlg
+  @mkdirentry
+  @flags
+
+  def initialize
+    @builder = Gtk::Builder.new
+    @builder.add_from_file 'data/forms/mkdirdlg.glade'
+    @dlg = @builder.get_object 'MkDirDlg'
+    @mkdirentry = @builder.get_object 'MkDirEntry'
+
+    @flags = {
+      :verbose => @builder.get_object('VerboseFlag'),
+    }
+  end
+
+  def run
+    @dlg.run
+  end
+
+  def destroy
+    @dlg.destroy
+  end
+
+  def verbose?
+    @flags[:verbose].active?
+  end
+
+  def dirname
+    @mkdirentry.text
+  end
+end
+
+# vim: sw=2 sts=2 ts=8:
+

data/lib/unixcmd/movedlg.rb

@@ -0,0 +1,36 @@
+# encoding: UTF-8
+
+class MoveDlg
+  @builder
+  @dlg
+  @cmdline
+  @flags
+
+  def initialize files, dest
+    @builder = Gtk::Builder.new
+    @builder.add_from_file 'data/forms/movedlg.glade'
+    @dlg = @builder.get_object 'MoveDlg'
+    @cmdline = @builder.get_object 'CmdLine'
+
+    @cmdline.text = "#{files.join ' '} → #{dest}"
+
+    @flags = {
+      :verbose => @builder.get_object('VerboseFlag'),
+    }
+  end
+
+  def run
+    @dlg.run
+  end
+
+  def destroy
+    @dlg.destroy
+  end
+
+  def verbose?
+    @flags[:verbose].active?
+  end
+end
+
+# vim: sw=2 sts=2 ts=8:
+

data/lib/unixcmd/panel.rb

@@ -1,5 +1,5 @@
 require 'sys/filesystem'
-require 'unixcmd/dirview'
+require_relative './dirview'
 
 class CmdPanelCaptionWidget < Gtk::HBox
     @mounts
@@ -108,7 +108,7 @@ class CmdPanelWidget < Gtk::VBox
         pack_start @caption, false
         pack_end @dir
 
-        @dir.signal_connect('dir-changed') { update_caption }
+        @dir.signal_connect('dir-changed') { update_caption; signal_emit 'dir-changed' }
         @caption.signal_connect('go-root') { @dir.chdir Pathname.new '/' }
         @caption.signal_connect('go-home') { @dir.chdir Pathname.new '~' }
         @caption.signal_connect('go-back') { @dir.back }
@@ -156,4 +156,10 @@ class CmdPanelWidget < Gtk::VBox
     def reload
         @dir.reload
     end
+
+    type_register
+
+    signal_new('dir_changed', GLib::Signal::RUN_FIRST, nil, nil)
+
+    def signal_do_dir_changed() nil end
 end

data/lib/unixcmd/removedlg.rb

@@ -0,0 +1,62 @@
+# encoding: UTF-8
+
+class RemoveDlg
+  FILES_FEW = 3
+  FILES_MANY = 5
+
+  @builder
+  @dlg
+  @filesline
+  @fileslist
+  @flags
+  @fewfiles
+
+  def initialize files
+    @builder = Gtk::Builder.new
+    @builder.add_from_file 'data/forms/removedlg.glade'
+    @dlg = @builder.get_object 'RemoveDlg'
+    @filesline = @builder.get_object 'FilesLine'
+    @fileslist = @builder.get_object 'FilesList'
+
+    @fewfiles = files.count <= FILES_FEW
+
+    unless @fewfiles == true
+      @fileslist.show
+      @filesline.hide
+
+      files.each_with_index do |file, i|
+        row = @fileslist.model.append
+        row[0] = file
+
+        # *TODO!* remove 110 magic number
+        @fileslist.set_height_request 110 if i+1 == FILES_MANY
+      end
+    else
+      @filesline.text = "#{files.join ' '}"
+    end
+
+    @flags = {
+      :recursive => @builder.get_object('RecursiveFlag'),
+      :verbose => @builder.get_object('VerboseFlag'),
+    }
+  end
+
+  def run
+    @dlg.run
+  end
+
+  def destroy
+    @dlg.destroy
+  end
+
+  def recursive?
+    @flags[:recursive].active?
+  end
+
+  def verbose?
+    @flags[:verbose].active?
+  end
+end
+
+# vim: sw=2 sts=2 ts=8:
+

data/lib/unixcmd/version.rb

@@ -1,2 +1,2 @@
-APP_NAME = 'UNIX Commander'
-APP_VERSION = '0.1'
+APP_NAME = 'unixcmd'
+APP_VERSION = '0.2.1'