gtk2mp3 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff3ce4cc3415163918519fbeec8cdfa71fcbf340df80bac3ef663b0912ca8efc
-  data.tar.gz: 8daa2512b2839eaca23f00cf386454c09e64b38af51dc5f9513bf6a1ea624f72
+  metadata.gz: 3515c77889dc15cf89235fd164443b80b52f55c1052a63bddffdc3134d1ba930
+  data.tar.gz: fdc71a22c0db5e6086d3850f42f77d21103981d8ee24ed56f22413280e245f1a
 SHA512:
-  metadata.gz: c2d5fc9e6ce4de2f7a17a3bd40a994bec68f28d26037796e0007a788f5d3bf4d6164f1239f4fe47cee9db3b4166c117eae6c5ccec37902b4f960451d0c9fd1d2
-  data.tar.gz: d9a193c9d81289aca47834dd9756cebc5a9462e53e01b9e14feed157827a927c78c7a21629074bc91a7f3ee29562a5595b6d3a428df21596725aec5f4815359c
+  metadata.gz: 47fc42de3ac52bd3435a5ec08ba9bac4b9acef21e81faf5bbe94c30002e076b4f2ca6e156f610ece4c3037bd7e5ce75c3c60b4bc411b29fbfeb8af23cc8e9a69
+  data.tar.gz: c0a5989939c273894e105aa7600574991e2f812b601c52b61aebaea651d59b078f7ff8c3593dd9029d611ce6357a79c8e9b9158c2ff57ee72f41e14173a25219

data/README.md

@@ -23,7 +23,6 @@ A "Next!" button gui for MPD/MPC.
     Options:
       -h --help
       -v --version
-      -f --force  	Skips mpd prechecks
       --noinit    	Don't reset the playlist
     # Notes #
     # Requires MPD/MPC.

data/bin/gtk2mp3

@@ -2,7 +2,7 @@
 require 'help_parser'
 
 module Gtk2Mp3
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end
 OPTIONS = HelpParser[Gtk2Mp3::VERSION,<<HELP]
 Usage:
@@ -10,36 +10,30 @@ Usage:
 Options:
   -h --help
   -v --version
-  -f --force  \tSkips mpd prechecks
   --noinit    \tDon't reset the playlist
 # Notes #
 # Requires MPD/MPC.
 # See https://www.musicpd.org/clients/mpc/.
 HELP
 
-unless OPTIONS.force?
-  unless ['/etc/mpd.conf','~/.mpdconf'].all?{|_|File.exist? File.expand_path _}
-    $stderr.puts 'Missing /etc/mpd.conf and/or ~/.mpdconf'
-    exit 72 # EX_OSFILE
-  end
+unless OPTIONS.noinit?
   unless system 'ps -C mpd'
     unless system 'mpd'
       $stderr.puts 'Could not start the mpd daemon.'
       exit 69 # EX_UNAVAILABLE
     end
   end
-end
-
-unless OPTIONS.noinit?
-  unless system 'mpc clear' and system 'mpc ls | mpc add'
+  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'
     $stderr.puts 'Could not initialize mpd\'s playlist'
     exit 76 # EX_PROTOCOL
   end
-  system 'mpc random on'
-  system 'mpc consume off'
-  system 'mpc repeat on'
 end
 
 require 'gtk2mp3'
 Gtk3App.main(Gtk2Mp3)
-system 'mpc stop'

data/data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/gtk2mp3/config.rb

@@ -4,6 +4,8 @@ module Gtk2Mp3
   CONFIG = {
     PLAYED: 30,
     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",

data/lib/gtk2mp3/gui.rb

@@ -20,7 +20,7 @@ module Gtk2Mp3
     end
 
     def next_song
-      @label.text = @playing = ID[`mpc searchplay filename #{random_song.shellescape}`]
+      @label.text = @playing = ID[`mpc -f '%file%' searchplay filename #{random_song.shellescape}`]
     end
 
     def down(id)
@@ -43,12 +43,7 @@ module Gtk2Mp3
         up(@skipped) if Time.now-@time<CONFIG[:PLAYED]
       elsif @played
         down(@played)
-        @playing = ID[`mpc current`]
-        if play?(@playing)
-          @label.text = @playing
-        else
-          next_song
-        end
+        next_song
       end
       @time,@played,@skipped = Time.now,@playing,nil
     end
@@ -75,23 +70,25 @@ module Gtk2Mp3
     end
 
     def initialize(program)
-      window,minime,menu = program.window,program.mini_menu,program.app_menu
-      @db = JSON.parse File.read(CONFIG[:DBM])
-      window.signal_connect('delete-event'){File.write(CONFIG[:DBM], JSON.pretty_generate(@db))}
-
       # 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!}
-      Such::Button.new(hbox, :stop_button!){stop_song!}
+      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)
       menu.each{|_|_.destroy if _.key==:fs! or _.key==:help!}
       minime.each{|_|_.destroy}
-      minime.append_menu_item(:stop_item!){stop_song!}
-      minime.append_menu_item(:next_item!){next_song!}
+      minime.append_menu_item(:stop_item!){stop_song!} if CONFIG[:ITEMS].include?(:stop_item!)
+      minime.append_menu_item(:next_item!){next_song!} if CONFIG[:ITEMS].include?(:next_item!)
 
       # Inits
+      @db = JSON.parse File.read(CONFIG[:DBM])
       @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
@@ -99,7 +96,10 @@ module Gtk2Mp3
         sleep(1) # mpd needs a little time to settle
         mpc_idle_player
       end
-
+      window.signal_connect('delete-event') do
+        stop_song!
+        File.write(CONFIG[:DBM], JSON.pretty_generate(@db))
+      end
       window.show_all
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtk2mp3
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - carlosjhr64
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser
@@ -87,7 +87,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- 'mpc: off'
 - 'ruby: ruby 2.5.0p0 (2017-12-25 revision 61468) [x86_64-linux]'
 - 'mpd: Music Player Daemon 0.20.10'
 rubyforge_project: