gtk2mp3 0.4.0 → 0.5.0

data/bin/gtk2mp3

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-gem 'gtk2applib', '~> 14.0'
+gem 'gtk2applib', '~> 15.3'
 $help = <<EOT
 
 You can also give it the default mp3 directory via command line...
@@ -15,7 +15,7 @@ program = Gtk2AppLib::Program.new( {
         'website'	=> 'https://sites.google.com/site/gtk2applib/home/gtk2applib-applications/gtk2mp3',
         'website-label'	=> 'Ruby-Gnome MP3',
         'license'	=> 'GPL',
-        'copyright'	=> '2011-03-10 11:19:13',
+        'copyright'	=> '2011-05-02 09:09:57',
         } )
 
 begin

data/lib/gtk2mp3/appconfig.rb

@@ -25,12 +25,12 @@ module Configuration
   dialog.destroy
   DIRECTORY = directory
 
-  options = {:modify_font => Gtk2AppLib::Configuration::FONT[:Large]}.freeze
+  options = {:modify_font => Gtk2AppLib::Configuration::FONT[:LARGE]}.freeze
   SPACER1 = [' ',	options].freeze
   SPACER2 = [' ',	options].freeze
   SPACER3 = [' ',	options].freeze
   SPACER4 = ['   ',	options].freeze
-  INFO = ['Gtk2 MP3 Next!!!!',{:modify_font => Gtk2AppLib::Configuration::FONT[:Small]}].freeze
+  INFO = ['Gtk2 MP3 Next!!!!',{:modify_font => Gtk2AppLib::Configuration::FONT[:SMALL]}].freeze
 
   RELOAD = '_Reload'
 

data/lib/gtk2mp3/couple.rb

@@ -1,4 +1,5 @@
 # Gtk2AppLib defined
+# File defined
 module Gtk2MP3 # Gtk2MP3 defined
 class Couple # Couple defined
   BASE = Hash.new(1.0)
@@ -19,28 +20,31 @@ class Couple # Couple defined
   end
 
   def self._load(dump,hash)
-    File.open(dump,'r'){|fh| # File defined, built in
-      fh.each{|line|
-        if line=~/^(.*)\s([\d\.]+)\s*$/ then
-          hash[$1.strip] = $2.to_f
-        end
-      }
-    } if File.exist?(dump)
+    fh = File.open(dump,'r')
+    fh.each do |line|
+      if line=~/^(.*)\s([\d\.]+)\s*$/ then
+        hash[$1.strip] = $2.to_f
+      end
+    end
+    fh.close
   end
   def self.load
-    Couple._load(BASE_DUMP,BASE)
-    Couple._load(COUPLE_DUMP,COUPLE)
+    Couple._load(BASE_DUMP,BASE)	if File.exist?(BASE_DUMP)
+    Couple._load(COUPLE_DUMP,COUPLE)	if File.exist?(COUPLE_DUMP)
   end
 
   def self.delete(current)
     key = File.basename(current,Gtk2MP3::MP3)
     BASE.delete(key)
-    COUPLE.delete_if{|k| k.split(SEPX).include?(key)}
+    COUPLE.delete_if{|pair| pair.split(SEPX).include?(key)}
   end
 
   def self._dump(dump,hash)
     # Note that the default value is 1.0, so no need to save 1.0 values.
-    File.open(dump,'w'){|fh| hash.each{|k,v| fh.puts "#{k}\t#{v}" if v < 1.0 } }
+    # File.open(dump,'w'){|fh| hash.each{|k,v| fh.puts "#{k}\t#{v}" if v < 1.0 } }
+    fh = File.open(dump,'w')
+    hash.each{|key,value| fh.puts "#{key}\t#{value}" if value < 1.0 }
+    fh.close
   end
   def self.dump
     Couple._dump(BASE_DUMP,BASE)

data/lib/gtk2mp3.rb

@@ -13,19 +13,18 @@ module Gtk2MP3 # Gtk2MP3 defined
       self.open
     end
     def _read
-      @thread = Thread.new do # Thread defined
-        @pipe.each do |line|
-          line.strip!
-          $stderr.puts line if $trace
-          if line =~ /^\@I\s+(\S.*)$/ then
-            # :-??
-          elsif line == '@P 0' then
-            if @gui.continue then
-              @gui.couple.promote
-              @gui.previous = @gui.current
-              @gui.load_song
-            end
-          end
+      @gui.couple.promote
+      @gui.previous = @gui.current
+      @gui.load_song
+    end
+    def read
+      @pipe.each do |line|
+        line.strip!
+        $stderr.puts line if $trace
+        if line =~ /^\@I\s+(\S.*)$/ then
+          # :-??
+        elsif line == '@P 0' then
+          _read	if @gui.continue
         end
       end
     end
@@ -33,7 +32,7 @@ module Gtk2MP3 # Gtk2MP3 defined
       if !@pipe then
         @pipe = IO.popen(Configuration::PLAYER,'w+') # IO defined
         self.puts Configuration::C_SILENCE
-        self._read
+        @thread = Thread.new { self.read }
       end
     end
     def puts(string)
@@ -51,9 +50,11 @@ module Gtk2MP3 # Gtk2MP3 defined
     end
   end
 
+  # This is GUI
   class GUI
     attr_reader :continue, :couple, :current
     attr_writer :previous
+
     def initialize(window,program)
       @playlist = Gtk2MP3::Playlist.new(Configuration::DIRECTORY)
       @current = ''
@@ -70,41 +71,50 @@ module Gtk2MP3 # Gtk2MP3 defined
       hbox = Gtk2AppLib::Widgets::HBox.new(vbox)
       Gtk2AppLib::Widgets::Label.new(*Configuration::SPACER1+[hbox]) # Spacer
       Gtk2AppLib::Widgets::Button.new(*Configuration::NEXT+[hbox]){ self.skip_song }
+      spacer = Configuration::SPACER2+[hbox]
       if Configuration::PAUSE then
-        Gtk2AppLib::Widgets::Label.new(*Configuration::SPACER2+[hbox]) # Spacer
+        Gtk2AppLib::Widgets::Label.new(*spacer) # Spacer
         Gtk2AppLib::Widgets::Button.new(*Configuration::PAUSE+[hbox]){ self.pause_song }
       end
       if Configuration::STOP then
-        Gtk2AppLib::Widgets::Label.new(*Configuration::SPACER2+[hbox]) # Spacer
+        Gtk2AppLib::Widgets::Label.new(*spacer) # Spacer
         Gtk2AppLib::Widgets::Button.new(*Configuration::STOP+[hbox]){ self.stop_song }
       end
       if Configuration::DELETE then
         Gtk2AppLib::Widgets::Label.new(*Configuration::SPACER3+[hbox]) # Spacer
         Gtk2AppLib::Widgets.define_composite(:CheckButton,:Button)
         Gtk2AppLib::Widgets::CheckButtonButton.new(*Configuration::DELETE+[hbox]){|is,*dummies|
-          if is.checkbutton.active? then
+          cb = is.checkbutton
+          if cb.active? then
             self.delete_song
-            is.checkbutton.active = false
+            cb.active = false
           end
         }
       end
       Gtk2AppLib::Widgets::Label.new(*Configuration::SPACER4+[hbox]) # Spacer
 
       self.load_song
+      self.program_appends(program)
+    end
 
+    def program_appends(program)
       program.append_app_menu(Configuration::RELOAD){ @playlist.reload }
       program.append_dock_menu(Configuration::PAUSE.first){ self.pause_song }	if Configuration::PAUSE
       program.append_dock_menu(Configuration::STOP.first){ self.stop_song }	if Configuration::STOP
       program.append_dock_menu(Configuration::NEXT.first){ self.skip_song }
     end
 
+    def _random_song
+      @current = @playlist.random
+      $stderr.puts @current if $trace
+      @couple = Gtk2MP3::Couple.new(@current,@previous)
+      $stderr.puts "#{@couple.keys.last} #{@couple.treshold}" if $trace
+    end
+
     def random_song
       plays = false
       while !plays do
-        @current = @playlist.random
-        $stderr.puts @current if $trace
-        @couple = Gtk2MP3::Couple.new(@current,@previous)
-        $stderr.puts "#{@couple.keys.last} #{@couple.treshold}" if $trace
+        _random_song
         plays = @couple.play?
       end
     end
@@ -120,12 +130,16 @@ module Gtk2MP3 # Gtk2MP3 defined
       self.load_song
     end
 
+    def _stop_song
+      @pipe.puts Configuration::C_STOP
+      @previous = ''
+      @continue = false
+      @pipe.close
+    end
+
     def stop_song
       if @continue then
-        @pipe.puts Configuration::C_STOP
-        @previous = ''
-        @continue = false
-        @pipe.close
+        _stop_song
       else
         @continue = true
         self.load_song

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gtk2mp3
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - carlosjhr64@gmail.com
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -08:00
+date: 2011-05-02 00:00:00 -07:00
 default_executable: gtk2mp3
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 49
         segments: 
-        - 14
-        - 0
-        version: "14.0"
+        - 15
+        - 3
+        version: "15.3"
   type: :runtime
   version_requirements: *id001
 description: a "Next!" button gui for mpg123