gtk2mp3 2.5.191217 → 3.0.210919

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44f275e94c4638c8571bc8f08aff3b3530fb880fdc618ff5db7d3127d74be392
-  data.tar.gz: ecb239912c273b285001c0ad0794543647703d4d5d7760ecd66dda86eb694f83
+  metadata.gz: ba7f8bad4959e91cf3514f05fe5e9e15dd5dd56ecd6bb38e95305955c3c9a8bb
+  data.tar.gz: aaebca94d0d198933e6cad51ec87229213ee8287bacc30cd1d49d095b24e2459
 SHA512:
-  metadata.gz: f8396b6d71a498084af8a5fd1025974a3cccbb100ff87e4a64de8332b6b5bc33cf84a7039de2dbf356e6c67576a9d1d9209b04df609205e6ec775539d3a05377
-  data.tar.gz: 1c01f0c6edca39f25258b261b983fc340ae41434c65369273b87872eecefb93dbb536c8fd4ef1cae051e0de29a048c0c6deb6b6bad3e9a9c5c85e8c65e4fa823
+  metadata.gz: c15a4927e91c6ee1c38188e4442b8e1ad2694a447cc0d886cdf35c104f53297e2a6e24193d39e6027859d002cf672aa2bc9f83acfe7c9e7defc81f920f492d22
+  data.tar.gz: 6ac38d48745513588857c364265eb6970fc51bc95e7a1092f3ea364ad07b2ebab085d20e48196f5a67e16aedf86124ed339139fe7ac9b8ef68e71bb4a87865ba

data/README.md

@@ -1,34 +1,58 @@
-# Gtk2Mp3 I: Posser
+# Gtk2Mp3
 
+* [VERSION 3.0.210919](https://github.com/carlosjhr64/gtk2mp3/releases)
 * [github](https://www.github.com/carlosjhr64/gtk2mp3)
 * [rubygems](https://rubygems.org/gems/gtk2mp3)
-* [MPD/MPC](https://www.musicpd.org/)
 
 ## DESCRIPTION:
 
-A "Next!" button gui for MPD/MPC.
+A "Next!" button gui for [MPD/MPC](https://www.musicpd.org/).
 
 ## SYNOPSIS
-
-    gtk2mp3
-
+```console
+$ gtk2mp3
+```
 ## INSTALL
-
-    $ gem install gtk2mp3
-
+```console
+$ gem install gtk2mp3
+```
 ## HELP
-
-    Usage:
-      gtk2mp3 [:options+]
-    Options:
-      -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/.
-
+```console
+$ gtk2mp3 --help
+Usage:
+  gtk2mp3 [:options+]
+Options:
+  -h --help
+  -v --version
+  --minime       	 Real minime
+  --notoggle     	 Minime wont toggle decorated and keep above
+  --notdecorated 	 Dont decorate window
+  --update       	 Updates and sets playlist to the entire collection
+# Note:
+# Requires MPD/MPC.
+# See https://www.musicpd.org/clients/mpc/.
+```
+## LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2021 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.

data/bin/gtk2mp3

@@ -1,43 +1,16 @@
 #!/usr/bin/env ruby
-require 'help_parser'
-
-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?
-  # 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
+require 'gtk2mp3'
+class Gtk2Mp3
+  begin
+    case ARGV
+    in [/^(-v)|(--version)$/]
+      puts VERSION
+    in [/^(-h)|(--help)$/]
+      puts HELP
+    else
+      Gtk2Mp3.init
+      Gtk2Mp3.run
     end
   end
-  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
-
-require 'gtk2mp3'
-[:USR1,:USR2,:TERM].each{|_|Signal.trap(_){Gtk2Mp3.signal!(_)}}
-Gtk3App.main(Gtk2Mp3)
+exit

data/lib/gtk2mp3/config.rb

@@ -1,36 +1,37 @@
-module Gtk2Mp3
-  using Rafini::String
-  APPDIR = File.dirname File.dirname __dir__
+class Gtk2Mp3
+  using Rafini::String # for semantic
+  extend Rafini::Empty # for s0,a0,h0
+
   CONFIG = {
-    PLAYED: 120,
-    DBM: "#{XDG['CACHE']}/gtk3app/gtk2mp3/dbm.json",
-    BUTTONS: [:next_button!, :stop_button!],
-    ITEMS: [:next_item!, :stop_item!],
-    thing: {
-      HelpFile: 'https://github.com/carlosjhr64/gtk2mp3',
-      Logo: "#{XDG['DATA']}/gtk3app/gtk2mp3/logo.png",
-      window: {
-        set_title: 'Gtk2Mp3',
-        set_default_size: [100,60],
-        set_window_position: :center,
-      },
-      NEXT: [label: 'Next!'],
-      next_button!: [:NEXT, 'clicked'],
-      next_item!: [:NEXT, 'activate'],
-      STOP: [label: 'Stop'],
-      stop_button!: [:STOP, 'clicked'],
-      stop_item!: [:STOP, 'activate'],
-      id_label!: [set_selectable: true],
-      VBOX: [:vertical],
-      HBOX: [:horizontal],
-      about_dialog: {
-        set_program_name: 'Gtk2Mp3',
-        set_version: VERSION.semantic(0..1),
-        set_copyright: '(c) 2018 CarlosJHR64',
-        set_comments: 'A MPD/MPC "Next!" Button',
-        set_website: 'https://github.com/carlosjhr64/gtk2mp3',
-        set_website_label: 'See it at GitHub!',
-      },
-    }
+    TOOLBOX: [:horizontal],
+    toolbox: h0,
+    toolbox!: [:TOOLBOX,:toolbox],
+
+    NEXT_BUTTON: [label: 'Next!'],
+    next_button: h0,
+    next_button!: [:NEXT_BUTTON, :next_button, 'clicked'],
+
+    STOP_BUTTON: [label: 'Stop'],
+    stop_button: h0,
+    stop_button!: [:STOP_BUTTON, :stop_button, 'clicked'],
+
+    ID_LABEL: a0,
+    id_label: {set_selectable: true},
+    id_label!: [:ID_LABEL, :id_label],
+
+    HelpFile: 'https://github.com/carlosjhr64/gtk2mp3',
+    Logo: "#{File.dirname File.dirname __dir__}/data/logo.png",
+    about_dialog: {
+      set_program_name: 'Gtk2Mp3',
+      set_version: VERSION.semantic(0..1),
+      set_copyright: '(c) 2021 CarlosJHR64',
+      set_comments: 'A MPD/MPC "Next!" Button',
+      set_website: 'https://github.com/carlosjhr64/gtk2mp3',
+      set_website_label: 'See it at GitHub!',
+    },
+
+    app_menu: {
+      add_menu_item: [:minime!, :about!, :quit!]
+    },
   }
 end

data/lib/gtk2mp3/gui.rb

@@ -1,126 +1,26 @@
-module Gtk2Mp3
-  def Gtk2Mp3.run(program)
-    GUI.new(program)
+class Gtk2Mp3
+  def set_label(text)
+    @label.text = text
   end
 
-  class GUI
-    MUTEX = Mutex.new
-    ID = lambda{|_|File.basename(_.strip.split(/\n/).first.strip,'.*')}
-
-    def play?(id)
-      rand(@db[id].to_i+1)==0
-    end
-
-    def random_song
-      n = @list.length
-      loop do
-        id = @list[rand(n)]
-        return id if play?(id)
-      end
-    end
-
-    def next_song
-      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
-        if count>0
-          @db[id] = count
-        else
-          @db.delete(id)
-        end
-      end
-    end
-
-    # incrementing count makes the id
-    # less likely to be played
-    def up(id)
-      @db[id] = @db[id].to_i+1
-    end
-    
-    def db_update
-      if @skipped
-        up(@skipped) if Time.now - @time < CONFIG[:PLAYED]/2
-        down(@skipped) if Time.now - @time > CONFIG[:PLAYED]
-      elsif @played
-        down(@played)
-        next_song
-      end
-      @time,@played,@skipped = Time.now,@playing,nil
-    end
-
-    def mpc_idle_player
-      loop do
-        system "mpc idle player #{TO_DEV_NULL}"
-        MUTEX.synchronize{db_update}
-      end
-    end
-
-    def next_song!
-      MUTEX.synchronize do
-        @skipped = @playing
-        next_song
-      end
-    end
-
-    def stop_song!
-      MUTEX.synchronize do
-        @skipped = @playing = @played = nil
-        system "mpc stop #{TO_DEV_NULL}"
-      end
-    end
-
-    def initialize(program)
-      # Build
-      window,minime,menu = program.window,program.mini_menu,program.app_menu
-      vbox = Such::Box.new(window, :VBOX)
-      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, :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!)
-      minime.add_menu_item(:next_item!){next_song!} if CONFIG[:ITEMS].include?(:next_item!)
-
-      # Inits
-      @db = File.exist?(_=CONFIG[:DBM]) ?  JSON.parse(File.read(_)) :  {}
-      @list = `mpc listall`.lines.map{|_|ID[_]}.uniq
-      # A fuzzy delete of possibly gone keys...
-      @db.keys.each{|id| down(id) unless @list.include?(id)}
-
-      # Run
-      @skipped=@playing=nil
-      next_song!
-      @time,@played = Time.now,@playing
-      Thread.new do
-        sleep(1) # mpd needs a little time to settle
-        mpc_idle_player
-      end
-      window.show_all
+  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}
+    @label = Such::Label.new(stage, :id_label!)
+    build_logo_menu(block)
+  end
 
-      # Handle Signal.trap
-      GLib::Timeout.add(500) do
-        case Gtk2Mp3.signal!
-        when :USR1
-          next_song! 
-        when :USR2
-          stop_song!
-        when :TERM
-          Gtk3App.quit!
-        end
-        true # repeat
+  def build_logo_menu(block)
+    Gtk3App.logo_press_event do |button|
+      case button
+      when 1
+        block.call :next
+      when 2
+        block.call :stop
+      when 3
+        # Gtk3App's main menu
       end
     end
-
-    def finalize
-      stop_song!
-      File.write(CONFIG[:DBM], JSON.pretty_generate(@db))
-    end
   end
 end

data/lib/gtk2mp3/mpd.rb

@@ -0,0 +1,51 @@
+class Gtk2Mp3
+  def Gtk2Mp3.system_mpd
+    # check if mpd is already running
+    unless system 'ps -C mpd'
+      unless system 'mpd'
+        $stderr.puts 'Could not start the mpd daemon.'
+        exit 69 # EX_UNAVAILABLE
+      end
+    end
+  end
+
+  def Gtk2Mp3.system_mpc
+    # initialize playlist
+    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 off'
+      $stderr.puts %q(Could not initialize mpd's playlist)
+      exit 76 # EX_PROTOCOL
+    end
+  end
+
+  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'
+        system 'mpc next'
+      end
+    when :stop
+      system 'mpc stop'
+    end
+  end
+
+  def Gtk2Mp3.mpc_idleloop(gui)
+    Thread.new do
+      IO.popen('mpc idleloop', 'r') do |pipe|
+        while line = pipe.gets
+          gui.set_label File.basename(`mpc current`.strip, '.*')
+        end
+      end
+    end
+  end
+end

data/lib/gtk2mp3.rb

@@ -1,34 +1,38 @@
-require 'json'
-require 'shellwords'
+class Gtk2Mp3
+  VERSION = '3.0.210919'
+  HELP = <<~HELP
+    Usage:
+      gtk2mp3 [:options+]
+    Options:
+      -h --help
+      -v --version
+      --minime       \t Real minime
+      --notoggle     \t Minime wont toggle decorated and keep above
+      --notdecorated \t Dont decorate window
+      --update       \t Updates and sets playlist to the entire collection
+    # Note:
+    # Requires MPD/MPC.
+    # See https://www.musicpd.org/clients/mpc/.
+  HELP
 
-# This is a Gtk3App.
-require 'gtk3app'
-module Gtk3App
-  # Monkey patching a missing feature
-  def Gtk3App.quit!
-    @program.quit!
+  def Gtk2Mp3.init
+    require_relative 'gtk2mp3/mpd'
+    Gtk2Mp3.system_mpd
+    Gtk2Mp3.system_mpc if ARGV.include? '--update'
   end
-end
-
-module Gtk2Mp3
-  VERSION = '2.5.191217'
 
-  @signal = nil
-  def Gtk2Mp3.signal!(q=nil)
-    if q
-      @signal = q
-    elsif @signal
-      signal,@signal = @signal,nil
-      return signal
+  def Gtk2Mp3.run
+    # This is a Gtk3App.
+    require 'gtk3app'
+    # This Gem.
+    require_relative 'gtk2mp3/config'
+    require_relative 'gtk2mp3/gui'
+    Gtk3App.run(klass:Gtk2Mp3) do  |stage, toolbar, options|
+      gui = Gtk2Mp3.new(stage, toolbar, options){Gtk2Mp3.mpc_command _1}
+      Gtk2Mp3.mpc_idleloop(gui)
     end
-    return nil
   end
-
-  # This Gem.
-  require_relative 'gtk2mp3/config.rb'
-  require_relative 'gtk2mp3/gui.rb'
 end
-
 # Requires:
 #`ruby`
 #`mpd`

metadata

@@ -1,56 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: gtk2mp3
 version: !ruby/object:Gem::Version
-  version: 2.5.191217
+  version: 3.0.210919
 platform: ruby
 authors:
-- carlosjhr64
-autorequire: 
+- CarlosJHR64
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2021-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: help_parser
+  name: gtk3app
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '5.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.5.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.5'
-- !ruby/object:Gem::Dependency
-  name: gtk3app
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.3.210919
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-description: 'A "Next!" button gui for MPD/MPC.
+        version: '5.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.3.210919
+description: 'A "Next!" button gui for [MPD/MPC](https://www.musicpd.org/).
 
   '
 email: carlosjhr64@gmail.com
@@ -63,16 +43,16 @@ files:
 - README.md
 - bin/gtk2mp3
 - cache/README.txt
-- data/VERSION
 - data/logo.png
 - lib/gtk2mp3.rb
 - lib/gtk2mp3/config.rb
 - lib/gtk2mp3/gui.rb
+- lib/gtk2mp3/mpd.rb
 homepage: https://github.com/carlosjhr64/gtk2mp3
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -87,10 +67,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- 'ruby: ruby 2.6.5p114 (2019-10-01 revision 67812) [x86_64-linux]'
-- 'mpd: Music Player Daemon 0.21.16 (0.21.16)'
-rubygems_version: 3.0.3
-signing_key: 
+- '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:
 specification_version: 4
-summary: A "Next!" button gui for MPD/MPC.
+summary: A "Next!" button gui for [MPD/MPC](https://www.musicpd.org/).
 test_files: []

data/data/VERSION

@@ -1 +0,0 @@
-2.5.191217