gtk2mp3 3.1.210926 → 3.2.230112

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7c165134edc00cdf60e79473c1c85808eeb405719c81daa096b8ace59af8b83
-  data.tar.gz: d909d47246ceaf95959dbde7e30ea4e63de94e54d5f7c0852f5ffa449ffff5c9
+  metadata.gz: a7f31d4ae2d5af872d9c75141828b23b3636cf10ca4c6902fc77d37f41d00246
+  data.tar.gz: 217cf9c6ddcd6c07c920b6c2f5e33d1d22fd1f4072715183a359bcc21226d2e6
 SHA512:
-  metadata.gz: f0c7bc19d1a82272bbd644e8a3fc3592b00053477e5fafefd4bffebca2e6904fd178267a3780e35aa2ed776dea909593f4e9ad2daaef60972117586c80cc54b9
-  data.tar.gz: ddb29e99f9c23a0cd710c656744afaf95180e08fa70f542a87c698a56777ec9f9323e3b1bf952a9ef70aebc55e66faaa5e5f4e370a5598b8c6549a6dd768a036
+  metadata.gz: '079e757062dd079e5d8ce944c9f0762001e70a2b9d5214598bcd1627963473484453f67288a958b837f19d0ffd3e94b821b269ac783b7ed5a2cbe1bbe9d33e39'
+  data.tar.gz: cb8d058b4717cd924137bc0e3e938f29edf22e3ba20dd9c79e8c2c9f54a4270af2bc76bc3437ad7537b86ffec87bb92f6f668b21d72cf79c91d21e4182d7f456

data/README.md

@@ -1,6 +1,6 @@
 # Gtk2Mp3
 
-* [VERSION 3.1.210926](https://github.com/carlosjhr64/gtk2mp3/releases)
+* [VERSION 3.2.230112](https://github.com/carlosjhr64/gtk2mp3/releases)
 * [github](https://www.github.com/carlosjhr64/gtk2mp3)
 * [rubygems](https://rubygems.org/gems/gtk2mp3)
 
@@ -16,6 +16,10 @@ $ gtk2mp3
 ```console
 $ gem install gtk2mp3
 ```
+## SCREENSHOT
+
+![Screenshot](img/screenshot.png)
+
 ## HELP
 ```console
 $ gtk2mp3 --help
@@ -35,13 +39,16 @@ Options:
 ## MORE:
 
 You can add your own custom buttons.
-See my [Picard](lib/gtk2mp3/picard_button.rb) button hook.
+See:
+
+* [Picard](lib/gtk2mp3/picard_button.rb) button hook.
+* [Trash](lib/gtk2mp3/trash_button.rb) button hook.
 
 ## LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2021 CarlosJHR64
+Copyright (c) 2023 CarlosJHR64
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/gtk2mp3/config.rb

@@ -27,7 +27,7 @@ class Gtk2Mp3
     about_dialog: {
       set_program_name: 'Gtk2Mp3',
       set_version: VERSION.semantic(0..1),
-      set_copyright: '(c) 2021 CarlosJHR64',
+      set_copyright: '(c) 2023 CarlosJHR64',
       set_comments: 'A MPD/MPC "Next!" Button',
       set_website: 'https://github.com/carlosjhr64/gtk2mp3',
       set_website_label: 'See it at GitHub!',

data/lib/gtk2mp3/gui.rb

@@ -3,6 +3,7 @@ class Gtk2Mp3
     @label.text = text
   end
 
+  # gui = Gtk2Mp3.new(stage, toolbar, options){Gtk2Mp3.mpc_command _1}
   def initialize(stage, toolbar, options, &block)
     @toolbox   = Such::Box.new toolbar, :toolbox!
     CONFIG[:BUTTONS].each do |button|

data/lib/gtk2mp3/mpd.rb

@@ -45,7 +45,7 @@ class Gtk2Mp3
 
   def Gtk2Mp3.mpc_idleloop(gui)
     Thread.new do
-      IO.popen('mpc idleloop', 'r') do |pipe|
+      IO.popen('mpc idleloop player', 'r') do |pipe|
         while line = pipe.gets
           gui.set_label File.basename(`mpc current`.strip, '.*')
         end

data/lib/gtk2mp3/picard_button.rb

@@ -1,8 +1,8 @@
+# [Picard](https://musicbrainz.org/doc/Picard_Linux_Install)
 # 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
 
@@ -10,31 +10,15 @@ class Gtk2Mp3
   CONFIG[:PICARD_BUTTON] = [label: 'Picard']
   CONFIG[:picard_button] = h0,
   CONFIG[:picard_button!] = [:PICARD_BUTTON,:picard_button,'clicked']
+  # If your music is not in ~/Music, edit your config file:
   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}"
+      if current = `mpc --format '%file%' current`.strip
+        file = File.join(CONFIG[:Music], current)
+        spawn "picard #{file}"
       end
     end
   end

data/lib/gtk2mp3/trash_button.rb

@@ -0,0 +1,28 @@
+# Trash:
+# Uses `gio trash file`.
+# To activate this hook, edit your current configuration file:
+#     ~/.config/gtk3app/gtk2mp3/config-?.?.rbon
+# Set:
+#     MonkeyPatch: "gtk2mp3/trash_button",
+class Gtk2Mp3
+  extend Rafini::Empty
+
+  CONFIG[:BUTTONS].push :trash_button!
+  CONFIG[:TRASH_BUTTON] = [label: 'Trash!']
+  CONFIG[:trash_button] = h0,
+  CONFIG[:trash_button!] = [:TRASH_BUTTON,:trash_button,'clicked']
+  # If your music is not in ~/Music, edit your config file:
+  CONFIG[:Music] ||= File.expand_path '~/Music'
+
+  def Gtk2Mp3.hook(command)
+    case command
+    when :trash_button!
+      if position_file = `mpc --format '%position% %file%' current`.strip
+        position,file = position_file.split(' ',2)
+        if system('mpc','del',position)
+          system('gio','trash',File.join(CONFIG[:Music],file))
+        end
+      end
+    end
+  end
+end

data/lib/gtk2mp3.rb

@@ -1,5 +1,5 @@
 class Gtk2Mp3
-  VERSION = '3.1.210926'
+  VERSION = '3.2.230112'
   HELP = <<~HELP
     Usage:
       gtk2mp3 [:options+]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtk2mp3
 version: !ruby/object:Gem::Version
-  version: 3.1.210926
+  version: 3.2.230112
 platform: ruby
 authors:
 - CarlosJHR64
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-26 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3app
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.210919
+        version: 5.4.230109
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.210919
+        version: 5.4.230109
 description: 'A "Next!" button gui for [MPD/MPC](https://www.musicpd.org/).
 
   '
@@ -39,7 +39,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.md
 - bin/gtk2mp3
 - data/logo.png
@@ -48,11 +47,12 @@ files:
 - lib/gtk2mp3/gui.rb
 - lib/gtk2mp3/mpd.rb
 - lib/gtk2mp3/picard_button.rb
+- lib/gtk2mp3/trash_button.rb
 homepage: https://github.com/carlosjhr64/gtk2mp3
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -67,10 +67,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- 'ruby: ruby 3.0.2p107 (2021-07-07 revision 0db68f0233) [x86_64-linux]'
-- 'mpd: Music Player Daemon 0.22.11 (0.22.11)'
-rubygems_version: 3.2.22
-signing_key:
+- 'ruby: ruby 3.2.0 (2022-12-25 revision a528908271) [aarch64-linux]'
+- 'mpd: Music Player Daemon 0.22.6 (0.22.6)'
+rubygems_version: 3.4.3
+signing_key: 
 specification_version: 4
 summary: A "Next!" button gui for [MPD/MPC](https://www.musicpd.org/).
 test_files: []

data/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 carlosjhr64
-
-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 the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.