gtk2mp3 1.5.0 → 2.5.191217

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4f79f5bc2924956a93650f0a670b8bc7b488d7cc569ee791f2917ba31e18bc1
-  data.tar.gz: 66280432b988ad1434b31d6f05c5b7ea170b337c1e2ba65a981ee7e3d39a612a
+  metadata.gz: 44f275e94c4638c8571bc8f08aff3b3530fb880fdc618ff5db7d3127d74be392
+  data.tar.gz: ecb239912c273b285001c0ad0794543647703d4d5d7760ecd66dda86eb694f83
 SHA512:
-  metadata.gz: 01d6edc0a0be541ca19846b33073e4c9e5691435888c2c898315ab8686e55eadcca7193d4a01a25de0d5ac1029182bbecdb2e6737362e7d700ef2eb38f50d95c
-  data.tar.gz: 409c5d5283188ca8c2e5229b0fdf585290c88564245b3b070277777fb5eed4c955e5aa63b58e82fc72fe692a5a0f321e655068e271ca11b761c31fc34efb0ecc
+  metadata.gz: f8396b6d71a498084af8a5fd1025974a3cccbb100ff87e4a64de8332b6b5bc33cf84a7039de2dbf356e6c67576a9d1d9209b04df609205e6ec775539d3a05377
+  data.tar.gz: 1c01f0c6edca39f25258b261b983fc340ae41434c65369273b87872eecefb93dbb536c8fd4ef1cae051e0de29a048c0c6deb6b6bad3e9a9c5c85e8c65e4fa823

data/README.md

@@ -24,8 +24,11 @@ A "Next!" button gui for MPD/MPC.
       -h --help
       -v --version
       --noinit    	Don't reset the playlist
+      -V --verbose
     # Notes #
     # Signal USR1 will trigger Next! song.
+    # Signal USR2 will trigger Stop song.
+    # Signal TERM will quit.
     # Requires MPD/MPC.
     # See https://www.musicpd.org/clients/mpc/.
 

data/bin/gtk2mp3

@@ -1,41 +1,43 @@
 #!/usr/bin/env ruby
 require 'help_parser'
-require 'gtk2mp3'
 
-OPTIONS = HelpParser[Gtk2Mp3::VERSION, <<HELP]
+OPTIONS = HelpParser['2.5.191217', <<HELP]
 Usage:
   gtk2mp3 [:options+]
 Options:
   -h --help
   -v --version
   --noinit    \tDon't reset the playlist
+  -V --verbose
 # Notes #
 # Signal USR1 will trigger Next! song.
+# Signal USR2 will trigger Stop song.
+# Signal TERM will quit.
 # Requires MPD/MPC.
 # See https://www.musicpd.org/clients/mpc/.
 HELP
 
+TO_DEV_NULL = OPTIONS.verbose? ? '' : '> /dev/null'
 unless OPTIONS.noinit?
-  unless system 'ps -C mpd'
-    unless system 'mpd'
+  # check if mpd is already running
+  unless system "ps -C mpd #{TO_DEV_NULL}"
+    unless system "mpd #{TO_DEV_NULL}"
       $stderr.puts 'Could not start the mpd daemon.'
       exit 69 # EX_UNAVAILABLE
     end
   end
-  unless system "mpc --wait update" and
-      system "mpc clear"            and
-      system "mpc ls | mpc add"     and
-      system "mpc consume off"      and
-      system "mpc repeat off"       and
-      system "mpc random on"        and
-      system "mpc single on"
+  unless system "mpc --wait update #{TO_DEV_NULL}" and
+      system "mpc clear #{TO_DEV_NULL}"            and
+      system "mpc ls | mpc add"                    and
+      system "mpc consume off #{TO_DEV_NULL}"      and
+      system "mpc repeat off #{TO_DEV_NULL}"       and
+      system "mpc random on #{TO_DEV_NULL}"        and
+      system "mpc single on #{TO_DEV_NULL}"
     $stderr.puts 'Could not initialize mpd\'s playlist'
     exit 76 # EX_PROTOCOL
   end
 end
 
-Gtk2Mp3.requires
-Signal.trap :USR1 do
-  Gtk2Mp3.next!(true)
-end
+require 'gtk2mp3'
+[:USR1,:USR2,:TERM].each{|_|Signal.trap(_){Gtk2Mp3.signal!(_)}}
 Gtk3App.main(Gtk2Mp3)

data/data/VERSION

@@ -1 +1 @@
-1.5.0
+2.5.191217

data/lib/gtk2mp3.rb

@@ -1,18 +1,32 @@
-module Gtk2Mp3
-  VERSION = '1.5.0'
+require 'json'
+require 'shellwords'
 
-  def self.requires
-    # This is a Gtk3App.
-    require 'gtk3app'
+# This is a Gtk3App.
+require 'gtk3app'
+module Gtk3App
+  # Monkey patching a missing feature
+  def Gtk3App.quit!
+    @program.quit!
+  end
+end
 
-    # Standard Libraries
-    require 'json'
-    require 'shellwords'
+module Gtk2Mp3
+  VERSION = '2.5.191217'
 
-    # This Gem.
-    require_relative 'gtk2mp3/config.rb'
-    require_relative 'gtk2mp3/gui.rb'
+  @signal = nil
+  def Gtk2Mp3.signal!(q=nil)
+    if q
+      @signal = q
+    elsif @signal
+      signal,@signal = @signal,nil
+      return signal
+    end
+    return nil
   end
+
+  # This Gem.
+  require_relative 'gtk2mp3/config.rb'
+  require_relative 'gtk2mp3/gui.rb'
 end
 
 # Requires:

data/lib/gtk2mp3/config.rb

@@ -20,6 +20,7 @@ module Gtk2Mp3
       STOP: [label: 'Stop'],
       stop_button!: [:STOP, 'clicked'],
       stop_item!: [:STOP, 'activate'],
+      id_label!: [set_selectable: true],
       VBOX: [:vertical],
       HBOX: [:horizontal],
       about_dialog: {

data/lib/gtk2mp3/gui.rb

@@ -3,17 +3,6 @@ module Gtk2Mp3
     GUI.new(program)
   end
 
-  @next = false
-  def Gtk2Mp3.next!(q=false)
-    if q
-      @next = true
-    elsif @next
-      @next = false
-      return true
-    end
-    return false
-  end
-
   class GUI
     MUTEX = Mutex.new
     ID = lambda{|_|File.basename(_.strip.split(/\n/).first.strip,'.*')}
@@ -31,9 +20,12 @@ module Gtk2Mp3
     end
 
     def next_song
-      @label.text = @playing = ID[`mpc -f '%file%' searchplay filename #{random_song.shellescape}`]
+      id = random_song
+      @label.text = @playing = ID[`mpc -f '%file%' searchplay filename #{id.shellescape}`]
     end
 
+    # decrementing count makes the id
+    # more likely to be played
     def down(id)
       if count=@db[id]
         count -= 1
@@ -45,6 +37,8 @@ module Gtk2Mp3
       end
     end
 
+    # incrementing count makes the id
+    # less likely to be played
     def up(id)
       @db[id] = @db[id].to_i+1
     end
@@ -62,7 +56,7 @@ module Gtk2Mp3
 
     def mpc_idle_player
       loop do
-        system 'mpc idle player'
+        system "mpc idle player #{TO_DEV_NULL}"
         MUTEX.synchronize{db_update}
       end
     end
@@ -77,7 +71,7 @@ module Gtk2Mp3
     def stop_song!
       MUTEX.synchronize do
         @skipped = @playing = @played = nil
-        system 'mpc stop'
+        system "mpc stop #{TO_DEV_NULL}"
       end
     end
 
@@ -88,7 +82,7 @@ module Gtk2Mp3
       hbox = Such::Box.new(vbox, :HBOX)
       Such::Button.new(hbox, :next_button!){next_song!} if CONFIG[:BUTTONS].include?(:next_button!)
       Such::Button.new(hbox, :stop_button!){stop_song!} if CONFIG[:BUTTONS].include?(:stop_button!)
-      @label = Such::Label.new(vbox)
+      @label = Such::Label.new(vbox, :id_label!)
       menu.each{|_|_.destroy if _.key==:fs! or _.key==:help!}
       minime.each{|_|_.destroy}
       minime.add_menu_item(:stop_item!){stop_song!} if CONFIG[:ITEMS].include?(:stop_item!)
@@ -111,8 +105,15 @@ module Gtk2Mp3
       window.show_all
 
       # Handle Signal.trap
-      GLib::Timeout.add(750) do
-        next_song! if Gtk2Mp3.next!
+      GLib::Timeout.add(500) do
+        case Gtk2Mp3.signal!
+        when :USR1
+          next_song! 
+        when :USR2
+          stop_song!
+        when :TERM
+          Gtk3App.quit!
+        end
         true # repeat
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtk2mp3
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.5.191217
 platform: ruby
 authors:
 - carlosjhr64
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-15 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser