mireru 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdbbb02cb56552275b740544a7156e7b155bd126
-  data.tar.gz: efb1f67b291ec5733cf9499f6ca71cb4969251cd
+  metadata.gz: 406e348f2d11f8f56ac07255316499132fb2a788
+  data.tar.gz: 8796ee447bbbaee723af14d06ce2480937b43acd
 SHA512:
-  metadata.gz: d73f9d68826bb2dc43fa3a9719e1b1d053bfe119a33c194660c26dfbdb7223ebfd5a3b6a292239a6f30e4841066ec552313be858edc719d72e10dba6e09a970d
-  data.tar.gz: 55021cc099d4abef5652d11fef73e72cd170dd71c1b29291c90bfa7e1b0c9f0df4f406b3c174e9aa8f69089edb5e79734a0a216bed20523a2d479046622c02fa
+  metadata.gz: 0e5a7fdd5d5c57e92fcd235a618298e14354818e0665261e8feeae23341308efa66ca2dab88207733c334ecfcfdeba132f03fcb53b9b20583ef20cdd2eb240bf
+  data.tar.gz: 2cc0bd8b9a70d063880e6dd220434b97f9735acf30c4ffa1f34ce9ea6191dc14cdd67748269168d83d0fdf9439ea90b6ab1ff8fbf9a8690b868147197d3deac9

data/.travis.yml

@@ -3,6 +3,7 @@ env:
     - DISPLAY=":99.0"
 language: ruby
 rvm:
+  - 1.9.3
   - 2.0.0
   - 2.1
   - rbx-2

data/NEWS.md

@@ -1,5 +1,22 @@
 # NEWS
 
+## 0.9.1: 2014-07-29
+
+Introduce ChupaText!
+
+### Changes
+
+  * Improvements
+    * Add license header
+    * Introduce ChupaText
+    * Cache icons
+    * Add a key binding to run selected file (Windows and OS X)
+    * Show icons associated with MIME type
+
+  * Fixes
+    * Suppress an error from an empty file
+    * text: Support a multibyte encoding such as Shift_JIS
+
 ## 0.9.0: 2014-07-13
 
 Now we have TreeView, and many problems are resolved.

data/README.md

@@ -4,12 +4,17 @@ Mireru is a keyboard friendly file viewer by Ruby/GTK3.
 
 It can handle a variety of file types (Picture, Text, PDF, Video and etc.).
 
-## Requirements
+## Dependencies
 
 * 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)
+* [ChupaText](https://github.com/ranguba/chupa-text)
+  * [chupa-text-decomposer-html](https://github.com/ranguba/chupa-text-decomposer-html)
+  * [chupa-text-decomposer-pdf](https://github.com/ranguba/chupa-text-decomposer-pdf)
+  * [chupa-text-decomposer-libreoffice](https://github.com/ranguba/chupa-text-decomposer-libreoffice)
+    * [LibreOffice](https://www.libreoffice.org/)
 
 ## Installation
 
@@ -25,70 +30,79 @@ If no argument, then open the current directory.
 
 ### Options
 
--h, --help<br />
-    show this help message
+* `-h`, `--help`
+  * show this help message
 
--f, --font NAME<br />
-    set a font such as "Monospace 16"
+* `-f`, `--font NAME`
+  * set a font such as "Monospace 16"
 
 ### Key bindings
 
 #### Common
 
-n: next<br />
-p: prev<br />
-e: expand/collpse<br />
-r: reload<br />
-q: quit<br />
+* `n`: next
+* `p`: prev
+* `e`: expand/collapse
+* `r`: reload
+* `q`: quit
+
+---
+
+* `E`: extract text using ChupaText
 
 #### 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 />
+* Ctrl+`n`: 10 tiles next
+* Ctrl+`p`: 10 tiles prev
+* Ctrl+`e`: expand all/collapse even if cursor on file
+* Ctrl+`h`: move position of partition to left
+* Ctrl+`l`: move position of partition to right
+* Ctrl+Enter: run selected file (only supports Windows and OS X)
 
 #### Scroll
 
-h: left<br />
-j: down<br />
-k: up<br />
-l: right<br />
+* `h`: left
+* `j`: down
+* `k`: up
+* `l`: right
+
+---
+
+* `H`: 100 times left
+* `J`: 100 times down
+* `K`: 100 times up
+* `L`: 100 times right
 
-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 />
+* `G`: down to bottom
 
 #### Scale
 
-+: larger<br />
--: smaller<br />
+* `+`: larger
+* `-`: smaller
 
 #### Image
 
-f: fit window size<br />
-o: scale to the original size<br />
+* `f`: fit window size
+* `o`: scale to the original size
 
 #### Text
 
-f: change font (at random)<br />
+* `f`: change font (at random)
 
 #### Video
 
-space: play/pause<br />
+* space: play/pause
 
 #### PDF
 
-j: next page<br />
-k: prev page<br />
+* `j`: next page
+* `k`: prev page
 
 ## License
 
-Copyright (c) 2013-2014 Masafumi Yokoyama <myokoym@gmail.com>
+Copyright (c) 2013-2014 Masafumi Yokoyama `<myokoym@gmail.com>`
 
 GPLv2 or later.
 
@@ -101,7 +115,3 @@ See 'license/gpl-2.0.txt' or 'http://www.gnu.org/licenses/gpl-2.0' for details.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/myokoym/mireru/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/Rakefile

@@ -1,3 +1,19 @@
+# Copyright (C) 2013-2014 Masafumi Yokoyama <myokoym@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 require "bundler/gem_tasks"
 
 desc "Run test"

data/bin/mireru

@@ -1,4 +1,20 @@
 #!/usr/bin/env ruby
+#
+# Copyright (C) 2013-2014 Masafumi Yokoyama <myokoym@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 require "mireru/command/mireru"
 

data/lib/mireru.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2013-2014 Masafumi Yokoyama <myokoym@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 require "mireru/version"
 require "mireru/logger"
 require "mireru/widget"

data/lib/mireru/command/mireru.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2013-2014 Masafumi Yokoyama <myokoym@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 require "mireru/logger"
 require "mireru/window"
 require "mireru/version"
@@ -72,16 +88,19 @@ Options:
 Key bindings:
   n: next
   p: prev
-  e: expand/collpse
+  e: expand/collapse
   r: reload
   q: quit
 
+  E: extract text using ChupaText
+
   Control key mask:
     Ctrl+n: 10 tiles next
     Ctrl+p: 10 tiles prev
-    Ctrl+e: expand all / collpse even if cursor on file
+    Ctrl+e: expand all / collapse even if cursor on file
     Ctrl+h: move position of partition to left
     Ctrl+l: move position of partition to right
+    Ctrl+Enter: run selected file (only supports Windows and OS X)
 
   scroll:
     h: left
@@ -89,12 +108,12 @@ Key bindings:
     k: up
     l: right
 
-    Shift+h: 100 times left
-    Shift+j: 100 times down
-    Shift+k: 100 times up
-    Shift+l: 100 times right
+    H: 100 times left
+    J: 100 times down
+    K: 100 times up
+    L: 100 times right
 
-    Shift+g: down to bottom
+    G: down to bottom
 
   scale:
     +: larger

data/lib/mireru/logger.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2013-2014 Masafumi Yokoyama <myokoym@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 module Mireru
   class Logger
     def initialize

data/lib/mireru/navigator.rb

@@ -1,4 +1,21 @@
+# Copyright (C) 2013-2014 Masafumi Yokoyama <myokoym@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 require "gtk3"
+require "gio2"
 
 module Mireru
   class Navigator < Gtk::ScrolledWindow
@@ -9,6 +26,7 @@ module Mireru
       @window = window
       @files = files
       @dir_iters = {}
+      @icons = {}
       set_policy(:automatic, :automatic)
       set_size_request(200, -1)
       @model = Gtk::TreeStore.new(String, String, Gdk::Pixbuf)
@@ -145,22 +163,44 @@ module Mireru
         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)
+      content_type = guess_content_type(file)
+      return @icons[content_type] if @icons[content_type]
+      icon_path = lookup_icon_path(content_type)
+
+      if icon_path
+        @icons[content_type] = Gdk::Pixbuf.new(icon_path)
       else
-        self.render_icon_pixbuf(Gtk::Stock::FILE, :menu)
+        if Widget.video?(file) or Widget.music?(file)
+          @icons[content_type] = self.render_icon_pixbuf(Gtk::Stock::CDROM, :menu)
+        else
+          @icons[content_type] = self.render_icon_pixbuf(Gtk::Stock::FILE, :menu)
+        end
       end
+      @icons[content_type]
+    end
+
+    def lookup_icon_path(mime_type)
+      content_type = Gio::ContentType.new(mime_type)
+      icon = content_type.icon
+
+      icon_theme = Gtk::IconTheme.new
+      icon_info = icon_theme.lookup_icon(icon,
+                                         16,
+                                         Gtk::IconTheme::LookupFlags::GENERIC_FALLBACK)
+
+      if icon_info
+        icon_info.filename
+      else
+        nil
+      end
+    end
+
+    def guess_content_type(file)
+      content_type, _uncertain = Gio::ContentType.guess(file)
+      content_type
     end
   end
 end

data/lib/mireru/version.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2013-2014 Masafumi Yokoyama <myokoym@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 module Mireru
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/mireru/widget.rb

@@ -1,26 +1,45 @@
+# Copyright (C) 2013-2014 Masafumi Yokoyama <myokoym@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 require "mireru/widget/image"
 require "mireru/widget/video"
 require "mireru/widget/pdf"
 require "mireru/widget/svg"
+require "mireru/widget/extracted_text"
 require "mireru/widget/text"
 require "mireru/widget/binary"
 
 module Mireru
   module Widget
     module_function
-    def create(file, width, height)
-      if image?(file)
-        widget = Mireru::Widget::Image.new(file, width, height)
+    def create(file, width, height, chupa=false)
+      if chupa
+        widget = Widget::ExtractedText.new(file)
+      elsif image?(file)
+        widget = Widget::Image.new(file, width, height)
       elsif video?(file) or music?(file)
-        widget = Mireru::Widget::Video.new(file)
+        widget = Widget::Video.new(file)
       elsif pdf?(file)
-        widget = Mireru::Widget::PDF.new(file)
+        widget = Widget::PDF.new(file)
       elsif svg?(file)
-        widget = Mireru::Widget::SVG.new(file)
+        widget = Widget::SVG.new(file)
       elsif text?(file)
-        widget = Mireru::Widget::Text.new(file)
+        widget = Widget::Text.new(file)
       else
-        widget = Mireru::Widget::Binary.new(file)
+        widget = Widget::Binary.new(file)
       end
       widget
     end
@@ -45,13 +64,31 @@ module Mireru
       /\.svg\z/i =~ file
     end
 
+    def document?(file)
+      /\.(odt|ods|odp|doc|xls|ppt|docx|xlsx|pptx)\z/i =~ file
+    end
+
     def text?(file)
       return false if binary?(file)
-      File.read(file).valid_encoding?
+      true
     end
 
     def binary?(file)
-      /\.(la|lo|o|so|a|dll|exe|msi|tar|gz|zip|7z|lzh|rar|iso)\z/i =~ file
+      if /\.(la|lo|o|so|a|dll|exe|msi|tar|gz|zip|7z|lzh|rar|iso)\z/i =~ file
+        true
+      else
+        bytes = File.read(file, 512)
+        return false if bytes.nil?
+        return false if utf16?(bytes)
+        bytes.count("\x00-\x07\x0b\x0e-\x1a\x1c-\x1f") > (bytes.size / 10)
+      end
+    end
+
+    def utf16?(bytes)
+      # TODO: simplify
+      (bytes.start_with?("\xff\xfe".force_encoding("ASCII-8BIT")) or
+         bytes.start_with?("\xfe\xff".force_encoding("ASCII-8BIT"))) and
+        bytes.count("\x01-\x07\x0b\x0e-\x1a\x1c-\x1f") < (bytes.size / 20)
     end
   end
 end