mireru 0.2.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ebe6191f01182968abdb9fdfb6b3e9f409e7a34
-  data.tar.gz: d64056047895dbf66885ce81b2fdb10ed1a7e905
+  metadata.gz: fdbbb02cb56552275b740544a7156e7b155bd126
+  data.tar.gz: efb1f67b291ec5733cf9499f6ca71cb4969251cd
 SHA512:
-  metadata.gz: a03ed7b019779753b3eddb07bed3aecc9a4f30cbd96665838909ef1ed3c393d4d81fb91063ccbbcaa5d30c7c571620b5586c076deec62c2cb1fe655b98cc34d2
-  data.tar.gz: 24dd3afe0d6f16091a384cc08db23eeae127daa84ec7b90a69df998bbb31570b9ef2552d00f65197ba74396174f9042c360ec8fb468ac3f453f56ce089523ac0
+  metadata.gz: d73f9d68826bb2dc43fa3a9719e1b1d053bfe119a33c194660c26dfbdb7223ebfd5a3b6a292239a6f30e4841066ec552313be858edc719d72e10dba6e09a970d
+  data.tar.gz: 55021cc099d4abef5652d11fef73e72cd170dd71c1b29291c90bfa7e1b0c9f0df4f406b3c174e9aa8f69089edb5e79734a0a216bed20523a2d479046622c02fa

data/NEWS.md

@@ -1,5 +1,26 @@
 # NEWS
 
+## 0.9.0: 2014-07-13
+
+Now we have TreeView, and many problems are resolved.
+
+### Changes
+
+  * Improvements
+    * Improve scrolling movements.
+    * Save CPU and memory for distinction between text and binary.
+    * Improve help messages.
+    * Remove thumbnail function.
+    * pdf: Support multiple pages.
+    * Fit a parent widget (PDF, SVG and Video).
+    * Support music files.
+    * Add key bindings.
+    * Introduce Navigator as Gtk::TreeView.
+
+  * Fixes
+    * image: Enable animation for image files such as animated GIF.
+    * video: Fix a bug that destroyed object is called.
+
 ## 0.2.1: 2014-05-29
 
 ### Changes

data/README.md

@@ -1,13 +1,13 @@
 # Mireru [![Build Status](https://secure.travis-ci.org/myokoym/mireru.png?branch=master)](http://travis-ci.org/myokoym/mireru)
 
-A file viewer with a focus on flexibility by Ruby/GTK3.
+Mireru is a keyboard friendly file viewer by Ruby/GTK3.
 
-A friend of a keyboard.
+It can handle a variety of file types (Picture, Text, PDF, Video and etc.).
 
 ## Requirements
 
-* Ruby/GTK3, Ruby/GtkSourceView3, Ruby/ClutterGTK, Ruby/ClutterGStreamer
-  , Ruby/Poppler and Ruby/RSVG2 in
+* Ruby/GTK3, Ruby/GtkSourceView3, Ruby/ClutterGTK, Ruby/ClutterGStreamer,
+  Ruby/Poppler and Ruby/RSVG2 in
   [Ruby-GNOME2](http://ruby-gnome2.sourceforge.jp/)
 * [hexdump](https://github.com/postmodern/hexdump)
 
@@ -19,28 +19,36 @@ A friend of a keyboard.
 
 ### Launch
 
-    $ mireru [OPTION]... [FILE]...
+    $ mireru [OPTION]... [FILE_OR_DIRECTORY]...
 
-If no argument, then search current directory.
+If no argument, then open the current directory.
 
 ### Options
 
--R, --recursive<br />
-    recursive search as "**/*"
+-h, --help<br />
+    show this help message
 
 -f, --font NAME<br />
-    set font such as "Monospace 16"
+    set a font such as "Monospace 16"
 
-### Keybind
+### Key bindings
 
 #### Common
 
 n: next<br />
 p: prev<br />
+e: expand/collpse<br />
 r: reload<br />
-e: expand path<br />
 q: quit<br />
 
+#### Control key mask
+
+Ctrl+n: 10 tiles next<br />
+Ctrl+p: 10 tiles prev<br />
+Ctrl+e: expand all/collpse even if cursor on file<br />
+Ctrl+h: move position of partition to left<br />
+Ctrl+l: move position of partition to right<br />
+
 #### Scroll
 
 h: left<br />
@@ -48,19 +56,22 @@ j: down<br />
 k: up<br />
 l: right<br />
 
+Shift+h: 100 times left<br />
+Shift+j: 100 times down<br />
+Shift+k: 100 times up<br />
+Shift+l: 100 times right<br />
+
+Shift+g: down to bottom<br />
+
 #### Scale
 
 +: larger<br />
 -: smaller<br />
 
-#### Special
-
-T: thumbnail
-
 #### Image
 
-f: fits window size<br />
-o: original size<br />
+f: fit window size<br />
+o: scale to the original size<br />
 
 #### Text
 
@@ -70,6 +81,11 @@ f: change font (at random)<br />
 
 space: play/pause<br />
 
+#### PDF
+
+j: next page<br />
+k: prev page<br />
+
 ## License
 
 Copyright (c) 2013-2014 Masafumi Yokoyama <myokoym@gmail.com>

data/lib/mireru.rb

@@ -1,8 +1,8 @@
 require "mireru/version"
-require "mireru/container"
 require "mireru/logger"
 require "mireru/widget"
 require "mireru/window"
+require "mireru/navigator"
 
 module Mireru
 end

data/lib/mireru/command/mireru.rb

@@ -1,13 +1,11 @@
-require "gtk3"
 require "mireru/logger"
 require "mireru/window"
-require "mireru/container"
 require "mireru/version"
 
 module Mireru
   module Command
     class Mireru
-      USAGE = "Usage: mireru [OPTION]... [FILE]..."
+      USAGE = "Usage: mireru [OPTION]... [FILE_OR_DIRECTORY]..."
 
       class << self
         def run(*arguments)
@@ -31,44 +29,17 @@ module Mireru
         font = purge_option(arguments, /\A(-f|--font)\z/, true)
 
         files = files_from_arguments(arguments)
-        file_container = ::Mireru::Container.new(files)
 
-        if file_container.empty?
-          write_empty_message
-          exit(false)
-        end
-
-        window = ::Mireru::Window.new
+        window = ::Mireru::Window.new(files)
         window.font = font if font
-        window.add_container(file_container)
 
-        Gtk.main
+        window.run
       end
 
       private
       def files_from_arguments(arguments)
         if arguments.empty?
-          files = Dir.glob("*")
-        elsif purge_option(arguments, /\A(-R|--recursive|-d|--deep)\z/)
-          if arguments.empty?
-            files = Dir.glob("**/*")
-          else
-            files = []
-            arguments.each do |f|
-              if File.directory?(f)
-                files << Dir.glob("#{f}/**/*")
-              else
-                files << f
-              end
-            end
-            files.flatten!
-          end
-        elsif arguments.all? {|v| File.directory?(v) }
-          files = []
-          arguments.each do |f|
-            files << Dir.glob("#{f}/*")
-          end
-          files.flatten!
+          files = [Dir.pwd]
         else
           files = arguments
         end
@@ -89,38 +60,59 @@ module Mireru
       def write_help_message
         message = <<-EOM
 #{USAGE}
-  If no argument, then search current directory.
+  If no argument, then open the current directory.
+
 Options:
-  -R, --recursive
-      recursive search as "**/*"
+  -h, --help
+      show this help message
+
   -f, --font NAME
-      set font such as "Monospace 16"
-Keybind:
+      set a font such as "Monospace 16"
+
+Key bindings:
   n: next
   p: prev
+  e: expand/collpse
   r: reload
-  e: expand path
   q: quit
 
+  Control key mask:
+    Ctrl+n: 10 tiles next
+    Ctrl+p: 10 tiles prev
+    Ctrl+e: expand all / collpse even if cursor on file
+    Ctrl+h: move position of partition to left
+    Ctrl+l: move position of partition to right
+
   scroll:
     h: left
     j: down
     k: up
     l: right
 
+    Shift+h: 100 times left
+    Shift+j: 100 times down
+    Shift+k: 100 times up
+    Shift+l: 100 times right
+
+    Shift+g: down to bottom
+
   scale:
     +: larger
     -: smaller
 
   image:
-    f: fits window size
-    o: original size
+    f: fit window size
+    o: scale to the original size
 
   text:
     f: change font (at random)
 
   video:
     space: play/pause
+
+  PDF:
+    j: next page
+    k: prev page
         EOM
         @logger.info(message)
       end
@@ -131,20 +123,6 @@ Keybind:
         EOM
         @logger.info(message)
       end
-
-      def write_empty_message
-        message = <<-EOM
-Warning: file not found.
-#{USAGE}
-  If no argument, then search current directory.
-Options:
-  -R, --recursive
-      recursive search as "**/*"
-  -f, --font NAME
-      set font such as "Monospace 16"
-        EOM
-        @logger.error(message)
-      end
     end
   end
 end

data/lib/mireru/navigator.rb

@@ -0,0 +1,166 @@
+require "gtk3"
+
+module Mireru
+  class Navigator < Gtk::ScrolledWindow
+    PATH_COLUMN, FILENAME_COLUMN, ICON_COLUMN = 0, 1, 2
+
+    def initialize(window, files)
+      super()
+      @window = window
+      @files = files
+      @dir_iters = {}
+      set_policy(:automatic, :automatic)
+      set_size_request(200, -1)
+      @model = Gtk::TreeStore.new(String, String, Gdk::Pixbuf)
+      @tree_view = create_tree(@model)
+      add(@tree_view)
+    end
+
+    def next
+      @tree_view.move_cursor(Gtk::MovementStep::DISPLAY_LINES, 1)
+    end
+
+    def prev
+      @tree_view.move_cursor(Gtk::MovementStep::DISPLAY_LINES, -1)
+    end
+
+    def expand_toggle(open_all=false)
+      path = selected_path
+      iter = @model.get_iter(path)
+      file_path = iter.get_value(PATH_COLUMN)
+      if open_all and File.file?(file_path)
+        parent = iter.parent
+        path = @model.get_path(parent)
+        @tree_view.collapse_row(path)
+      elsif @tree_view.row_expanded?(path)
+        @tree_view.collapse_row(path)
+      else
+        if open_all
+          return unless File.directory?(file_path)
+          Dir.glob("#{file_path}/*") do |dir|
+            next unless File.directory?(dir)
+            child_iter = @dir_iters[dir]
+            next unless child_iter
+            load_dir(@model, dir, child_iter, true)
+            @dir_iters.delete(dir)
+          end
+        end
+        @tree_view.expand_row(path, open_all)
+      end
+    end
+
+    def selected_path
+      selection = @tree_view.selection
+      selected = selection.selected
+      @model.get_path(selected)
+    end
+
+    private
+    def create_tree(model)
+      tree_view = Gtk::TreeView.new
+      tree_view.set_model(model)
+      tree_view.search_column = FILENAME_COLUMN
+      tree_view.enable_search = false
+
+      selection = tree_view.selection
+      selection.set_mode(:browse)
+
+      @files.each do |file|
+        load_file(model, file)
+      end
+
+      column = Gtk::TreeViewColumn.new
+      if @files.size == 1
+        column.title = File.dirname(@files.first)
+      else
+        column.title = "Selected Files"
+      end
+      tree_view.append_column(column)
+
+      renderer = Gtk::CellRendererPixbuf.new
+      renderer.set_fixed_size(*Gtk::IconSize.lookup(:menu))
+      column.pack_start(renderer, :expand => false)
+      column.add_attribute(renderer, :pixbuf, ICON_COLUMN)
+
+      renderer = Gtk::CellRendererText.new
+      column.pack_start(renderer, :expand => false)
+      column.add_attribute(renderer, :text, FILENAME_COLUMN)
+
+      selection.signal_connect("changed") do |selection|
+        apply_changed(selection)
+      end
+
+      tree_view.expand_all
+      tree_view
+    end
+
+    def apply_changed(selection)
+      iter = selection.selected
+      return unless iter
+      path = iter.get_value(PATH_COLUMN)
+      if File.directory?(path)
+        if @dir_iters[path]
+          load_dir(@model, path, @dir_iters[path])
+        end
+        @dir_iters.delete(path)
+      end
+      return unless File.file?(path)
+      @window.title = path
+      @window.file = path
+      begin
+        GLib::Timeout.add(100) do
+          if @window.file == path
+            begin
+              @window.add_from_file(path)
+            rescue => e
+              $stderr.puts("#{e.class}: #{e.message}")
+              $stderr.puts(e.backtrace)
+            end
+          end
+          false
+        end
+      rescue
+        stock = Gtk::Stock::MISSING_IMAGE
+        size = :dialog
+        pixbuf = Gtk::Image.new.render_icon_pixbuf(stock, size)
+      end
+    end
+
+    def load_dir(model, dir, parent=nil, recursive=false)
+      Dir.glob("#{File.expand_path(dir)}/*") do |child|
+        load_file(model, child, parent, recursive)
+      end
+    end
+
+    def load_file(model, file, parent=nil, recursive=false)
+      iter = model.append(parent)
+      iter.set_value(PATH_COLUMN, file)
+      iter.set_value(FILENAME_COLUMN, File.basename(file))
+      if File.directory?(file)
+        @dir_iters[file] = iter unless recursive
+        dir_icon = self.render_icon_pixbuf(Gtk::Stock::DIRECTORY, :menu)
+        iter.set_value(ICON_COLUMN, dir_icon)
+        load_dir(model, file, iter, recursive) if recursive
+      else
+        file_icon = select_icon(file)
+        iter.set_value(ICON_COLUMN, file_icon)
+      end
+      # TODO: too slow...
+      #icon_width, icon_height = Gtk::IconSize.lookup(:menu)
+      #begin
+      #  pixbuf = Gdk::Pixbuf.new(file_path, icon_width, icon_height)
+      #rescue Gdk::PixbufError
+      #  pixbuf = file_icon
+      #end
+      #iter.set_value(ICON_COLUMN, pixbuf)
+    end
+
+    def select_icon(file)
+      if Widget.video?(file) or Widget.music?(file)
+        self.render_icon_pixbuf(Gtk::Stock::CDROM, :menu)
+      else
+        self.render_icon_pixbuf(Gtk::Stock::FILE, :menu)
+      end
+    end
+  end
+end