ampv 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDlmNGYzOTM1YzRmYTQ2ZmI4MDkzZjhjYWQ4ODgwMDlkNjU4YjU5MQ==
-  data.tar.gz: !binary |-
-    M2ZlYmE2N2QxZGIxNmJjNmYxMjc4ZTgzMTg5N2U5ZTQyNjkyM2ZiMQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDMyMTlkZDc0NTk5YTIzOGRjOGJhZDRkYzlkNjFiM2NkYzI2ZGY2MGE5ZTBk
-    Mzc5YzkzYWQ0MGNjMDMxZTQyNzdlOGZhZjVhYmZiMzg2MDlmMTFmYjdjN2Jk
-    NTk0ZGU1ZWQ0MTg2MTZjZjc5OWQ2MmZkMjJhMWY5ODI1OTczNTU=
-  data.tar.gz: !binary |-
-    YmYwZDRiYWQyNjg0NTM5Y2JkNGY5NzZjY2Y4MjVmOGI3ODRjOWQyMzU0MmEx
-    MWUwZjEwZDdlZWVlMTEwZTc2OTFmMWY0MzI4YTc5OTFmYmI2NjVhYzlhMTVi
-    MDY0N2MxMzI2MTY5MTAxMGNkMWI5YTE3ZDBlOWM2NDFlZGQ2YmM=
+SHA1:
+  metadata.gz: 67bcc7597fa24e08ca81a50a2bbb810a95fcf937
+  data.tar.gz: 67c22c9f18bacff3c12a077242db957868967a7a
+SHA512:
+  metadata.gz: 8311e6dd3454d64619ca7a9f81822f30cd85250e60275d85079b3217fe2c26793e4e822d304c6e1a695892fb590189f9d50764196fd30d1b409011bb952337be
+  data.tar.gz: bdcdcf12923d80c54a19022e7463ea6e2dc80758b789f1f29f5975cf33ec5cdc20c3fb44dc7450121dd8dcb66135d9d58c69281c57dd1f4bfc959e74d92c5c05

data/lib/ampv.rb

@@ -57,7 +57,9 @@ module Ampv
       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.uris, false, true)
+        files = sd.uris.map { |f| URI.decode(f).sub(/^file:\/\/[^\/]*/, "") }
+        @playlist.clear(true) unless @playlist.get_files & files == files
+        load_files(files)
         Gtk::Drag.finish(dc, true, false, time)
       }
       signal_connect("motion_notify_event") { mouse_cursor_timeout }
@@ -95,7 +97,7 @@ module Ampv
           next_file = @playlist.get_next
           @really_stop ||= next_file.nil?
           if !@really_stop
-            load_file(next_file, false)
+            @mpv.load_file(next_file)
           elsif window.state.fullscreen?
             toggle_fullscreen
           end
@@ -105,10 +107,10 @@ module Ampv
 
       @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.uris, true, false)
+        sd.uris.each { |f| @playlist.add_file(URI.decode(f).sub(/^file:\/\/[^\/]*/, "")) }
         Gtk::Drag.finish(dc, true, false, time)
       }
-      @playlist.signal_connect("play_entry") { |w, file| load_file(file, false, false, false, true) }
+      @playlist.signal_connect("play_entry") { |w, file| @mpv.load_file(file, true) }
       @playlist.signal_connect("playing_removed") { @mpv.stop; @really_stop = true }
 
       Gtk::Drag.dest_set(@playlist, Gtk::Drag::DEST_DEFAULT_ALL,
@@ -125,9 +127,9 @@ module Ampv
 
       if !files.empty?
         if files.length > 1
-          files.each_with_index { |x, i| load_file(x, true, i != 0, false) }
+          load_files(files)
         else
-          load_file(files[0])
+          load_file(files[0], false)
         end
       elsif Config["playlist"].length > 0
         Config["playlist"].each { |x| @playlist.add_file(x["file"], x["length"], x["watched"]) }
@@ -142,19 +144,32 @@ module Ampv
     end
 
   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))
+    def load_file(file, auto_add = true, play = true)
+      if file =~ /^#{URI::regexp}$/
+        uri = true
+      else
+        file = File.expand_path(file)
+      end
 
-      if add_to_playlist
-        if @playlist.count == 0 and auto_add and file !~ /^https?:\/\//
-          file = create_playlist(file)
-        else
-          @playlist.add_file(file)
-        end
+      return unless File.directory?(file) or valid_video_file?(file) or uri
+
+      if @playlist.count == 0 and auto_add
+        file = create_playlist(file)
+      elsif !@playlist.include?(file)
+        @playlist.add_file(file)
       end
 
-      @mpv.load_file(file, force_play) unless do_not_play
+      @mpv.load_file(file) if play
+    end
+
+    def load_files(files)
+      if files.length == 1
+        load_file(files[0])
+      else
+        files.each_with_index { |x, i|
+          load_file(x, false, i == 0)
+        }
+      end
     end
 
     def create_playlist(file)
@@ -183,11 +198,6 @@ module Ampv
       end
     end
 
-    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
-
     def mouse_cursor_timeout
       window.set_cursor(LEFT_PTR)
       GLib::Source.remove(@cursor_timeout) if @cursor_timeout
@@ -211,9 +221,11 @@ module Ampv
       when /add chapter/
         seek(cmd)
       when "playlist_next"
-        load_file(@playlist.get_next, false)
+        file = @playlist.get_next
+        @mpv.load_file(file) if file
       when "playlist_prev"
-        load_file(@playlist.get_prev, false)
+        file = @playlist.get_prev
+        @mpv.load_file(file) if file
       when "open_file_chooser"
         open_file_chooser
       when "cycle progress_bar"
@@ -256,10 +268,9 @@ module Ampv
     end
 
     def valid_video_file?(x)
-      return (x and File.exists?(x) and !File.directory?(x) and VIDEO_EXTS.include?(File.extname(x).downcase))
+      return (x and File.exists?(x) and File.file?(x) and VIDEO_EXTS.include?(File.extname(x).downcase))
     end
 
-
     def open_file_chooser
       dialog = Gtk::FileChooserDialog.new("Open File - #{PACKAGE}",
                                           self, Gtk::FileChooser::ACTION_OPEN, nil,
@@ -277,10 +288,7 @@ module Ampv
       filterAll.add_pattern("*.*")
       dialog.add_filter(filterAll)
 
-      dialog.filenames.each { |x|
-        do_not_play = @playlist.count > 0
-        load_file(x, true, do_not_play)
-      } if dialog.run == Gtk::Dialog::RESPONSE_ACCEPT
+      load_files(dialog.filenames) if dialog.run == Gtk::Dialog::RESPONSE_ACCEPT
       dialog.destroy
     end
 

data/lib/ampv/playlist.rb

@@ -7,6 +7,7 @@ module Ampv
     signal_new("open_file_chooser", GLib::Signal::RUN_FIRST, nil, nil)
 
     WATCHED_PIXBUF = Gtk::Invisible.new.render_icon(Gtk::Stock::OK, Gtk::IconSize::MENU)
+    PLAYING_PIXBUF = Gtk::Invisible.new.render_icon(Gtk::Stock::MEDIA_PLAY, Gtk::IconSize::MENU)
 
     def initialize
       buttons = {
@@ -114,6 +115,7 @@ module Ampv
 
     def on_playing_watched
       @playing_iter[2] = WATCHED_PIXBUF
+      @current_is_watched = true
     end
 
     def include?(file)
@@ -148,6 +150,12 @@ module Ampv
       entries
     end
 
+    def get_files
+      files = [ ]
+      @model.each { |m, p, iter| files << iter[0] }
+      files
+    end
+
     def clear(quiet = false)
       @model.clear
       signal_emit("playing_removed") unless quiet or @playing_iter.nil?
@@ -158,8 +166,14 @@ module Ampv
       i = 0
       @model.each { |m, p, iter|
         if iter[0] == @playing
+          # reset icon for previous playing entry
+          if @playing_iter
+            @playing_iter[2] = @current_is_watched ? WATCHED_PIXBUF : nil
+          end
           @treeview.set_cursor(Gtk::TreePath.new(i), nil, false)
           @playing_iter = iter
+          @current_is_watched = @playing_iter[2] == WATCHED_PIXBUF
+          @playing_iter[2] = PLAYING_PIXBUF
           break
         end
         i += 1

data/lib/ampv/version.rb

@@ -1,5 +1,5 @@
 module Ampv
   PACKAGE = "ampv"
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end
 

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ampv
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - ahoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
   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: 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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A minimal GTK2 mpv frontend.
@@ -61,11 +61,11 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - input.conf
-- lib/ampv/playlist.rb
-- lib/ampv/version.rb
 - lib/ampv/mpvwidget.rb
 - lib/ampv/progressbarwidget.rb
 - lib/ampv/config.rb
+- lib/ampv/playlist.rb
+- lib/ampv/version.rb
 - lib/ampv.rb
 - bin/ampv
 homepage: https://github.com/ahodesuka/ampv
@@ -78,12 +78,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: