ampv 1.0.3 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTU4NTMxOTlmYWI1Mzc3ODkxYTIwNDc2YmViYzhjZGYxNzY4MWUzZg==
+    OTI1MjM3YjlmNDJhZTdlMTdjOTY4MWU5YjMwZTdkZDZmYmJlNjMwYg==
   data.tar.gz: !binary |-
-    NTgzOTFhM2Q3MzZjNmE5YjdlMTVhMDliYzlmYjIyODEwZDNhODUzOA==
+    ZGFjZTg2ZGRiZDI1NDY0MTAwNmRjY2Y1M2MzODY5YmIxZTJkYmY4Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDJmODI2YmZiMWMzNmFiMmVkY2Y1N2U1OTQwNjQxMWViNTc2YmE1NTM3ZmIy
-    MjQyYWQ1MWNhNDNmNGQzNmZkMzBhOTJmNzhhNDZlZWFjMzNkMjQ4ZDlkNjIz
-    YTI1MjllMmFiMzIwMWIzNDA3MWQ4Y2VhODk1ODZkOGVkODQwYzY=
+    ZTA5ZjMxMTEzNjVhMWY2NGFkZWUwNjJiZmQ4ZjBkZDVjOTg5ZTdjZGMwZDBl
+    MWZmZmVlYTIzY2M0ZGM4ZjhiZGU2NTdkZTE2ZWYxNzc3ZDQyMDdmOGFjNzQ1
+    ODU5ZTJjYjMwMTYyMTBmNmQ2Yzk2ZWJkMzJiNTk5ZDBhZmI5Yjk=
   data.tar.gz: !binary |-
-    YzU4MDcwMjg1MDg4N2UyMjQ0YjU4ODI5ODA4YTJjZjkzZTY5ZDk1ZGZlZjdm
-    MzkwMzlkZTRiYzM1ZjgyMTg4MmVkZmY5NDk3ZTJmNzM2ZmQxYmVhYzE2ZGM0
-    MGU1ZGM5NjQyOTQ1NjJjYjFmZDY1M2ZjYTBjODVkMmQ4OWEyZWM=
+    YWIzYWM1YWI2ZDU2OGQ2NGZiYjE3MzUyNzQ1YmQwZDYzZjQ5MzE4MjQ4Njcx
+    MzA2MmQyMGM3NDUyMmM3YzdlY2E0OWYyNzYwOTQ3YzhkODU1YTVjZDg3ZjNl
+    YTk4MzMxNjA2YzI3N2IzMWZiMTBkNjgyODg0NjU4YmI4NzZiMmI=

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 ahoka
+Copyright (c) 2013-2014 ahoka
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/bin/ampv

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 
+unless $:.include?(lib = File.expand_path("../../lib", __FILE__))
+  $:.unshift(lib)
+end
+
 require "ampv"
 
 Ampv::MainWindow.new

data/input.conf

@@ -6,23 +6,24 @@ MOUSE_BTN7      playlist_prev
 MOUSE_BTN8      playlist_next
 MOUSE_BTN9      cycle pause
 
-RIGHT seek  10
-LEFT  seek -10
-UP    add volume 1
-DOWN  add volume -1
+RIGHT           seek  10
+LEFT            seek -10
+UP              add volume 1
+DOWN            add volume -1
 
-PGUP    seek -90 - exact
-PGDWN   seek 90 - exact
-HOME    add chapter -1
-END     add chapter 1
-INS     playlist_prev
-DEL     playlist_next
+PGUP            seek -90 - exact
+PGDWN           seek 90 - exact
+HOME            add chapter -1
+END             add chapter 1
+INS             playlist_prev
+DEL             playlist_next
 
-f       cycle fullscreen
-SPACE   cycle pause
-ESC     quit_watch_later
+f               cycle fullscreen
+s               cycle sub
+SPACE           cycle pause
+ESC             quit_watch_later
 
 # ampv commands
-l          cycle playlist
-o          open_file_chooser
-p          cycle progress_bar
+l               cycle playlist
+o               open_file_chooser
+p               cycle progress_bar

data/lib/ampv.rb

@@ -1,31 +1,17 @@
-
 require "gtk2"
+require "json"
+require "uri"
+require "ampv/config"
 require "ampv/mpvwidget"
 require "ampv/playlist"
 require "ampv/progressbarwidget"
 require "ampv/version"
-require "uri"
 
 module Ampv
   class MainWindow < Gtk::Window
 
-    MAIN_CONF  = "#{ENV["HOME"]}/.config/ampv.conf"
-    INPUT_CONF = "#{ENV["HOME"]}/.mpv/input.conf"
-    VIDEO_EXTS = [ ".avi", ".mkv", ".mp4", ".mpeg", ".mpg", ".ogm", ".ogv" ]
-    KEY_NAMES  = {
-      "esc"         => "Escape",
-      "space"       => "space",
-      "right"       => "Right",
-      "left"        => "Left",
-      "up"          => "Up",
-      "down"        => "Down",
-      "pgup"        => "Page_Up",
-      "pgdwn"       => "Page_Down",
-      "home"        => "Home",
-      "end"         => "End",
-      "ins"         => "Insert",
-      "del"         => "Delete",
-    }
+    INPUT_CONF    = "#{ENV["HOME"]}/.mpv/input.conf"
+    VIDEO_EXTS    = [ ".avi", ".mkv", ".mp4", ".mpeg", ".mpg", ".ogm", ".ogv", ".rm", ".ts", ".wmv" ]
     WHEEL_BUTTONS = {
       Gdk::EventScroll::UP    => 4,
       Gdk::EventScroll::DOWN  => 5,
@@ -37,208 +23,128 @@ module Ampv
     BLANK_CURSOR = Gdk::Cursor.new(Gdk::Cursor::BLANK_CURSOR)
 
     def initialize
-      load_config
+      unless defined?(MpvWidget::PATH)
+        dlg = Gtk::MessageDialog.new(nil,
+                                     Gtk::Dialog::DESTROY_WITH_PARENT,
+                                     Gtk::MessageDialog::ERROR,
+                                     Gtk::MessageDialog::BUTTONS_CLOSE,
+                                     "Unable to find mpv executable")
+        dlg.set_secondary_text("Please ensure you have mpv installed in your PATH.")
+        dlg.run
+        dlg.destroy
+        exit
+      end
+
+      args  = ARGV.reject { |x| x[0] != "-" }
+      files = ARGV - args
+
+      print_version if args.include?("--version")
+      Config.load
       super
+
       set_title(PACKAGE)
-      set_default_size(@config["width"], @config["height"])
+      set_default_size(Config["width"], Config["height"])
       set_window_position(Gtk::Window::POS_CENTER)
-      move(@config["x"], @config["y"]) unless @config["x"] == -1 and @config["y"] == -1
+      move(Config["x"], Config["y"]) unless Config["x"] == -1 and Config["y"] == -1
 
+      add_events(Gdk::Event::POINTER_MOTION_MASK)
       Gtk::Drag.dest_set(self, Gtk::Drag::DEST_DEFAULT_ALL,
                          [ [ "text/uri-list", 0, 0 ] ],
-                         Gdk::DragContext::ACTION_LINK)
-      add_events(Gdk::Event::POINTER_MOTION_MASK)
+                         Gdk::DragContext::ACTION_COPY)
 
       signal_connect("delete_event") { quit }
       signal_connect("scroll_event") { |w, e| handle_mouse_event(e) }
       signal_connect("button_press_event") { |w, e| handle_mouse_event(e) }
       signal_connect("key_press_event") { |w, e| handle_keyboard_event(e) }
       signal_connect("drag_data_received") { |w, dc, x, y, sd, type, time|
-        handle_drop_event(sd.data, dc, time, false, true)
-      }
-      signal_connect("motion_notify_event") {
-        window.set_cursor(LEFT_PTR)
-        GLib::Source.remove(@cursor_timeout) if @cursor_timeout
-        @cursor_timeout = GLib::Timeout.add(1000) {
-          window.set_cursor(BLANK_CURSOR)
-        } unless @mpv.is_paused
+        handle_drop_event(sd.uris, false, true)
+        Gtk::Drag.finish(dc, true, false, time)
       }
+      signal_connect("motion_notify_event") { mouse_cursor_timeout }
 
-      vbox = Gtk::VBox.new
-      add(vbox)
-
-      args = process_args
-      print_version if args.include?("--version")
-      load_bindings
+      vbox          = Gtk::VBox.new
+      @mpv          = MpvWidget.new(args)
+      @progress_bar = ProgressBarWidget.new
+      @playlist     = Playlist.new
+      @ignore_stop  = false
 
-      @mpv = MpvWidget.new(args, @config["scrobbler"])
       @mpv.signal_connect("file_changed") { |w, file|
-        @playing = file
-        @mpv.send("show_text ${media-title} 1500") if window.state.fullscreen?
+        @playing = URI.decode(file).sub(/^file:\/\/[^\/]*/, "")
+        # hacky work around when mpv catches drag and drop events.
+        unless @playlist.include?(@playing)
+          @playlist.clear(true)
+          if (file = create_playlist(@playing)) != @playing and File.directory?(@playing)
+            @playing = file
+            GLib::Idle.add { @mpv.load_file(@playing); false }
+            # mpv will fail to play the directory and then stop
+            # ignore the next stop event so the playlist does not advance
+            @ignore_stop = true
+          end
+        end
+        @mpv.send("show_text ${media-title} 1500") if window.state.fullscreen? and !@ignore_stop
         @playlist.set_selected(@playing)
         set_title(File.basename(@playing))
       }
-      @mpv.signal_connect("length_changed") { |w, len|
-        @length = len
-        @playlist.update_length(@length)
-      }
+      @mpv.signal_connect("playing_watched") { @playlist.on_playing_watched }
+      @mpv.signal_connect("length_changed") { |w, len| @playlist.update_length(@length = len) }
       @mpv.signal_connect("time_pos_changed") { |w, pos| @progress_bar.value = pos / @length.to_f }
       @mpv.signal_connect("stopped") {
         @progress_bar.value = 0
-        next_file = @playlist.get_next
-        @really_stop = next_file.nil? or @really_stop
         set_title(PACKAGE)
-        if @really_stop and window.state.fullscreen?
-          toggle_fullscreen
-        elsif not @really_stop
-          load_file(next_file, false)
+        unless @ignore_stop
+          next_file = @playlist.get_next
+          @really_stop ||= next_file.nil?
+          if !@really_stop
+            load_file(next_file, false)
+          elsif window.state.fullscreen?
+            toggle_fullscreen
+          end
         end
-        @really_stop = false
+        @really_stop = @ignore_stop = false
       }
 
-      vbox.pack_start(@mpv)
-
-      @playlist = Playlist.new(@config["playlist_x"],
-                               @config["playlist_y"],
-                               @config["playlist_width"],
-                               @config["playlist_height"],
-                               @config["playlist_visible"])
-
-      Gtk::Drag.dest_set(@playlist, Gtk::Drag::DEST_DEFAULT_ALL,
-                         [ [ "text/uri-list", 0, 0 ] ],
-                         Gdk::DragContext::ACTION_LINK)
-
       @playlist.signal_connect("open_file_chooser") { open_file_chooser }
       @playlist.signal_connect("drag_data_received") { |w, dc, x, y, sd, type, time|
-        handle_drop_event(sd.data, dc, time, true, false)
+        handle_drop_event(sd.uris, true, false)
+        Gtk::Drag.finish(dc, true, false, time)
       }
       @playlist.signal_connect("play_entry") { |w, file| load_file(file, false, false, false, true) }
-      @playlist.signal_connect("playing_removed") { @mpv.send("stop"); @really_stop = true }
+      @playlist.signal_connect("playing_removed") { @mpv.stop; @really_stop = true }
+
+      Gtk::Drag.dest_set(@playlist, Gtk::Drag::DEST_DEFAULT_ALL,
+                         [ [ "text/uri-list", 0, 0 ] ],
+                         Gdk::DragContext::ACTION_COPY)
 
-      @progress_bar = ProgressBarWidget.new(@config["bar_color"],
-                                            @config["head_color"],
-                                            @config["progress_bar_height"])
       @progress_bar.add_events(Gdk::Event::BUTTON_PRESS_MASK)
       @progress_bar.signal_connect("button_press_event") { |w, e| handle_seek_event(e) }
-      vbox.pack_start(@progress_bar, false)
 
+      vbox.pack_start(@mpv)
+      vbox.pack_start(@progress_bar, false)
+      add(vbox)
       show_all
-      @mpv.start
-
-      argv = ARGV.join(" ")
-      if not argv.empty?
-        load_file(argv)
-      elsif not @config["playlist"].empty?
-        @config["playlist"].each { |x| load_file(x, true, true, false) }
-        @playlist.set_selected(@config["playlist_selected"])
-      end
-
-      Gtk.main
-    end
-
-    def load_config
-      @config = {
-        "width"                  => Gdk::Screen.default.width > 1280 ? 1280 : 853,
-        "height"                 => Gdk::Screen.default.width > 1280 ? 726  : 486,
-        "x"                      => -1,
-        "y"                      => -1,
-        "fullscreen_progressbar" => false,
-        "progress_bar_visible"   => true,
-        "progress_bar_height"    => 6,
-        "bar_color"              => "#8f5b5b",
-        "head_color"             => "#c48181",
-        "playlist_width"         => 360,
-        "playlist_height"        => 550,
-        "playlist_x"             => 0,
-        "playlist_y"             => 0,
-        "playlist_visible"       => true,
-        "always_save_position"   => false,
-        "scrobbler"              => "",
-        "playlist_selected"      => "",
-        "playlist"               => [ ],
-      }
 
-      if File.exists?(MAIN_CONF)
-        File.readlines(MAIN_CONF).each { |line|
-          key, _, val = line.partition("=")
-          key = key.strip
-          val = val.strip
-          next unless @config.has_key?(key) and not key.start_with?("#")
-
-          if @config[key].is_a?(Integer)
-            val = val.to_i
-          elsif @config[key].is_a?(TrueClass) or @config[key].is_a?(FalseClass)
-            val = val == "true"
-          elsif @config[key].is_a?(Array)
-            val = val.split("|")
-          elsif val.start_with?("#")
-            begin
-              c = Gdk::Color.parse(val)
-            rescue
-              puts("Invalid hexidecimal color for setting `#{key}': `#{val}")
-              c = Gdk::Color.parse(@config[key])
-            end
-            val = c
-          end
-
-          @config[key] = val
-        }
-      end
-    end
-
-    def process_args
-      args = [ ]
-      ARGV.dup.each { |arg|
-        if arg.start_with?("-")
-          args.push(arg)
-          ARGV.delete(arg)
+      if !files.empty?
+        if files.length > 1
+          files.each_with_index { |x, i| load_file(x, true, i != 0, false) }
+        else
+          load_file(files[0])
         end
-      }
-      return args
-    end
-
-    def load_bindings
-      @mouse_bindings = [ ]
-      @key_bindings   = [ ]
-      if File.exists?(INPUT_CONF)
-        File.readlines(INPUT_CONF).each { |line|
-          line = line.strip
-          if line.start_with?("MOUSE_BTN")
-            # 4 = up, 5 = down, 6 = left, 7 = right
-            button, cmd = line.match(/MOUSE_BTN(\d+)(?:_DBL)?\s+(.+)$/).captures
-            button = button.to_i + 1
-            type   = (4..7).include?(button) ? Gdk::Event::SCROLL :
-              line.include?("DBL") ? Gdk::Event::BUTTON2_PRESS : Gdk::Event::BUTTON_PRESS
-            @mouse_bindings[type] = [ ] if @mouse_bindings[type].nil?
-            @mouse_bindings[type][button] = cmd
-          elsif not line.empty?
-            key, cmd = line.match(/^([^\s]+)\s+(.+)$/).captures
-            if name = KEY_NAMES[key.downcase]
-              keyval = Gdk::Keyval.from_name(name)
-            else
-              keyval = Gdk::Keyval.from_name(key)
-            end
-
-            @key_bindings[keyval] = cmd if keyval > 0
-          end
-        }
+      elsif Config["playlist"].length > 0
+        Config["playlist"].each { |x| @playlist.add_file(x["file"], x["length"], x["watched"]) }
+        @playlist.set_selected(Config["playlist_selected"])
       end
+
+      Gtk.main
     end
 
-    def load_file(file, add_to_playlist=true, do_not_play=false, auto_add=true, force_play=false)
-      return if file.nil? or file.empty?
+  private
+    def load_file(file, add_to_playlist = true, do_not_play = false, auto_add = true, force_play = false)
       file = File.expand_path(file) if file[0] == "~"
+      return unless (File.directory?(file) or valid_video_file?(file))
 
       if add_to_playlist
         if @playlist.count == 0 and auto_add and file !~ /^https?:\/\//
-          dir     = File.directory?(file) ? file : File.dirname(file)
-          entries = Dir.entries(dir).sort
-          entries.delete_if { |x| x.start_with?(".") or not valid_video_file(x) }
-          entries.map { |x|
-            x = dir + "/" + x
-            @playlist.add_file(x)
-            file = x if file == dir
-          }
+          file = create_playlist(file)
         else
           @playlist.add_file(file)
         end
@@ -247,19 +153,23 @@ module Ampv
       @mpv.load_file(file, force_play) unless do_not_play
     end
 
+    def create_playlist(file)
+      dir     = File.directory?(file) ? file : File.dirname(file)
+      entries = Dir.entries(dir).sort.map { |x| "#{dir}/#{x}" }
+      entries.delete_if { |x| x[0] == "." || !valid_video_file?(x) }
+      entries.each { |x| @playlist.add_file(x) }
+      file == dir ? entries[0] : file
+    end
+
     def handle_mouse_event(e)
+      mouse_cursor_timeout
       button = e.event_type == Gdk::Event::SCROLL ? WHEEL_BUTTONS[e.direction] : e.button
-      return if @mouse_bindings[e.event_type].nil?
-
-      process_cmd(@mouse_bindings[e.event_type][button])
-
-      return true
+      return if Config["mouse_bindings"][e.event_type].nil?
+      process_cmd(Config["mouse_bindings"][e.event_type][button])
     end
 
     def handle_keyboard_event(e)
-      process_cmd(@key_bindings[e.keyval])
-
-      return true
+      process_cmd(Config["key_bindings"][e.keyval])
     end
 
     def handle_seek_event(e)
@@ -267,19 +177,19 @@ module Ampv
         pos = e.x / allocation.width * @length.to_f
         seek("seek #{pos} absolute")
       end
-
-      return true
     end
 
-    def handle_drop_event(data, context, time, do_not_play, replace)
-      files = URI.decode(data).gsub("file://", "").split("\r\n")
+    def handle_drop_event(files, do_not_play, replace)
       @playlist.clear if replace
+      files.each { |x| load_file(URI.decode(x).sub(/^file:\/\/[^\/]*/, ""), true, do_not_play) }
+    end
 
-      files.each { |x|
-        load_file(x, true, do_not_play) if valid_video_file(x)
-      }
-
-      Gtk::Drag.finish(context, true, true, time)
+    def mouse_cursor_timeout
+      window.set_cursor(LEFT_PTR)
+      GLib::Source.remove(@cursor_timeout) if @cursor_timeout
+      @cursor_timeout = GLib::Timeout.add(1000) {
+        window.set_cursor(BLANK_CURSOR)
+      } unless @mpv.is_paused
     end
 
     def process_cmd(cmd)
@@ -288,6 +198,8 @@ module Ampv
         toggle_fullscreen
       when "cycle pause"
         @mpv.play_pause
+      when "stop"
+        @mpv.stop
       when "cycle playlist"
         @playlist.visible? ? @playlist.hide : @playlist.show
       when /seek /
@@ -309,11 +221,11 @@ module Ampv
       else
         @mpv.send(cmd) if cmd
       end
+      true
     end
 
     def seek(cmd)
-      cmd = "no-osd " + cmd unless cmd.start_with?("no-osd") or
-                               not @progress_bar.visible?
+      cmd = "no-osd " + cmd unless cmd.start_with?("no-osd") or !@progress_bar.visible?
       @mpv.send(cmd)
       @mpv.send("get_property time-pos")
     end
@@ -323,9 +235,10 @@ module Ampv
         @progress_bar.show unless @progress_bar_user_hidden
         unfullscreen
       else
-        @progress_bar.hide unless @config["fullscreen_progressbar"]
+        @progress_bar.hide unless Config["fullscreen_progressbar"]
         fullscreen
       end
+      mouse_cursor_timeout
     end
 
     def toggle_progress_bar
@@ -338,9 +251,8 @@ module Ampv
       end
     end
 
-    def valid_video_file(x)
-      return (VIDEO_EXTS.include?(File.extname(x)) or
-              `file -b --mime-type "#{x}"`.start_with?("video"))
+    def valid_video_file?(x)
+      return (x and File.exists?(x) and !File.directory?(x) and VIDEO_EXTS.include?(File.extname(x).downcase))
     end
 
 
@@ -350,7 +262,6 @@ module Ampv
                                           [ Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL ],
                                           [ Gtk::Stock::OPEN,   Gtk::Dialog::RESPONSE_ACCEPT ])
       dialog.select_multiple = true
-      do_not_play = @playlist.count > 0
 
       filter = Gtk::FileFilter.new
       filter.name = "Video Files"
@@ -363,35 +274,35 @@ module Ampv
       dialog.add_filter(filterAll)
 
       dialog.filenames.each { |x|
+        do_not_play = @playlist.count > 0
         load_file(x, true, do_not_play)
-        do_not_play = true
       } if dialog.run == Gtk::Dialog::RESPONSE_ACCEPT
       dialog.destroy
     end
 
     def print_version
-      puts("#{PACKAGE} - v#{VERSION}\n" +
-           "ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{RUBY_PLATFORM}]\n\n" +
-          `#{MpvWidget::PATH} --version`)
+      puts("#{PACKAGE} - v#{VERSION} (C) 2013-2014 ahoka\n" +
+           `ruby --version` +
+           `#{MpvWidget::PATH} --version`)
       exit
     end
 
-    def quit(watch_later=false)
-      @config["x"],
-      @config["y"],
-      @config["width"],
-      @config["height"]               = window.geometry unless window.state.fullscreen?
-      @config["playlist_x"],
-      @config["playlist_y"],
-      @config["playlist_width"],
-      @config["playlist_height"]      = @playlist.window.geometry
-      @config["playlist_visible"]     = @playlist.visible?
-      @config["playlist_selected"]    = @playing
-      @config["playlist"]             = @playlist.get_entries.join("|")
-      @config["progress_bar_visible"] = @progress_bar.visible?
-      File.open(MAIN_CONF, "w") { |file| @config.each { |k, v| file.puts("#{k}=#{v}") } }
-
-      @mpv.quit(@config["always_save_position"] ? true : watch_later)
+    def quit(watch_later = false)
+      Config["x"],
+      Config["y"],
+      Config["width"],
+      Config["height"]               = window.geometry unless window.state.fullscreen?
+      Config["playlist_x"],
+      Config["playlist_y"],
+      Config["playlist_width"],
+      Config["playlist_height"]      = @playlist.window.geometry
+      Config["playlist_visible"]     = @playlist.visible?
+      Config["playlist_selected"]    = @playing
+      Config["playlist"]             = @playlist.get_entries.to_json
+      Config["progress_bar_visible"] = @progress_bar.visible?
+      Config.save
+
+      @mpv.quit(Config["always_save_position"] ? true : watch_later)
       Gtk.main_quit
     end
   end

data/lib/ampv/config.rb

@@ -0,0 +1,120 @@
+module Ampv
+  class Config
+
+    @@config_file  = "#{(ENV["XDG_CONFIG_HOME"] || "#{Dir.home}/.config")}/ampv.conf"
+    @@input_config = File.exists?("#{Dir.home}/.mpv/input.conf") ?
+                      "#{Dir.home}/.mpv/input.conf" : File.expand_path("../../../input.conf", __FILE__)
+    @@key_names    = {
+      "esc"         => "Escape",
+      "space"       => "space",
+      "right"       => "Right",
+      "left"        => "Left",
+      "up"          => "Up",
+      "down"        => "Down",
+      "pgup"        => "Page_Up",
+      "pgdwn"       => "Page_Down",
+      "home"        => "Home",
+      "end"         => "End",
+      "ins"         => "Insert",
+      "del"         => "Delete",
+    }
+    @@config       = { }
+    @@defaults     = {
+        "width"                  => Gdk::Screen.default.width > 1280 ? 1280 : 853,
+        "height"                 => Gdk::Screen.default.width > 1280 ? 726  : 486,
+        "x"                      => -1,
+        "y"                      => -1,
+        "fullscreen_progressbar" => false,
+        "progress_bar_visible"   => true,
+        "progress_bar_height"    => 6,
+        "bar_color"              => Gdk::Color.parse("#8f5b5b"),
+        "head_color"             => Gdk::Color.parse("#c48181"),
+        "playlist_width"         => 360,
+        "playlist_height"        => 550,
+        "playlist_x"             => 0,
+        "playlist_y"             => 0,
+        "playlist_visible"       => true,
+        "always_save_position"   => false,
+        "scrobbler"              => "",
+        "playlist_selected"      => "",
+        "playlist"               => [ ],
+        "key_bindings"           => [ ],
+        "mouse_bindings"         => [ ]
+    }
+
+    def self.load
+      if File.exists?(@@config_file)
+        File.readlines(@@config_file).each { |line|
+          key, _, val = line.partition("=")
+          key.strip!
+          val.strip!
+          next unless @@defaults.has_key?(key) and key[0] != "#"
+
+          if @@defaults[key].is_a?(Integer)
+            val = val.to_i
+          elsif @@defaults[key].is_a?(TrueClass) or  @@defaults[key].is_a?(FalseClass)
+            val = val == "true"
+          elsif @@defaults[key].is_a?(Gdk::Color)
+            begin
+              val = Gdk::Color.parse(val)
+            rescue
+              puts("Invalid hexidecimal color for setting `#{key}': `#{val}'")
+              next
+            end
+          elsif key == "playlist"
+            begin
+              val = JSON.parse(val)
+            rescue
+              puts("Failed to parse playlist JSON array.")
+              next
+            end
+          end
+
+          @@config[key] = val
+        }
+      end
+
+      # load input config
+      self["mouse_bindings"] = [ ]
+      self["key_bindings"]   = [ ]
+      if File.exists?(@@input_config)
+        File.readlines(@@input_config).each { |line|
+          line.strip!
+          if line.start_with?("MOUSE_BTN")
+            # 4 = up, 5 = down, 6 = left, 7 = right
+            button, cmd = line.match(/MOUSE_BTN(\d+)(?:_DBL)?\s+(.+)$/).captures
+            button = button.to_i + 1
+            type   = (4..7).include?(button) ? Gdk::Event::SCROLL :
+              line.include?("DBL") ? Gdk::Event::BUTTON2_PRESS : Gdk::Event::BUTTON_PRESS
+            self["mouse_bindings"][type] = [ ] if self["mouse_bindings"][type].nil?
+            self["mouse_bindings"][type][button] = cmd
+          elsif !line.empty?
+            key, cmd = line.match(/^([^\s]+)\s+(.+)$/).captures
+            if name = @@key_names[key.downcase]
+              keyval = Gdk::Keyval.from_name(name)
+            else
+              keyval = Gdk::Keyval.from_name(key)
+            end
+
+            self["key_bindings"][keyval] = cmd if keyval > 0
+          end
+        }
+      end
+    end
+
+    def self.[](key)
+      @@config[key].nil? ? @@defaults[key] : @@config[key]
+    end
+
+    def self.[]=(key, value)
+      @@config[key] = value
+    end
+
+    def self.save
+      File.open(@@config_file, "w") { |file|
+        @@config.each { |k, v| file.puts("#{k}=#{v}") unless k == "key_bindings" or k == "mouse_bindings" }
+      }
+    end
+  end
+end
+

data/lib/ampv/mpvwidget.rb

@@ -1,4 +1,5 @@
 require "fifo"
+require "tmpdir"
 
 module Ampv
   class MpvWidget < Gtk::EventBox
@@ -6,112 +7,115 @@ module Ampv
     type_register
     signal_new("file_changed", GLib::Signal::RUN_FIRST, nil, nil, String)
     signal_new("length_changed", GLib::Signal::RUN_FIRST, nil, nil, Integer)
+    signal_new("playing_watched", GLib::Signal::RUN_FIRST, nil, nil)
     signal_new("time_pos_changed", GLib::Signal::RUN_FIRST, nil, nil, Float)
     signal_new("stopped", GLib::Signal::RUN_FIRST, nil, nil)
 
-    PATH = "/usr/bin/mpv"
+    ENV["PATH"].split(":").each { |x|
+      if File.executable?("#{x}/mpv")
+        PATH = "#{x}/mpv"
+        break
+      end
+    }
 
     attr_reader :is_paused
 
-    def initialize(args, scrobbler)
+    def initialize(args)
       if args.include?("--debug")
         args.delete("--debug")
         @debug = true
       end
 
-      @scrobbler   = scrobbler
-      @mpv_path    = "/usr/bin/mpv"
       @mpv_options = args.join(" ")
-      @mpv_fifo    = "/tmp/mpv.fifo." + Process.pid.to_s
+      @mpv_fifo    = "#{Dir.tmpdir}/mpv.fifo." + Process.pid.to_s
+      @is_paused   = true
 
       super()
+      signal_connect("realize") { start }
 
       @socket = Gtk::Socket.new
       @socket.modify_bg(Gtk::STATE_NORMAL, Gdk::Color.parse("#000"))
-
       @socket.signal_connect("plug_removed") { signal_emit("stopped"); true }
-      add(@socket)
-    end
 
-    def start
-      if @thread.nil?
-        @fifo = Fifo.new(@mpv_fifo, :w, :nowait)
-
-        cmd = "#{@mpv_path} \
-          --identify \
-          --idle \
-          --input-file=#{@mpv_fifo} \
-          --no-mouse-movements \
-          --cursor-autohide=no \
-          --msglevel=all=info \
-          --wid=#{@socket.id} #{@mpv_options}"
-        @thread = Thread.new { slave_reader(cmd) }
-      end
+      add(@socket)
     end
 
     def send(cmd)
-      @fifo.puts(cmd) unless @fifo.nil?
+      @fifo.puts(cmd) if @fifo
     end
 
-    def load_file(file, force_play=false)
+    def load_file(file, force_play = false)
       send("loadfile \"#{file}\"")
       @force_play = force_play
     end
 
     def play_pause
       send("cycle pause")
-      @is_paused = @is_paused ? false : true
+      @is_paused = !@is_paused
+    end
+
+    def stop
+      send("stop")
+      @is_paused = true
     end
 
     def quit(watch_later)
       send("quit" + (watch_later ? "_watch_later" : ""))
-      @thread.join unless @thread.nil? or not @thread.alive?
+      @thread.kill if @thread
+      @prog_thread.kill if @prog_thread
       @fifo.close
-      File.delete(@mpv_fifo)
     end
 
   private
-    def slave_reader(cmd)
-      @pipe = IO.popen(cmd, "a+")
-
-      until @pipe.nil? or @pipe.closed? or @pipe.eof?
-        line = @pipe.readline.chomp
-        if line.include?("ID_FILENAME=")
-          signal_emit("file_changed", (@playing = line.partition("ID_FILENAME=").last))
-          send("get_property pause") # saved position also saves play state
-
-          @prog_thread.kill unless @prog_thread.nil? or not @prog_thread.alive?
-          @prog_thread = Thread.new { progress_update }
-        elsif line.start_with?("ID_LENGTH=")
-          signal_emit("length_changed", (@length = line.rpartition("=").last.to_i))
-        elsif line.start_with?("ANS_pause=")
-          @is_paused = line.rpartition("=").last == "yes"
-          play_pause if @force_play and @is_paused
-        elsif line.start_with?("ANS_time-pos=")
-          signal_emit("time_pos_changed", line.rpartition("=").last.to_f)
-        end
-
-        if @debug or line.start_with?("Error")
-          puts(line) unless line.start_with?("ANS_time-pos=") or
-                            line.start_with?("ANS_ERROR") or
-                            line.start_with?("Failed to get") or
-                            line.start_with?("Command ")
-        end
-      end
+    def start
+      return if @thread and @thread.alive?
+      @fifo = Fifo.new(@mpv_fifo, :w, :nowait)
+      ObjectSpace.define_finalizer(self, proc { File.delete(@mpv_fifo) })
+
+      cmd = "#{PATH} \
+        --idle \
+        --input-file=#{@mpv_fifo} \
+        --cursor-autohide=no \
+        --no-mouse-movements \
+        --msglevel=all=info \
+        --wid=#{@socket.id} #{@mpv_options}"
+
+      @thread = Thread.start {
+        IO.popen(cmd) { |io|
+          io.each { |line|
+            line.chomp!
+            if line.include?("Playing: ")
+              signal_emit("file_changed", (@playing = line.partition("Playing: ")[-1]))
+              send("get_property length")
+              send("get_property time-pos")
+              send("get_property pause")
+            elsif line.start_with?("ANS_length=")
+              signal_emit("length_changed", (@length = line.rpartition("=")[-1].to_i))
+            elsif line.start_with?("ANS_pause=")
+              @is_paused = line.rpartition("=")[-1] == "yes"
+              @prog_thread.kill if @prog_thread
+              @prog_thread = Thread.new { progress_update }
+              play_pause if @force_play and @is_paused
+            elsif line.start_with?("ANS_time-pos=")
+              signal_emit("time_pos_changed", line.rpartition("=")[-1].to_f)
+            end
+
+            puts(line) if @debug and !line.start_with?("ANS_")
+          }
+        }
+      }
     end
 
     def progress_update
       scrobbled = false
       watched = 0
-
       loop {
         send("get_property time-pos") unless @is_paused
-
-        unless @scrobbler.nil? or scrobbled or watched < @length * 0.5
-          system("#{@scrobbler} \"#{@playing}\"")
+        unless scrobbled or watched < @length * 0.5
+          system("#{Config["scrobbler"]} \"#{@playing}\"") if Config["scrobbler"]
+          signal_emit("playing_watched")
           scrobbled = true
         end
-
         sleep(1)
         watched += 1 unless @is_paused
       }
@@ -119,9 +123,10 @@ module Ampv
 
     def signal_do_file_changed(file) end
     def signal_do_length_changed(len) end
+    def signal_do_playing_watched; end
     def signal_do_time_pos_changed(pos) end
-    def signal_do_stopped()
-      @prog_thread.kill
+    def signal_do_stopped
+      @prog_thread.kill if @prog_thread
     end
   end
 end

data/lib/ampv/playlist.rb

@@ -1,5 +1,3 @@
-#require "gtk2"
-
 module Ampv
   class Playlist < Gtk::Window
 
@@ -8,7 +6,9 @@ module Ampv
     signal_new("playing_removed", GLib::Signal::RUN_FIRST, nil, nil)
     signal_new("open_file_chooser", GLib::Signal::RUN_FIRST, nil, nil)
 
-    def initialize(x, y, w, h, is_visible)
+    WATCHED_PIXBUF = Gtk::Invisible.new.render_icon(Gtk::Stock::OK, Gtk::IconSize::MENU)
+
+    def initialize
       buttons = {
         [ Gtk::Stock::OPEN,    "Add to Playlist" ] => lambda { signal_emit("open_file_chooser") },
         [ Gtk::Stock::GO_UP,   "Move Up"         ] => lambda { move_selected_up                 },
@@ -17,11 +17,11 @@ module Ampv
         [ Gtk::Stock::CLEAR,   "Clear Playlist"  ] => lambda { clear                            }
       }
 
-      super()
+      super
       set_title("Playlist - #{PACKAGE}")
-      set_default_size(w, h)
+      set_default_size(Config["playlist_width"], Config["playlist_height"])
       set_skip_taskbar_hint(true)
-      move(x, y)
+      move(Config["playlist_x"], Config["playlist_y"])
 
       signal_connect("show") { move(@pos[0], @pos[1]) unless @pos.nil? }
       signal_connect("hide") { @pos = window.root_origin }
@@ -31,38 +31,36 @@ module Ampv
         hide_on_delete if e.keyval == Gdk::Keyval::GDK_Escape
       }
 
-      vbox = Gtk::VBox.new(false, 10)
-      vbox.border_width = 10
-      add(vbox)
+      vbox      = Gtk::VBox.new(false, 10)
+      sw        = Gtk::ScrolledWindow.new
+      @model    = Gtk::ListStore.new(String, String, Gdk::Pixbuf)
+      @treeview = Gtk::TreeView.new(@model)
+      hbox      = Gtk::HBox.new(true, 5)
+      @menu     = Gtk::Menu.new
 
-      sw = Gtk::ScrolledWindow.new
+      vbox.border_width = 10
       sw.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
-      vbox.pack_start(sw)
 
-      @model    = Gtk::ListStore.new(String, String)
-      @treeview = Gtk::TreeView.new(@model)
       @treeview.enable_search  = false
       @treeview.rubber_banding = true
       @treeview.reorderable = true
       @treeview.selection.mode = Gtk::SELECTION_MULTIPLE
+      @treeview.tooltip_column = 0
 
-      @treeview.signal_connect("row_activated") { |_w, p, c|
+      @treeview.signal_connect("row_activated") { |w, p, c|
         signal_emit("play_entry", @model.get_iter(p)[0])
       }
-      @treeview.signal_connect("key_press_event") { |_w, e|
+      @treeview.signal_connect("key_press_event") { |w, e|
         remove_selected if e.keyval == Gdk::Keyval::GDK_Delete
       }
-      @treeview.signal_connect("button_press_event") { |_w, e|
-        @menu.popup(nil, nil, e.button, e.time) if
-          e.event_type == Gdk::Event::BUTTON_PRESS and e.button == 3
+      @treeview.signal_connect("button_press_event") { |w, e|
+        @menu.popup(nil, nil, e.button, e.time) if e.event_type == Gdk::Event::BUTTON_PRESS and e.button == 3
       }
 
-      ["Name", "Length"].each_with_index { |_x, i|
+      ["Name", "Length"].each_with_index { |x, i|
         renderer = Gtk::CellRendererText.new
-        column   = Gtk::TreeViewColumn.new(_x,
-                                           renderer,
-                                           :text => i)
-        if _x == "Name"
+        column   = Gtk::TreeViewColumn.new(x, renderer, :text => i)
+        if x == "Name"
           renderer.ellipsize = Pango::ELLIPSIZE_MIDDLE
           column.expand = true
           column.set_cell_data_func(renderer) { |t, c, m, j|
@@ -72,105 +70,87 @@ module Ampv
 
         @treeview.append_column(column)
       }
-
-      sw.add(@treeview)
-
-      hbox = Gtk::HBox.new(true, 5)
+      @treeview.append_column(Gtk::TreeViewColumn.new("", Gtk::CellRendererPixbuf.new, :pixbuf => 2))
 
       buttons.each { |k, v|
         button = Gtk::Button.new
+        item   = Gtk::ImageMenuItem.new(k[1])
+
         button.image = Gtk::Image.new(k[0], Gtk::IconSize::BUTTON)
         button.height_request = 36
         button.set_tooltip_text(k[1])
         button.signal_connect("clicked") { v.call }
-        hbox.pack_start(button)
-      }
-
-      vbox.pack_start(hbox, false)
 
-      @menu = Gtk::Menu.new
-      buttons.each { |k, v|
-        item = Gtk::ImageMenuItem.new(k[1])
         item.image = Gtk::Image.new(k[0], Gtk::IconSize::MENU)
         item.signal_connect("activate") { v.call }
+
+        hbox.pack_start(button)
         @menu.append(item)
       }
+
+      sw.add(@treeview)
+      vbox.pack_start(sw)
+      vbox.pack_start(hbox, false)
+      add(vbox)
       @menu.show_all
 
-      show_all if is_visible
+      show_all if Config["playlist_visible"]
     end
 
     def count
       i = 0
       @model.each { i += 1 }
-      return i
+      i
     end
 
-    def add_file(file)
-      contains = false
-      @model.each { |m, p, iter|
-        if iter[0] == file
-          contains = true
-          break
-        end
-      }
-      unless contains
+    def add_file(file, length = nil, watched = false)
+      unless include?(file)
         iter = @model.append
         iter[0] = file
+        iter[1] = length if length
+        iter[2] = WATCHED_PIXBUF if watched
       end
     end
 
-    def move_selected_up
-      @treeview.selection.selected_rows.each { |path|
-        tmp = path.dup
-        break if not tmp.prev! or @treeview.selection.selected_rows.include?(tmp)
-        @model.move_before(@model.get_iter(path), @model.get_iter(tmp))
-      }
+    def on_playing_watched
+      @playing_iter[2] = WATCHED_PIXBUF
     end
 
-    def move_selected_down
-      @treeview.selection.selected_rows.reverse.each { |path|
-        break if @treeview.selection.selected_rows.include?((tmp = path.dup.next!))
-        tmp = @model.get_iter(tmp)
-        @model.move_after(@model.get_iter(path), tmp) unless tmp.nil?
-      }
-    end
-
-    def remove_selected
-      to_remove = [ ]
-      @treeview.selection.selected_rows.each { |path|
-        to_remove.push(@model.get_iter(path))
-      }
-      to_remove.each { |iter|
-        signal_emit("playing_removed") if iter[0] == @playing
-        @model.remove(iter)
-      }
+    def include?(file)
+      @model.each { |m, p, iter| return true if iter[0] == file }
+      false
     end
 
     def get_next
       @model.each { |m, p, iter|
-        return iter.next! ? iter[0] : nil if iter[0] == @playing
+        return iter.next! ? iter[0] : nil if iter == @playing_iter
       }
-      return nil
+      nil
     end
 
     def get_prev
       prev = nil
       @model.each { |m, p, iter|
-        return prev if iter[0] == @playing
+        return prev if iter == @playing_iter
         prev = iter[0]
       }
     end
 
     def get_entries
       entries = [ ]
-      @model.each { |m, p, iter| entries.push(iter[0]) }
-      return entries
+      @model.each { |m, p, iter|
+        entries << {
+          "file"    => iter[0],
+          "length"  => iter[1] ? iter[1] : "",
+          "watched" => !iter[2].nil?
+        }
+      }
+      entries
     end
 
-    def clear
+    def clear(quiet = false)
       @model.clear
-      signal_emit("playing_removed")
+      signal_emit("playing_removed") unless quiet or @playing_iter.nil?
     end
 
     def set_selected(file)
@@ -179,6 +159,7 @@ module Ampv
       @model.each { |m, p, iter|
         if iter[0] == @playing
           @treeview.set_cursor(Gtk::TreePath.new(i), nil, false)
+          @playing_iter = iter
           break
         end
         i += 1
@@ -186,15 +167,40 @@ module Ampv
     end
 
     def update_length(length)
-      @model.each { |m, p, iter|
-        if iter[0] == @playing
-          iter[1] = Time.at(length).utc.strftime("%H:%M:%S") unless length == 0
-          break
-        end
-      }
+      return if length == 0
+      @playing_iter[1] = Time.at(length).utc.strftime("%H:%M:%S") if @playing_iter
     end
 
   private
+    def move_selected_up
+      @treeview.selection.selected_rows.each { |path|
+        tmp = path.dup
+        # prev!: Returns: true if path has a previous node, and the move was made.
+        break unless tmp.prev! or @treeview.selection.selected_rows.include?(tmp)
+        @model.move_before(@model.get_iter(path), @model.get_iter(tmp))
+      }
+    end
+
+    def move_selected_down
+      @treeview.selection.selected_rows.reverse.each { |path|
+        # next!: Moves the path to point to the next node at the current depth. Returns self
+        break if @treeview.selection.selected_rows.include?(tmp = path.dup.next!)
+        tmp = @model.get_iter(tmp)
+        @model.move_after(@model.get_iter(path), tmp) unless tmp.nil?
+      }
+    end
+
+    def remove_selected
+      to_remove = [ ]
+      @treeview.selection.selected_rows.each { |path|
+        to_remove << @model.get_iter(path)
+      }
+      to_remove.each { |iter|
+        signal_emit("playing_removed") if iter == @playing_iter
+        @model.remove(iter)
+      }
+    end
+
     def signal_do_play_entry(file) end
     def signal_do_playing_removed() end
     def signal_do_open_file_chooser() end

data/lib/ampv/progressbarwidget.rb

@@ -1,30 +1,27 @@
-
 module Ampv
   class ProgressBarWidget < Gtk::DrawingArea
-    def initialize(bar_color, head_color, height)
-      super()
+
+    def initialize
+      super
       modify_bg(Gtk::STATE_NORMAL, Gdk::Color.parse("#000"))
-      set_size_request(-1, height)
+      set_size_request(-1, Config["progress_bar_height"])
 
-      signal_connect("expose_event") {
-        @cx = window.create_cairo_context
-        draw_widget
-      }
       @value      = 0
-      @bar_color  = bar_color
-      @head_color = head_color
-    end
+      @bar_color  = Config["bar_color"]
+      @head_color = Config["head_color"]
 
-    def draw_widget
-      @cx.set_source_color(@bar_color)
-      @cx.rectangle(0, 0, (allocation.width * @value.to_f).round, allocation.height)
-      @cx.fill
-
-      if @value > 0
-        @cx.set_source_color(@head_color)
-        @cx.rectangle((allocation.width * @value.to_f).round, 0, 2, allocation.height)
+      signal_connect("expose_event") {
+        @cx = window.create_cairo_context
+        @cx.set_source_color(@bar_color)
+        @cx.rectangle(0, 0, (allocation.width * @value.to_f).round, allocation.height)
         @cx.fill
-      end
+
+        if @value > 0
+          @cx.set_source_color(@head_color)
+          @cx.rectangle((allocation.width * @value.to_f).round, 0, 2, allocation.height)
+          @cx.fill
+        end
+      }
     end
 
     def value=(v)

data/lib/ampv/version.rb

@@ -1,6 +1,5 @@
-
 module Ampv
   PACKAGE = "ampv"
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ampv
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - ahoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
@@ -24,6 +24,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-fifo
   requirement: !ruby/object:Gem::Requirement
@@ -47,10 +61,11 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - input.conf
+- lib/ampv/config.rb
 - lib/ampv/playlist.rb
-- lib/ampv/mpvwidget.rb
 - lib/ampv/version.rb
 - lib/ampv/progressbarwidget.rb
+- lib/ampv/mpvwidget.rb
 - lib/ampv.rb
 - bin/ampv
 homepage: https://github.com/ahodesuka/ampv
@@ -72,8 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- gtk2
-- mpv
+- mpv v0.3.x
 rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: