mireru 0.2.1 → 0.9.0

data/lib/mireru/version.rb

@@ -1,3 +1,3 @@
 module Mireru
-  VERSION = "0.2.1"
+  VERSION = "0.9.0"
 end

data/lib/mireru/widget.rb

@@ -4,26 +4,23 @@ require "mireru/widget/pdf"
 require "mireru/widget/svg"
 require "mireru/widget/text"
 require "mireru/widget/binary"
-require "mireru/widget/thumbnail"
 
 module Mireru
   module Widget
     module_function
-    def create(file, width=10000, height=10000)
+    def create(file, width, height)
       if image?(file)
-        widget = Mireru::Widget::Image.create(file, width, height)
-      elsif video?(file)
-        widget = Mireru::Widget::Video.create(file)
+        widget = Mireru::Widget::Image.new(file, width, height)
+      elsif video?(file) or music?(file)
+        widget = Mireru::Widget::Video.new(file)
       elsif pdf?(file)
-        widget = Mireru::Widget::PDF.create(file)
+        widget = Mireru::Widget::PDF.new(file)
       elsif svg?(file)
-        widget = Mireru::Widget::SVG.create(file)
+        widget = Mireru::Widget::SVG.new(file)
       elsif text?(file)
-        widget = Mireru::Widget::Text.create(file)
-      elsif file.is_a?(Enumerable)
-        widget = Mireru::Widget::Thumbnail.create(file, width, height)
+        widget = Mireru::Widget::Text.new(file)
       else
-        widget = Mireru::Widget::Binary.create(file)
+        widget = Mireru::Widget::Binary.new(file)
       end
       widget
     end
@@ -32,8 +29,12 @@ module Mireru
       /\.(png|jpe?g|gif|ico|ani|bmp|pnm|ras|tga|tiff|xbm|xpm)\z/i =~ file
     end
 
+    def music?(file)
+      /\.(og[ag]|wav|acc|mp3|m4a|wma|flac|tta|aiff|ape|tak)\z/i =~ file
+    end
+
     def video?(file)
-      /\.(ogm|mp4|flv|mpe?g2?|ts|mov|avi|divx|mkv|wmv|asf|wmx)\z/i =~ file
+      /\.(ogm|mp4|m4v|flv|mpe?g2?|ts|mov|avi|divx|mkv|wmv|asf|wmx)\z/i =~ file
     end
 
     def pdf?(file)
@@ -45,7 +46,12 @@ module Mireru
     end
 
     def text?(file)
+      return false if binary?(file)
       File.read(file).valid_encoding?
     end
+
+    def binary?(file)
+      /\.(la|lo|o|so|a|dll|exe|msi|tar|gz|zip|7z|lzh|rar|iso)\z/i =~ file
+    end
   end
 end

data/lib/mireru/widget/binary.rb

@@ -1,31 +1,25 @@
+require "gtk3"
 require "stringio"
 require "hexdump"
 
 module Mireru
   module Widget
-    class Binary
-      class << self
-        def create(file)
-          dump = hexdump(file).string
-          create_text_view(dump)
-        end
-
-        private
-        def hexdump(file)
-          io = StringIO.new
-          bytes = File.open(file, "rb").read(20 * 1024)
-          Hexdump.dump(bytes, :output => io)
-          io
-        end
+    class Binary < Gtk::TextView
+      def initialize(file)
+        text = hexdump(file).string
+        buffer = Gtk::TextBuffer.new
+        buffer.text = text
+        super(buffer)
+        editable = false
+        override_font(Pango::FontDescription.new("Monospace"))
+      end
 
-        def create_text_view(text)
-          buffer = Gtk::TextBuffer.new
-          buffer.text = text
-          view = Gtk::TextView.new(buffer)
-          view.editable = false
-          view.override_font(Pango::FontDescription.new("Monospace"))
-          view
-        end
+      private
+      def hexdump(file)
+        io = StringIO.new
+        bytes = File.open(file, "rb").read(20 * 1024)
+        Hexdump.dump(bytes, :output => io)
+        io
       end
     end
   end

data/lib/mireru/widget/image.rb

@@ -1,15 +1,19 @@
+require "gtk3"
+
 module Mireru
   module Widget
-    class Image
-      class << self
-        def create(file, width, height)
-          image = Gtk::Image.new
-          pixbuf = Gdk::Pixbuf.new(file)
+    class Image < Gtk::Image
+      def initialize(file, width, height)
+        super()
+        pixbuf_animation = Gdk::PixbufAnimation.new(file)
+        if pixbuf_animation.static_image?
+          pixbuf = pixbuf_animation.static_image
           if pixbuf.width > width || pixbuf.height > height
             pixbuf = Gdk::Pixbuf.new(file, width, height)
           end
-          image.pixbuf = pixbuf
-          widget = image
+          self.pixbuf = pixbuf
+        else
+          self.pixbuf_animation = pixbuf_animation
         end
       end
     end

data/lib/mireru/widget/pdf.rb

@@ -1,31 +1,49 @@
+require "gtk3"
 require "poppler"
 
 module Mireru
   module Widget
-    class PDF
-      class << self
-        def create(file)
-          drawing_area = Gtk::DrawingArea.new
+    class PDF < Gtk::DrawingArea
+      def initialize(file)
+        super()
+        document = Poppler::Document.new(file)
+        @page_index = 0
+        @page_max = document.size - 1
+        width, height = document.first.size
+        set_size_request(width, height)
 
-          document = Poppler::Document.new(file)
-          width, height = document.first.size
-          drawing_area.set_size_request(width, height * document.size)
-
-          drawing_area.signal_connect("draw") do |widget, event|
-            context = widget.window.create_cairo_context
-            document.each_with_index do |page, i|
-              context.save do
-                context.translate(0, height * i)
-                context.render_poppler_page(document[i])
-              end
-            end
-            context.show_page
-            true
+        signal_connect("draw") do |widget, event|
+          context = widget.window.create_cairo_context
+          window_width = widget.allocated_width
+          window_height = widget.allocated_height
+          width_scale = window_width.to_f / width
+          height_scale = window_height.to_f / height
+          scale = [width_scale, height_scale].min
+          begin
+            context.scale(scale, scale)
+          rescue => e
+            $stderr.puts("#{e.class}: #{e.message}")
+            $stderr.puts(e.backtrace)
           end
-
-          drawing_area
+          context.render_poppler_page(document[@page_index])
+          context.show_page
+          true
         end
       end
+
+      def next
+        @page_index += 1
+        @page_index = @page_max if @page_index > @page_max
+        hide
+        show
+      end
+
+      def prev
+        @page_index -= 1
+        @page_index = 0 if @page_index < 0
+        hide
+        show
+      end
     end
   end
 end

data/lib/mireru/widget/svg.rb

@@ -1,25 +1,29 @@
+require "gtk3"
 require "rsvg2"
 
 module Mireru
   module Widget
-    class SVG
-      class << self
-        def create(file)
-          drawing_area = Gtk::DrawingArea.new
+    class SVG < Gtk::DrawingArea
+      def initialize(file)
+        super()
+        handle = RSVG::Handle.new_from_file(file)
+        width, height = handle.dimensions.to_a
 
-          handle = RSVG::Handle.new_from_file(file)
-          width, height = handle.dimensions.to_a
-          drawing_area.set_size_request(width, height)
-
-          drawing_area.signal_connect("draw") do |widget, event|
-            context = widget.window.create_cairo_context
-            context.save do
-              context.render_rsvg_handle(handle)
-            end
-            true
+        signal_connect("draw") do |widget, event|
+          context = widget.window.create_cairo_context
+          window_width = widget.allocated_width
+          window_height = widget.allocated_height
+          width_scale = window_width.to_f / width
+          height_scale = window_height.to_f / height
+          scale = [width_scale, height_scale].min
+          begin
+            context.scale(scale, scale)
+          rescue => e
+            $stderr.puts("#{e.class}: #{e.message}")
+            $stderr.puts(e.backtrace)
           end
-
-          drawing_area
+          context.render_rsvg_handle(handle)
+          true
         end
       end
     end

data/lib/mireru/widget/text.rb

@@ -2,32 +2,30 @@ require "gtksourceview3"
 
 module Mireru
   module Widget
-    class Text
-      class << self
-        def create(file)
-          buffer = buffer_from_file(file)
-          view = GtkSource::View.new(buffer)
-          view.show_line_numbers = true
-          lang = GtkSource::LanguageManager.new.get_language("ruby")
-          view.buffer.language = lang
-          view.buffer.highlight_syntax = true
-          view.buffer.highlight_matching_brackets = true
-          view.editable = false
-          view.override_font(Pango::FontDescription.new("Monospace"))
-        end
+    class Text < GtkSource::View
+      def initialize(file)
+        buffer = buffer_from_file(file)
+        super(buffer)
+        self.show_line_numbers = true
+        lang = GtkSource::LanguageManager.new.get_language("ruby")
+        self.buffer.language = lang
+        self.buffer.highlight_syntax = true
+        self.buffer.highlight_matching_brackets = true
+        self.editable = false
+        override_font(Pango::FontDescription.new("Monospace"))
+      end
 
-        private
-        def buffer_from_file(file)
-          text = File.open(file).read
-          buffer_from_text(text)
-        end
+      private
+      def buffer_from_file(file)
+        text = File.open(file).read
+        buffer_from_text(text)
+      end
 
-        def buffer_from_text(text)
-          text.encode!("utf-8") unless text.encoding == "utf-8"
-          buffer = GtkSource::Buffer.new
-          buffer.text = text
-          buffer
-        end
+      def buffer_from_text(text)
+        text.encode!("utf-8") unless text.encoding == "utf-8"
+        buffer = GtkSource::Buffer.new
+        buffer.text = text
+        buffer
       end
     end
   end

data/lib/mireru/widget/video.rb

@@ -3,46 +3,47 @@ require "clutter-gst"
 
 module Mireru
   module Widget
-    class Video
-      class << self
-        def create(file)
-          clutter = ClutterGtk::Embed.new
-          stage = clutter.stage
-          stage.background_color = Clutter::Color.new(:black)
-          video_texture = ClutterGst::VideoTexture.new
-          stage.add_child(video_texture)
-          video_texture.signal_connect("eos") do |_video_texture|
-            _video_texture.progress = 0.0
-            _video_texture.playing = true
-          end
-          video_texture.filename = file
-          video_texture.playing = true
-          define_events(stage, video_texture)
-          clutter.signal_connect("destroy") do
-            video_texture.playing = false
-          end
-          clutter
+    class Video < ClutterGtk::Embed
+      def initialize(file)
+        super()
+        stage.background_color = Clutter::Color.new(:black)
+        @video_texture = ClutterGst::VideoTexture.new
+        stage.add_child(@video_texture)
+        @video_texture.signal_connect("eos") do |_video_texture|
+          _video_texture.progress = 0.0
+          _video_texture.playing = true
+        end
+        @video_texture.filename = file
+        @video_texture.playing = true
+        signal_connect("destroy") do
+          next if @video_texture.destroyed?
+          @video_texture.playing = false
         end
 
-        def define_events(stage, video_texture)
-          stage.signal_connect("event") do |_stage, event|
-            handled = false
-
-            case event.type
-            when Clutter::EventType::KEY_PRESS
-              animation = nil
-              case event.key_symbol
-              when Clutter::Keys::KEY_space
-                state = video_texture.playing?
-                video_texture.playing = state ? false : true
-              end
-              handled = true
-            end
+        @video_texture.signal_connect_after("size-change") do |texture, base_width, base_height|
+          stage_width, stage_height = stage.size
+          frame_width, frame_height = texture.size
 
-            handled
+          new_height = (frame_height * stage_width) / frame_width
+          if new_height <= stage_height
+            new_width = stage_width
+            new_x = 0
+            new_y = (stage_height - new_height) / 2
+          else
+            new_width = (frame_width * stage_height) / frame_height
+            new_height = stage_height
+            new_x = (stage_width - new_width) / 2
+            new_y = 0
           end
+          texture.set_position(new_x, new_y)
+          texture.set_size(new_width, new_height)
         end
       end
+
+      def pause_or_play
+        state = @video_texture.playing?
+        @video_texture.playing = state ? false : true
+      end
     end
   end
 end

data/lib/mireru/window.rb

@@ -1,111 +1,43 @@
 require "gtk3"
 require "mireru/widget"
+require "mireru/navigator"
 
 module Mireru
   class Window < Gtk::Window
     attr_accessor :font
-    def initialize
-      super
+    attr_accessor :file
+    def initialize(files)
+      super()
+      @files = files
+
+      @paned = Gtk::Paned.new(:horizontal)
+      add(@paned)
+
+      @navigator = Navigator.new(self, files)
+      @paned.add(@navigator)
+
       @scroll = Gtk::ScrolledWindow.new
       @scroll.set_policy(:automatic, :automatic)
-      add(@scroll)
-      set_default_size(640, 640)
+      @paned.add(@scroll)
+
+      set_default_size(800, 600)
       signal_connect("destroy") do
         Gtk.main_quit
       end
-    end
 
-    def add_container(container)
-      @container = container
-
-      @file = @container.shift
-      add_from_file(@file)
-
-      signal_connect("key-press-event") do |widget, event|
-        case event.keyval
-        when Gdk::Keyval::GDK_KEY_n
-          @file = @container.shift(@file)
-          add_from_file(@file)
-        when Gdk::Keyval::GDK_KEY_p
-          @file = @container.pop(@file)
-          add_from_file(@file)
-        when Gdk::Keyval::GDK_KEY_r
-          add_from_file(@file)
-        when Gdk::Keyval::GDK_KEY_e
-          self.title = File.expand_path(@file)
-        when Gdk::Keyval::GDK_KEY_f
-          if Mireru::Widget.image?(@file)
-            pixbuf = Gdk::Pixbuf.new(@file, *self.size)
-            @widget.pixbuf = pixbuf
-          elsif @widget.is_a?(Gtk::TextView)
-            font = @widget.pango_context.families.sample.name
-            @widget.override_font(Pango::FontDescription.new(font))
-            self.title = "#{File.basename(@file)} (#{font})"
-          end
-        when Gdk::Keyval::GDK_KEY_o
-          if Mireru::Widget.image?(@file)
-            pixbuf = Gdk::Pixbuf.new(@file)
-            @widget.pixbuf = pixbuf
-          end
-        when Gdk::Keyval::GDK_KEY_T
-          files = @container.instance_variable_get(:@files)
-          add_from_file(files)
-        when Gdk::Keyval::GDK_KEY_plus
-          if Mireru::Widget.image?(@file)
-            pixbuf = @widget.pixbuf
-            scale = 1.1
-            @widget.pixbuf = pixbuf.scale(pixbuf.width  * scale,
-                                          pixbuf.height * scale)
-          elsif @widget.is_a?(Gtk::TextView)
-            font = @widget.pango_context.font_description.to_s
-            font_size = font.scan(/\d+\z/).first.to_i
-            font = font.sub(/\d+\z/, (font_size + 1).to_s)
-            @widget.override_font(Pango::FontDescription.new(font))
-          end
-        when Gdk::Keyval::GDK_KEY_minus
-          if Mireru::Widget.image?(@file)
-            pixbuf = @widget.pixbuf
-            scale = 0.9
-            @widget.pixbuf = pixbuf.scale(pixbuf.width  * scale,
-                                          pixbuf.height * scale)
-          elsif @widget.is_a?(Gtk::TextView)
-            font = @widget.pango_context.font_description.to_s
-            font_size = font.scan(/\d+\z/).first.to_i
-            font = font.sub(/\d+\z/, (font_size - 1).to_s)
-            @widget.override_font(Pango::FontDescription.new(font))
-          end
-        when Gdk::Keyval::GDK_KEY_h
-          @scroll.hadjustment.value -= 17
-        when Gdk::Keyval::GDK_KEY_j
-          @scroll.vadjustment.value += 17
-        when Gdk::Keyval::GDK_KEY_k
-          @scroll.vadjustment.value -= 17
-        when Gdk::Keyval::GDK_KEY_l
-          @scroll.hadjustment.value += 17
-        when Gdk::Keyval::GDK_KEY_H
-          @scroll.hadjustment.value -= 1000000
-        when Gdk::Keyval::GDK_KEY_J, Gdk::Keyval::GDK_KEY_G
-          @scroll.vadjustment.value += 1000000
-        when Gdk::Keyval::GDK_KEY_K
-          @scroll.vadjustment.value -= 1000000
-        when Gdk::Keyval::GDK_KEY_L
-          @scroll.hadjustment.value += 1000000
-        when Gdk::Keyval::GDK_KEY_q
-          destroy
-        end
-      end
+      define_keybind
     end
 
     def add_from_file(file)
       @scroll.hadjustment.value = 0
       @scroll.vadjustment.value = 0
-      @scroll.each {|child| child.destroy }
-      @widget = Mireru::Widget.create(file, *self.size)
-      if @widget.is_a?(Mireru::Widget::Thumbnail)
-        self.title = "Thumbnails: #{file.size} / #{file.size}"
-      else
-        self.title = File.basename(file)
+      @scroll.each do |child|
+        @scroll.remove(child)
+        child.destroy
       end
+      width = @scroll.allocated_width - 10
+      height = @scroll.allocated_height - 10
+      @widget = Mireru::Widget.create(file, width, height)
       @widget.override_font(Pango::FontDescription.new(@font)) if @font
       if @widget.is_a?(Gtk::Scrollable)
         @scroll.add(@widget)
@@ -114,5 +46,132 @@ module Mireru
       end
       show_all
     end
+
+    def run
+      show_all
+      Gtk.main
+    end
+
+    private
+    def define_keybind
+      signal_connect("key-press-event") do |widget, event|
+        handled = false
+
+        if event.state.control_mask?
+          handled = action_from_keyval_with_control_mask(event.keyval)
+        else
+          handled = action_from_keyval(event.keyval)
+        end
+
+        handled
+      end
+    end
+
+    def action_from_keyval(keyval)
+      case keyval
+      when Gdk::Keyval::GDK_KEY_n
+        @navigator.next
+      when Gdk::Keyval::GDK_KEY_p
+        @navigator.prev
+      when Gdk::Keyval::GDK_KEY_r
+        add_from_file(@file)  # reload
+      when Gdk::Keyval::GDK_KEY_e
+        @navigator.expand_toggle
+      when Gdk::Keyval::GDK_KEY_Return
+        @navigator.expand_toggle
+      when Gdk::Keyval::GDK_KEY_space
+        if @widget.is_a?(Widget::Video)
+          @widget.pause_or_play
+        end
+      when Gdk::Keyval::GDK_KEY_f
+        if Mireru::Widget.image?(@file)
+          width = @scroll.allocated_width - 10
+          height = @scroll.allocated_height - 10
+          pixbuf = Gdk::Pixbuf.new(@file, width, height)
+          @widget.pixbuf = pixbuf
+        elsif @widget.is_a?(Gtk::TextView)
+          font = @widget.pango_context.families.sample.name
+          @widget.override_font(Pango::FontDescription.new(font))
+        end
+      when Gdk::Keyval::GDK_KEY_o
+        if Mireru::Widget.image?(@file)
+          pixbuf = Gdk::Pixbuf.new(@file)
+          @widget.pixbuf = pixbuf
+        end
+      when Gdk::Keyval::GDK_KEY_plus
+        if Mireru::Widget.image?(@file)
+          pixbuf = @widget.pixbuf
+          scale = 1.1
+          @widget.pixbuf = pixbuf.scale(pixbuf.width  * scale,
+                                        pixbuf.height * scale)
+        elsif @widget.is_a?(Gtk::TextView)
+          font = @widget.pango_context.font_description.to_s
+          font_size = font.scan(/\d+\z/).first.to_i
+          font = font.sub(/\d+\z/, (font_size + 1).to_s)
+          @widget.override_font(Pango::FontDescription.new(font))
+        end
+      when Gdk::Keyval::GDK_KEY_minus
+        if Mireru::Widget.image?(@file)
+          pixbuf = @widget.pixbuf
+          scale = 0.9
+          @widget.pixbuf = pixbuf.scale(pixbuf.width  * scale,
+                                        pixbuf.height * scale)
+        elsif @widget.is_a?(Gtk::TextView)
+          font = @widget.pango_context.font_description.to_s
+          font_size = font.scan(/\d+\z/).first.to_i
+          font = font.sub(/\d+\z/, (font_size - 1).to_s)
+          @widget.override_font(Pango::FontDescription.new(font))
+        end
+      when Gdk::Keyval::GDK_KEY_h
+        @scroll.hadjustment.value -= 17
+      when Gdk::Keyval::GDK_KEY_j
+        if @widget.is_a?(Widget::PDF)
+          @widget.next
+        else
+        @scroll.vadjustment.value += 17
+        end
+      when Gdk::Keyval::GDK_KEY_k
+        if @widget.is_a?(Widget::PDF)
+          @widget.prev
+        else
+        @scroll.vadjustment.value -= 17
+        end
+      when Gdk::Keyval::GDK_KEY_l
+        @scroll.hadjustment.value += 17
+      when Gdk::Keyval::GDK_KEY_H
+        @scroll.hadjustment.value -= 17 * 100
+      when Gdk::Keyval::GDK_KEY_J
+        @scroll.vadjustment.value += 17 * 100
+      when Gdk::Keyval::GDK_KEY_G
+        @scroll.vadjustment.value = @scroll.vadjustment.upper
+      when Gdk::Keyval::GDK_KEY_K
+        @scroll.vadjustment.value -= 17 * 100
+      when Gdk::Keyval::GDK_KEY_L
+        @scroll.hadjustment.value += 17 * 100
+      when Gdk::Keyval::GDK_KEY_q
+        destroy
+      else
+        return false
+      end
+      true
+    end
+
+    def action_from_keyval_with_control_mask(keyval)
+      case keyval
+      when Gdk::Keyval::GDK_KEY_n
+        10.times { @navigator.next }
+      when Gdk::Keyval::GDK_KEY_p
+        10.times { @navigator.prev }
+      when Gdk::Keyval::GDK_KEY_e
+        @navigator.expand_toggle(true)
+      when Gdk::Keyval::GDK_KEY_h
+        @paned.position -= 2
+      when Gdk::Keyval::GDK_KEY_l
+        @paned.position += 2
+      else
+        return false
+      end
+      true
+    end
   end
 end