gtk2mp3 3.0.210920 → 3.1.210926

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 180114c8a9dc0eb5d6338b18adcf5285f3e689ad2e4c07f20f808bd87bc90c1c
-  data.tar.gz: 1bccb9897a607bdcf6220c6430c602a42b5670cc97d66cc2852ef8073e50f389
+  metadata.gz: f7c165134edc00cdf60e79473c1c85808eeb405719c81daa096b8ace59af8b83
+  data.tar.gz: d909d47246ceaf95959dbde7e30ea4e63de94e54d5f7c0852f5ffa449ffff5c9
 SHA512:
-  metadata.gz: 64fe65004af2cbc43a1267c9ec0058a00affcba1bf8c4d47a3cfb64987463dc4d5809e54022194db41742bda3f410ab021e5ff256dbd2253e0b8ad91674818e8
-  data.tar.gz: 8ad3748d951f1153ba05c4eab525da74cd59357eb69bb1c8f62d32aa2d1cabd8a1437c63909789550cd836bbc91e3b6109a91a8f03cd4f63b5af2f12359631fa
+  metadata.gz: f0c7bc19d1a82272bbd644e8a3fc3592b00053477e5fafefd4bffebca2e6904fd178267a3780e35aa2ed776dea909593f4e9ad2daaef60972117586c80cc54b9
+  data.tar.gz: ddb29e99f9c23a0cd710c656744afaf95180e08fa70f542a87c698a56777ec9f9323e3b1bf952a9ef70aebc55e66faaa5e5f4e370a5598b8c6549a6dd768a036

data/README.md

@@ -1,6 +1,6 @@
 # Gtk2Mp3
 
-* [VERSION 3.0.210920](https://github.com/carlosjhr64/gtk2mp3/releases)
+* [VERSION 3.1.210926](https://github.com/carlosjhr64/gtk2mp3/releases)
 * [github](https://www.github.com/carlosjhr64/gtk2mp3)
 * [rubygems](https://rubygems.org/gems/gtk2mp3)
 
@@ -32,6 +32,11 @@ Options:
 # Requires MPD/MPC.
 # See https://www.musicpd.org/clients/mpc/.
 ```
+## MORE:
+
+You can add your own custom buttons.
+See my [Picard](lib/gtk2mp3/picard_button.rb) button hook.
+
 ## LICENSE:
 
 (The MIT License)

data/lib/gtk2mp3/config.rb

@@ -3,9 +3,8 @@ class Gtk2Mp3
   extend Rafini::Empty # for s0,a0,h0
 
   CONFIG = {
-    TOOLBOX: [:horizontal],
-    toolbox: h0,
-    toolbox!: [:TOOLBOX,:toolbox],
+    MonkeyPatch: s0,
+    BUTTONS: [:next_button!, :stop_button!],
 
     NEXT_BUTTON: [label: 'Next!'],
     next_button: h0,
@@ -19,6 +18,10 @@ class Gtk2Mp3
     id_label: {set_selectable: true},
     id_label!: [:ID_LABEL, :id_label],
 
+    TOOLBOX: [:horizontal],
+    toolbox: h0,
+    toolbox!: [:TOOLBOX,:toolbox],
+
     HelpFile: 'https://github.com/carlosjhr64/gtk2mp3',
     Logo: "#{UserSpace::XDG['data']}/gtk3app/gtk2mp3/logo.png",
     about_dialog: {

data/lib/gtk2mp3/gui.rb

@@ -5,8 +5,9 @@ class Gtk2Mp3
 
   def initialize(stage, toolbar, options, &block)
     @toolbox   = Such::Box.new toolbar, :toolbox!
-    Such::Button.new(@toolbox, :next_button!){block.call :next}
-    Such::Button.new(@toolbox, :stop_button!){block.call :stop}
+    CONFIG[:BUTTONS].each do |button|
+      Such::Button.new(@toolbox, button){block.call button}
+    end
     @label = Such::Label.new(stage, :id_label!)
     build_logo_menu(block)
   end
@@ -15,9 +16,9 @@ class Gtk2Mp3
     Gtk3App.logo_press_event do |button|
       case button
       when 1
-        block.call :next
+        block.call :next_button!
       when 2
-        block.call :stop
+        block.call :stop_button!
       when 3
         # Gtk3App's main menu
       end

data/lib/gtk2mp3/mpd.rb

@@ -25,20 +25,24 @@ class Gtk2Mp3
 
   def Gtk2Mp3.mpc_command(command)
     case command
-    when :next
-      current = `mpc current`.strip
-      if current.empty?
-        system 'mpc play'
-      else
-        # On my system, if I don't pause first, the sound fails.
-        system 'mpc pause'
+    when :next_button!
+      if system 'mpc pause-if-playing'
+        sleep 0.25
         system 'mpc next'
+      else
+        system 'mpc play'
       end
-    when :stop
+    when :stop_button!
       system 'mpc stop'
+    else
+      Gtk2Mp3.hook(command)
     end
   end
 
+  def Gtk2Mp3.hook(command)
+    # You can monkey-patch this function
+  end
+
   def Gtk2Mp3.mpc_idleloop(gui)
     Thread.new do
       IO.popen('mpc idleloop', 'r') do |pipe|

data/lib/gtk2mp3/picard_button.rb

@@ -0,0 +1,41 @@
+# To activate this hook, edit your current configuration file:
+#     ~/.config/gtk3app/gtk2mp3/config-?.?.rbon
+# Set:
+#     MonkeyPatch: "gtk2mp3/picard_button",
+require 'shellwords'
+class Gtk2Mp3
+  extend Rafini::Empty
+
+  CONFIG[:BUTTONS].push :picard_button!
+  CONFIG[:PICARD_BUTTON] = [label: 'Picard']
+  CONFIG[:picard_button] = h0,
+  CONFIG[:picard_button!] = [:PICARD_BUTTON,:picard_button,'clicked']
+  CONFIG[:Music] ||= File.expand_path '~/Music'
+
+  def Gtk2Mp3.hook(command)
+    case command
+    when :picard_button!
+      current = `mpc current`.strip
+      if current=~/^(.*) - (.*)/
+        artist,title = $1,$2
+      else
+        artist,title = nil,current
+      end
+      tfiles = `mpc search Title #{Shellwords.escape(title)} | egrep '\.mp3$'`
+        .strip.split
+      if artist and tfiles.length > 1
+        afiles =
+          `mpc search Artist #{Shellwords.escape(artist)} | egrep '\.mp3$'`
+          .strip.split
+        tfiles.delete_if{ not afiles.include? _1}
+      end
+      if tfiles.length > 0
+        files = tfiles.map{Shellwords.escape File.join(CONFIG[:Music], _1)}
+          .join(' ')
+        spawn "picard #{files}" if tfiles.length > 0
+      else
+        $stderr.puts "Not an mp3 file: #{current}"
+      end
+    end
+  end
+end

data/lib/gtk2mp3.rb

@@ -1,5 +1,5 @@
 class Gtk2Mp3
-  VERSION = '3.0.210920'
+  VERSION = '3.1.210926'
   HELP = <<~HELP
     Usage:
       gtk2mp3 [:options+]
@@ -28,6 +28,7 @@ class Gtk2Mp3
     require_relative 'gtk2mp3/config'
     require_relative 'gtk2mp3/gui'
     Gtk3App.run(klass:Gtk2Mp3) do  |stage, toolbar, options|
+      require CONFIG[:MonkeyPatch] unless CONFIG[:MonkeyPatch].empty?
       gui = Gtk2Mp3.new(stage, toolbar, options){Gtk2Mp3.mpc_command _1}
       Gtk2Mp3.mpc_idleloop(gui)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtk2mp3
 version: !ruby/object:Gem::Version
-  version: 3.0.210920
+  version: 3.1.210926
 platform: ruby
 authors:
 - CarlosJHR64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3app
@@ -47,6 +47,7 @@ files:
 - lib/gtk2mp3/config.rb
 - lib/gtk2mp3/gui.rb
 - lib/gtk2mp3/mpd.rb
+- lib/gtk2mp3/picard_button.rb
 homepage: https://github.com/carlosjhr64/gtk2mp3
 licenses:
 - MIT