gtk2mp3 0.7.0 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: e0d866ff929a7c03c6e19e83cfca86db84719676d4a9e613735c9ba0b88de06e
+  data.tar.gz: ee1c1383e5c900e7ffd40f2a2bbfe2a34bc0b31719cba081dfeb7aabe348fd72
+SHA512:
+  metadata.gz: ad2ba586dd898b47f00ef0a49f4e6b4fe61b9f4659f7f4c5a489d9be7b0b85ab706125c8dc23f81849f038c748286511047a7e15c65c2bdd688644f95bda0c69
+  data.tar.gz: cf27a1781f38117f293521f365fcdcd702f7e1148a16977c5e56f665eb185fc19d27fba33163ccab7c5ab5880a211d4f7e0fea74346d4e5e25c4b3619350b814

data/LICENSE

@@ -0,0 +1,21 @@
+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.

data/README.md

@@ -0,0 +1,30 @@
+# Gtk2Mp3 I: Posser
+
+* [github](https://www.github.com/carlosjhr64/gtk2mp3)
+* [rubygems]((https://rubygems.org/gems/gtk2mp3)
+
+## DESCRIPTION:
+
+A "Next!" button gui for [MPD/MPC](https://www.musicpd.org/).
+
+## SYNOPSIS
+
+    gtk2mp3 --help
+
+## HELP
+
+    Usage:
+     gtk2mp3 [:options+]
+    Options:
+     -h --help
+     -v --version
+     -f --force  	Skips mpd prechecks
+     --noinit    	Don't reset the playlist
+    # Notes #
+    # Requires MPD/MPC.
+    # See https://www.musicpd.org/clients/mpc/.
+
+## INSTALL
+
+    $ sudo gem install gtk2mp3
+

data/bin/gtk2mp3

@@ -1,33 +1,45 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-gem 'gtk2applib', '~> 15.3'
-$help = <<EOT
+require 'help_parser'
 
-You can also give it the default mp3 directory via command line...
-\t#{$0} /path-to/mp3s
-
-EOT
-require 'gtk2applib' # Gtk2AppLib defined
+module Gtk2Mp3
+  VERSION = '1.0.0'
+end
+OPTIONS = HelpParser[Gtk2Mp3::VERSION,<<HELP]
+Usage:
+  gtk2mp3 [:options+]
+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
 
-program = Gtk2AppLib::Program.new( {
-        'name'		=> 'Ruby-Gnome MP3',
-        'authors'	=> ['carlosjhr64@gmail.com'],
-        'website'	=> 'https://sites.google.com/site/gtk2applib/home/gtk2applib-applications/gtk2mp3',
-        'website-label'	=> 'Ruby-Gnome MP3',
-        'license'	=> 'GPL',
-        'copyright'	=> '2011-07-16 16:15:40',
-        } )
+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 system 'ps -C mpd'
+    unless system 'mpd'
+      $stderr.puts 'Could not start the mpd daemon.'
+      exit 69 # EX_UNAVAILABLE
+    end
+  end
+end
 
-begin
-  require 'gtk2mp3' # Gtk2MP3 defined
-  Gtk2MP3::Couple.load
-  program.window do |window|
-    Gtk2MP3::GUI.new(window,program)
-    window.show_all
+unless OPTIONS.noinit?
+  unless system 'mpc clear' and system 'mpc ls | mpc add'
+    $stderr.puts 'Could not initialize mpd\'s playlist'
+    exit 76 # EX_PROTOCOL
   end
-rescue Exception
-  $!.puts_bang!
-ensure
-  Gtk2MP3::Couple.dump
-  program.finalize
+  system 'mpc random on'
+  system 'mpc consume off'
+  system 'mpc repeat on'
 end
+
+require 'gtk2mp3'
+Gtk3App.main(Gtk2Mp3)
+system 'mpc stop'

data/cache/dbm.json

@@ -0,0 +1 @@
+{}

data/data/VERSION

@@ -0,0 +1 @@
+1.0.0

data/lib/gtk2mp3/config.rb

@@ -0,0 +1,33 @@
+module Gtk2Mp3
+  using Rafini::String
+  APPDIR = File.dirname File.dirname __dir__
+  CONFIG = {
+    PLAYED: 30,
+    DBM: "#{XDG['CACHE']}/gtk3app/gtk2mp3/dbm.json",
+    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'],
+      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!',
+      },
+    }
+  }
+end

data/lib/gtk2mp3/gui.rb

@@ -0,0 +1,106 @@
+module Gtk2Mp3
+  def self.run(program)
+    GUI.new(program)
+  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
+      @label.text = @playing = ID[`mpc searchplay filename '#{random_song}'`]
+    end
+
+    def down(id)
+      if count=@db[id]
+        count -= 1
+        if count>0
+          @db[id] = count
+        else
+          @db.delete(id)
+        end
+      end
+    end
+
+    def up(id)
+      @db[id] = @db[id].to_i+1
+    end
+    
+    def db_update
+      if @skipped
+        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
+      end
+      @time,@played,@skipped = Time.now,@playing,nil
+    end
+
+    def mpc_idle_player
+      loop do
+        system 'mpc idle player'
+        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'
+      end
+    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
+      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!}
+      @label = Such::Label.new(vbox)
+      menu.each{|_|_.destroy if _.label=='Full Screen' or _.label=='Help'}
+      minime.each{|_|_.destroy}
+      minime.append_menu_item(:stop_item!){stop_song!}
+      minime.append_menu_item(:next_item!){next_song!}
+
+      # Inits
+      @list = `mpc listall`.lines.map{|_|ID[_]}.uniq
+      @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
+    end
+  end
+end

data/lib/gtk2mp3.rb

@@ -1,189 +1,13 @@
-require 'gtk2mp3/playlist'
-require 'gtk2mp3/couple' # Couple defined
-    # Configuration defined in gtk2mp3/appconfig
-    # Gtk2AppLib defined
+# This is a Gtk3App.
+require 'gtk3app'
 
-module Gtk2MP3 # Gtk2MP3 defined
-  MP3 = '.mp3'
+# Standard Libraries
+require 'json'
 
-  class Pipe # Pipe defined
-    def initialize(gui)
-      @gui = gui
-      @pipe = nil
-      self.open
-    end
-    def _read
-      @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 =~ /^@E/ then
-          @gui.load_song
-        elsif line == '@P 0' then
-          _read	if @gui.continue
-        end
-      end
-    end
-    def open
-      if !@pipe then
-        @pipe = IO.popen(Configuration::PLAYER,'w+') # IO defined
-        self.puts Configuration::C_SILENCE
-        @thread = Thread.new { self.read }
-        sleep(Configuration::SLEEP)
-      end
-    end
-    def puts(string)
-      self.open
-      @pipe.puts string
-      @pipe.flush
-    end
-    def close
-      if @pipe then
-        @thread.kill
-        @thread = nil
-        @pipe.close
-        @pipe = nil
-      end
-    end
-  end
+# This Gem.
+require_relative 'gtk2mp3/config.rb'
+require_relative 'gtk2mp3/gui.rb'
 
-  # This is GUI
-  class GUI
-    attr_reader :continue, :couple, :current
-    attr_writer :previous
-
-    def initialize(window,program)
-      @playlist = Gtk2MP3::Playlist.new(Configuration::DIRECTORY)
-      @current = ''
-      @previous = ''
-      @continue = true
-      @pipe = Pipe.new(self)
-      window.signal_connect('destroy'){ @pipe.close }
-
-      vbox = Gtk2AppLib::Widgets::VBox.new(window)
-
-      hbox = Gtk2AppLib::Widgets::HBox.new(vbox)
-      @info = Gtk2AppLib::Widgets::Label.new(*Configuration::INFO+[hbox])
-
-      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(*spacer) # Spacer
-        Gtk2AppLib::Widgets::Button.new(*Configuration::PAUSE+[hbox]){ self.pause_song }
-      end
-      if Configuration::STOP then
-        Gtk2AppLib::Widgets::Label.new(*spacer) # Spacer
-        Gtk2AppLib::Widgets::Button.new(*Configuration::STOP+[hbox]){ self.stop_song }
-      end
-      if Configuration::EDIT then
-        Gtk2AppLib::Widgets::Label.new(*spacer) # Spacer
-        Gtk2AppLib::Widgets::Button.new(*Configuration::EDIT+[hbox]) do
-          self.stop_song!
-          sleep(Configuration::SLEEP)
-          filename = self.current
-          copy = File.join( Gtk2AppLib::USERDIR, File.basename(filename) )
-          if system( "xterm -e cutmp3 -i #{filename} -O #{copy}" )
-            if File.exist?(copy)
-              File.rename( copy, filename ) # replace with edited file
-            end
-          end
-          sleep(Configuration::SLEEP)
-          self.play_current
-        end
-      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|
-          cb = is.checkbutton
-          if cb.active? then
-            self.delete_song
-            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
-        _random_song
-        plays = @couple.play?
-      end
-    end
-
-    def play_current
-      @pipe.puts "#{Configuration::C_LOAD} #{@current}"
-      @time = Time.now
-    end
-
-    def load_song
-      self.random_song
-      @info.text = File.basename(@current,MP3) # File defined
-      self.play_current
-    end
-
-    def demote
-      @couple.demote	if Time.now - @time < 60.0
-    end
-
-    def skip_song
-      (@continue)? demote: (@continue = true)
-      self.load_song
-    end
-
-    def stop_song!
-      @pipe.puts Configuration::C_STOP
-      @pipe.close
-    end
-
-    def stop_song
-      if @continue then
-        @previous = ''
-        @continue = false
-        stop_song!
-      else
-        @continue = true
-        self.load_song
-      end
-    end
-
-    def pause_song
-      @pipe.puts Configuration::C_PAUSE
-    end
-
-    def delete_song
-      File.unlink(@current)
-      @playlist.delete(@current)
-      Couple.delete(@current)
-      self.load_song
-    end
-  end
-end
+# Requires:
+#`ruby`
+#`mpd`

metadata

@@ -1,71 +1,98 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gtk2mp3
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.7.0
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
-- carlosjhr64@gmail.com
+authors:
+- carlosjhr64
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: gtk2applib
+date: 2018-03-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: help_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.3.0
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "15.3"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.3.0
+- !ruby/object:Gem::Dependency
+  name: gtk3app
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
   type: :runtime
-  version_requirements: *id001
-description: a "Next!" button gui for mpg123
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+description: 'A "Next!" button gui for MPD/MPC.
+
+'
 email: carlosjhr64@gmail.com
-executables: 
+executables:
 - gtk2mp3
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- ./lib/gtk2mp3/appconfig.rb
-- ./lib/gtk2mp3/couple.rb
-- ./lib/gtk2mp3/playlist.rb
-- ./lib/gtk2mp3.rb
-- ./pngs/icon.png
-- ./pngs/logo.png
-- ./README.txt
+files:
+- LICENSE
+- README.md
 - bin/gtk2mp3
-homepage: https://sites.google.com/site/gtk2applib/home/gtk2applib-applications/gtk2mp3
-licenses: []
-
+- cache/dbm.json
+- data/VERSION
+- data/logo.png
+- lib/gtk2mp3.rb
+- lib/gtk2mp3/config.rb
+- lib/gtk2mp3/gui.rb
+homepage: https://github.com/carlosjhr64/gtk2mp3
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-requirements: 
-- mpg123
+    - !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: 
-rubygems_version: 1.8.10
+rubygems_version: 2.7.3
 signing_key: 
-specification_version: 3
-summary: Gtk2MP3
+specification_version: 4
+summary: A "Next!" button gui for MPD/MPC.
 test_files: []
-

data/README.txt

@@ -1,7 +0,0 @@
-= Gtk2MP3
-== DESCRIPTION:
-a "Next!" button gui for mpg123
-== FEATURES:
-pause and a trigger safe delete button (via checkbutton).
-== SINOPSIS:
-	gtk2mp3 </path-to/mp3s>

data/lib/gtk2mp3/appconfig.rb

@@ -1,56 +0,0 @@
-module Gtk2AppLib # Gtk2AppLib defined
-module Configuration
-  WINDOW_DEFAULT_SIZE[0],WINDOW_DEFAULT_SIZE[1] = 0,0 # WINDOW_DEFAULT_SIZE defined in gtk2applib/configuration
-  MENU[:dock] = '_Dock' # MENU defined in gtk2applib/configuration
-end
-end
-
-module Gtk2MP3
-module Configuration
-  # File defined
-  # ARGV defined as command line arguments
-  # Gtk defined in gtk2
-  # Where is your MP3 directory?
-  dialog = Gtk::FileChooserDialog.new("Choose Mp3 Directory", nil, Gtk::FileChooser::ACTION_SELECT_FOLDER, nil,
-	[Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL], [Gtk::Stock::OPEN, Gtk::Dialog::RESPONSE_ACCEPT])
-  directory = (ARGV.shift) || nil # '/path/to/mp3s' # give it a good default, dude!
-  if directory && File.exist?(directory) && File.directory?(directory) then
-    dialog.filename = directory
-  end
-  if dialog.run == Gtk::Dialog::RESPONSE_ACCEPT
-    directory = dialog.filename
-  else
-    exit
-  end
-  dialog.destroy
-  DIRECTORY = directory
-
-  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
-
-  RELOAD = '_Reload'
-
-  clicked = 'clicked'
-  NEXT		= ['Next!',	options,	clicked].freeze
-  PAUSE		= ['Pause',	options,	clicked].freeze # this one can be set to nil
-  STOP		= ['Stop',	options,	clicked].freeze # this one can be set to nil
-  DELETE	= ['Delete',	options,	clicked].freeze # this one can be set to nil
-  EDIT		= (Gtk2AppLib::Configuration::X && Gtk2AppLib.which([['cutmp3', ' ']]))? ['Edit',	options,	clicked].freeze : nil # this one can be set to nil
-
-  SELECT_A_FILE = [['Select a file', Gtk::FileChooser::ACTION_OPEN],Gtk2AppLib::HNIL].freeze
-
-  PLAYER	= 'mpg123 -q -a hw:0,0 -R' # 'mpg123 -q -R'
-  # mpg123 commands
-  C_PAUSE	= 'P'
-  C_STOP	= 'S'
-  C_SILENCE	= 'SILENCE'
-  C_LOAD	= 'L'
-  C_QUIT	= 'Q'
-
-  SLEEP		= 0.5
-end
-end

data/lib/gtk2mp3/couple.rb

@@ -1,99 +0,0 @@
-# Gtk2AppLib defined
-# File defined
-module Gtk2MP3 # Gtk2MP3 defined
-class Couple # Couple defined
-  BASE = Hash.new(1.0)
-  BASE_DUMP = Gtk2AppLib::USERDIR + '/base.dump'
-
-  COUPLE = Hash.new(1.0)
-  COUPLE_DUMP = Gtk2AppLib::USERDIR + '/couple.dump'
-
-  LEARNING = Math.sqrt(2.0) # Math defined, built in
-  SEP = '/'
-  SEPX = Regexp.new(SEP) # Regexp defined, built in
-
-  def initialize(candidate,previous)
-    @candidate = candidate
-    @previous = previous
-    self.keys!
-    self.threshold!
-  end
-
-  def self._load(dump,hash)
-    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)	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{|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 } }
-    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)
-    Couple._dump(COUPLE_DUMP,COUPLE)
-  end
-
-  def keys!
-    @base = File.basename(@candidate,Gtk2MP3::MP3)
-    @couple = @base + SEP + File.basename(@previous,Gtk2MP3::MP3)
-  end
-
-  def keys
-    return @base, @couple
-  end
-
-  def threshold!
-    @threshold = BASE[@base] * COUPLE[@couple] 
-  end
-
-  def treshold
-    @threshold
-  end
-
-  def promote
-    BASE[@base]		*= LEARNING
-    COUPLE[@couple]	*= LEARNING
-    BASE[@base]		= 1.0	if BASE[@base] > 1.0
-    COUPLE[@couple]	= 1.0	if COUPLE[@couple] > 1.0
-  end
-
-  def promote!
-    self.promote
-    self.threshold!
-  end
-
-  def demote
-    BASE[@base]		/= LEARNING
-    COUPLE[@couple]	/= LEARNING
-    BASE[@base]		= 0.25	if BASE[@base] < 0.25
-    COUPLE[@couple]	= 0.25	if COUPLE[@couple] < 0.25
-  end
-
-  def demote!
-    self.demote
-    self.threshold!
-  end
-
-  def play?
-    return rand < @threshold
-  end
-end
-end

data/lib/gtk2mp3/playlist.rb

@@ -1,24 +0,0 @@
-require 'find' # Find defined
-
-module Gtk2MP3
-class Playlist < Array # [] defined in Array
-  IS_MP3 = Regexp.new(/\.mp3$/) # Regexp defined, built in
-
-  def initialize(directory)
-    super()
-    @directory = directory
-    self.reload
-    $stderr.puts "Playlist length #{self.length}" if $trace
-  end
-
-  def reload
-    self.clear
-    Find.find(@directory){|fn| self.push(fn)	if fn=~IS_MP3 }
-    raise 'no mp3s found' if self.length < 1
-  end
-
-  def random
-    self[ rand(self.length) ]
-  end
-end
-end