zik 0.17.0 → 0.17.1

data/ChangeLog

@@ -1,3 +1,10 @@
+Fix bug when ZiK is called with configuration option
+
+###Version 0.17.1
+Fix a bug in configuration reading that leads to a crash (Thank Mouine89 for the report on ubuntu-fr forum)
+Fix bugs in Pack module and export functions with ruby1.9 (Thank Кຼزດ for the report on ubuntu-fr forum)
+Fix a bug in dependencies script
+
 ###Version 0.17.0
 Use new icons picture. Thanks J. Kaiden for the artwork.
 Add choices for theme in preferences window.

data/Makefile.in

@@ -1,5 +1,5 @@
 NAME=ZiK
-VERSION=0.17.0
+VERSION=0.17.1
 
 SHELL=/bin/sh
 RUBY=/usr/bin/ruby
@@ -89,7 +89,6 @@ install-theme:
 	$(INSTALL_DIR) $(DESTDIR)$(THEMEDIR)
 	for theme in $(THEMES); do \
 	$(INSTALL_DIR) $(DESTDIR)$(THEMEDIR)/$$theme; \
-#	echo $(SRCDIR)/theme/$theme/*; \
 	$(INSTALL_DATA) $(SRCDIR)/theme/$$theme/* $(DESTDIR)$(THEMEDIR)/$$theme; \
 	done
 

data/ZiK.rb

@@ -119,8 +119,8 @@ $border=5
 #Configuration
 require File.join(Data_dir, 'gui/config')
 if (defined? User_dir)
-	Cache_dir=File.join('User_dir', 'cache')
-	Runtime_dir=File.join('User_dir', 'runtime')
+	Cache_dir=File.join(User_dir, 'cache')
+	Runtime_dir=File.join(User_dir, 'runtime')
 else
 	User_dir= ENV['XDG_CONFIG_HOME'] ? File.join(ENV['XDG_CONFIG_HOME'], 'ZiK') :
 		File.join(ENV['HOME'], '.config', 'ZiK')
@@ -142,7 +142,7 @@ unless File.exist?(User_dir)
 	Dir.mkdir(User_dir)
 	config_new=true
 end
-Dir.mkdir(Cache_dir) unless File.exist?(Cache_dir)
+Dir.mkdir(Cache_dir) unless File.exist?(Cache_dir)#TODO bug with zik -c /dev/null
 Dir.mkdir(Runtime_dir, 0700) unless File.exist?(Runtime_dir)
 if File.directory?(User_dir)
 	configuration_file=File.join(User_dir,'ZiKrc')

data/dependencies

@@ -80,7 +80,7 @@ else
 	EXIT=1
 fi
 
-if (ruby -e "require 'gtk2';  Gdk::Pixbuf.new('pix/sound_directory.svg')")
+if (ruby -e "require 'gtk2';  Gdk::Pixbuf.new('pix/ZiK.svg')")
 then
 	echo "Checking svg support..Ok"
 else

data/doc/ChangeLog

@@ -1,3 +1,10 @@
+Fix bug when ZiK is called with configuration option
+
+###Version 0.17.1
+Fix a bug in configuration reading that leads to a crash (Thank Mouine89 for the report on ubuntu-fr forum)
+Fix bugs in Pack module and export functions with ruby1.9 (Thank Кຼزດ for the report on ubuntu-fr forum)
+Fix a bug in dependencies script
+
 ###Version 0.17.0
 Use new icons picture. Thanks J. Kaiden for the artwork.
 Add choices for theme in preferences window.

data/gui/common.rb

@@ -20,6 +20,13 @@ This file is part of ZiK.
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 =end
 
+#General utilities methods
+def array_from_args(arg)
+#To be call after "def my_method(*args)"
+#in order to accept both forms: my_method([1, 2, 3]) and my_method(1, 2, 3)
+	arg[0].instance_of?(Array) && arg.length==1 ? arg[0] : arg
+end
+
 #GDK_KEY_name are defined since gtk 2.22 and ruby-gnome2 ?.?
 #GDK_name will be dropped
 begin
@@ -38,7 +45,7 @@ end
 module Pack
 private
 def hpack(*a)#Accept both forms: hpack([1, 2, 3]) and hpack(1, 2, 3)
-	array=*a
+	array=array_from_args(a)
 	hbox=Gtk::HBox.new
 	hbox.border_width=$border
 	hbox.spacing=$border
@@ -48,7 +55,7 @@ def hpack(*a)#Accept both forms: hpack([1, 2, 3]) and hpack(1, 2, 3)
 	hbox
 end
 def vpack(*a)
-	array=*a
+	array=array_from_args(a)
 	vbox=Gtk::VBox.new
 	vbox.border_width=$border
 	vbox.spacing=$border

data/gui/config.rb

@@ -95,7 +95,7 @@ private
 		#Player
 		self['play_on_start']=="true" ? self['play_on_start']=true : self['play_on_start']=false
 		self['current_song']=self['current_song'].to_i
-		self['volume']=self['volume'].gsub(/,/,'.').to_f#Volume is written with a comma to seperate decimals. Is it a bug?
+		self['volume']=self['volume'].to_f
 		self['shuffle']=="true" ? self['shuffle']=true : self['shuffle']=false
 		self['repeat']=="true" ? self['repeat']=true : self['repeat']=false
 		#cd

data/gui/gui.rb

@@ -510,7 +510,7 @@ class Gui < Gtk::Window
 		@bnext= Gtk::Button.new;@bnext.image=@inext
 		@bnext.signal_connect('clicked'){next_song}
 #time
-		@lposition=Gtk::Label.new('--:--')
+		@lposition=Gtk::Label.new(' --:--')
 		@lposbox=Gtk::EventBox.new
 		@lposbox.events=Gdk::Event::BUTTON_PRESS_MASK
 		@lposbox.add(@lposition)
@@ -784,14 +784,14 @@ public
 			@song_title.text="#{song.name}"
 			duration=song.duration
 			if duration <= 0
-				@lduration.text='--:--'
+				@lduration.text='--:-- '
 				@sposition.set_range(0,1200)#Use 20 minutes if song's duration is not known.
 				GLib::Timeout.add(600){get_gst_duration(player, song)}#if taglib cannot give the track duration, let's try GStreamer
 			elsif duration < 3600
-				@lduration.text=Time.at(duration).strftime("%M:%S")
+				@lduration.text=Time.at(duration).strftime("%M:%S ")
 				@sposition.set_range(0,duration)
 			else
-				@lduration.text=(duration.to_i/3600).to_s+":"+Time.at(duration).strftime("%M:%S")
+				@lduration.text=(duration.to_i/3600).to_s+":"+Time.at(duration).strftime("%M:%S ")
 				@sposition.set_range(0,duration)
 			end
 			store.each{|model, path, iter|
@@ -805,25 +805,25 @@ public
 			GLib::Timeout.add(400){
 				position=player.position
 				if position <= 0
-					@lposition.text="--:--"
+					@lposition.text=" --:--"
 				else
 					duration=song.duration#get an uptodate duration
 					if duration <= 0
-						@lposition.text=Time.at(position).strftime("%M:%S")
+						@lposition.text=Time.at(position).strftime(" %M:%S")
 					elsif duration < 3600
 						if @config['remaining_time']
-							t=duration-position; format="-%M:%S"
+							t=duration-position; format=" -%M:%S"
 						else
-							t=position; format="%M:%S"
+							t=position; format=" %M:%S"
 						end
 						@lposition.text=Time.at(t).strftime(format)
 					else
 						if @config['remaining_time']
 							t=duration-position
-							format="-"
+							format=" -"
 						else
 							t=position
-							format=""
+							format=" "
 						end
 						@lposition.text=format+(t.to_i/3600).to_s+":"+Time.at(t).strftime("%M:%S")
 					end
@@ -848,9 +848,9 @@ private
 		if duration>0
 			song.duration=duration
 			if duration < 3600
-				@lduration.text=Time.at(duration).strftime("%M:%S")
+				@lduration.text=Time.at(duration).strftime("%M:%S ")
 			else
-				@lduration.text=(duration.to_i/3600).to_s+":"+Time.at(duration).strftime("%M:%S")
+				@lduration.text=(duration.to_i/3600).to_s+":"+Time.at(duration).strftime("%M:%S ")
 			end
 			@sposition.set_range(0,duration)
 		else

data/playlist/export.rb

@@ -20,7 +20,33 @@ This file is part of ZiK.
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 =end
 
-require 'ftools'
+begin
+#ruby 1.9+
+	require 'fileutils'
+rescue LoadError
+#Emulate FileUtils needed methods
+	require 'ftools'
+	class FileUtils
+		def FileUtils.makedirs(dir)
+			File.makedirs(dir)
+		end
+		def FileUtils.copy_file(src, dest)
+			File.copy(src, dest)
+		end
+	end
+end
+
+=begin
+begin
+#ruby 1.8
+	require 'ftools'
+#	def ExportList.makedirs ExportList.copy
+rescue LoadError
+#ruby 1.9
+	require 'fileutils'
+#	def ExportList.makedirs ExportList.copy
+end
+=end
 
 class ExportSong
 	attr_reader :old_path, :path, :duration, :name, :bitrate, :samplerate, :channels, :type,
@@ -87,8 +113,8 @@ class ExportList
 						estock.add(ErrorWARNING, _("#{song.path} allready exists."))
 					else
 						dir=File.dirname(song.path)
-						File.makedirs(dir) unless File.exist?(dir)
-						File.copy(song.old_path, song.path)
+						FileUtils.makedirs(dir) unless File.exist?(dir)
+						FileUtils.copy_file(song.old_path, song.path)
 					end
 				rescue Errno::ENOENT#Original file (song.old) was removed
 					estock.add(ErrorERROR, _("Cannot access #{song.old_path}"))

data/playlist/song.rb

@@ -92,6 +92,7 @@ class Song
 			@bitrate=tag.bitrate
 			@samplerate=tag.samplerate
 			@channels=tag.channels
+			tag.close if tag.respond_to?(:close)
 		rescue TagLib::BadFile
 			ErrorWarning.new("Cannot read #{file}\'s tag.")
 			@title||=''; @artist||=''; @album||=''; @track||=-1; @genre||=''; @duration||=-1
@@ -103,6 +104,8 @@ class Song
 		rescue TagLib::BadAudioProperties
 			ErrorWarning.new("Cannot read #{file}\'s audio properties.")
 			@bitrate||=-1; @samplerate||=-1; @channels||=-1
+		ensure
+			tag.close if tag&&tag.respond_to?(:close)#Deprecated (ruby-taglib >= 0.1.3). Use "tag.close if tag"
 		end
 	end
 	
@@ -116,6 +119,8 @@ class Song
 			ErrorWarning.new("Cannot write #{file}\'s tag.")
 		rescue TagLib::BadTag
 			ErrorWarning.new("Cannot write #{file}\'s tag.")
+		ensure
+			tag.close if tag&&tag.respond_to?(:close)#Deprecated (ruby-taglib >= 0.1.3)
 		end			 
 	end
 	

data/zik

@@ -1,401 +1,2 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
-
-=begin
-Copyright 2007-2011 Vincent Carmona
-vinc4mai@gmail.com
-
-This file is part of ZiK.
-
-    ZiK is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    ZiK is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZiK; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-=end
-
-$name='ZiK'
-Version='0.17.0+gitv0.17'
-
-#Usage
-def usage
-	puts "ZiK is an audio player based on gstreamer.\n\n"
-	puts "Options."
-	puts "--help -h\tPrint this help."
-	puts "--configuration -c <path>\tDirectory used to load and save configuration."
-	puts "--file -f <files>\tAdd files to playlist."
-	puts "--append -f <files>\tAppend files playlist."
-	puts "--show-all\tshow browser and playlist."
-	puts "--show-browser\tshow browser."
-	puts "--show-playlist\tshow playlist."
-	puts "--show-cd\tshow CD."
-	puts "--show-radio\tshow radios."
-	puts "--disable-cd\tDisable cd support"
-	puts "--disable-radio\tDisable webradios"
-	puts "--disable-module\tDisable module support"
-	puts "--hide-errors\tDo not show errors dialogs."
-	puts "--quiet -q\tDo not print on standart output."
-	puts "--no-save\tDo not overwrite configuration file"
-	puts "--title -t <name>\tRename window's title."
-	puts "--version\tDisplay the current version and exit."
-end
-
-#Parse options
-$write_config=true
-$show_errors=true
-$cd=true
-$radio=true
-$module=true
-append=false
-playfiles=[]
-while arg=ARGV.shift
-	case arg
-		when '--version'
-			puts "ZiK version #{Version}.";exit 0
-		when '--help', '-h'
-			usage;exit 0
-		when '--quiet', '-q'
-			$stderr=$stdout=File.new('/dev/null', 'w')
-		when '--no-save'
-			$write_config=false
-		when '--hide-errors'
-			$show_errors=false
-		when '--disable-cd'
-			$cd=false
-		when '--disable-radio'
-			$radio=false
-		when '--disable-module'
-			$module=false
-		when '--configuration', '-c'
-			User_dir=ARGV.shift
-		when '--show-all'
-			view='all'
-		when '--show-browser'
-			view='browser'
-		when '--show-playlist'
-			view='playlist'
-		when '--show-cd'
-			view='cd'
-		when '--show-radio'
-			view='radio'
-		when '--file', '-f'
-			append=false
-		when '--append', '-a'
-			append=true
-		when '--title', '-t'
-			$name+=' - '+ARGV.shift
-		when /^-/
-			$stderr.puts "Unknown option. Try ZiK --help.";exit 1
-		else
-			playfiles.push(arg)
-	end
-end
-
-Data_dir='/usr/local/share/ZiK'
-Pix_dir=File.join(Data_dir,'pix')
-Theme_dir=File.join(Data_dir, 'theme')
-Doc_dir='/usr/local/share/doc/ZiK'
-Locale_dir='/usr/local/share/locale'
-
-require 'gettext'
-include GetText
-bindtextdomain('ZiK', {:path=>Locale_dir})
-require File.join(Data_dir, 'gui/error')
-estock=ErrorsStock.new
-
-ErrorInfo.new("Hi! This is #{$name} (#{Version}). Enjoy your music.")
-
-#Global configuration
-$border=5
-
-#Configuration
-require File.join(Data_dir, 'gui/config')
-if (defined? User_dir)
-	Cache_dir=File.join('User_dir', 'cache')
-	Runtime_dir=File.join('User_dir', 'runtime')
-else
-	User_dir= ENV['XDG_CONFIG_HOME'] ? File.join(ENV['XDG_CONFIG_HOME'], 'ZiK') :
-		File.join(ENV['HOME'], '.config', 'ZiK')
-	unless File.exist?(User_dir)#Check for deprecated location of User_dir
-		old_user_dir=File.join(ENV['HOME'],'.ZiK')
-		File.rename(old_user_dir, User_dir) if File.directory?(old_user_dir)
-	end
-	Cache_dir= ENV['XDG_CACHE_HOME'] ? File.join(ENV['XDG_CACHE_HOME'], 'ZiK') :
-		File.join(ENV['HOME'], '.cache', 'ZiK')
-	if ENV['XDG_RUNTIME_DIR']
-		Runtime_dir=File.join(ENV['XDG_RUNTIME_DIR'], 'ZiK')
-	else
-		require 'tempfile'
-		Runtime_dir=File.join(Dir.tmpdir, 'ZiK-'+ENV['USER'])
-		ErrorWarning.new("XDG_RUNTIME_DIR is not set. #{Runtime_dir} is used instead.")
-	end
-end
-unless File.exist?(User_dir)
-	Dir.mkdir(User_dir)
-	config_new=true
-end
-Dir.mkdir(Cache_dir) unless File.exist?(Cache_dir)
-Dir.mkdir(Runtime_dir, 0700) unless File.exist?(Runtime_dir)
-if File.directory?(User_dir)
-	configuration_file=File.join(User_dir,'ZiKrc')
-	config=Configuration.new(configuration_file)
-else
-	config=Configuration.new("")
-	$write_config=false
-	config_new=true
-	estock.add(ErrorERROR, _("Configuration will not be saved. #{User_dir} is not a directory."))
-end
-config_new||=false
-config['view']=view if view
-
-#Socket (client part)
-module ZiKSocket
-	Address=File.join(Runtime_dir, 'socket')
-end
-if File.socket?(ZiKSocket::Address)
-	require File.join(Data_dir, 'gui/socket')
-	begin
-		client=ZiKSocket::Client.new
-		ErrorInfo.new(_("Multisession : server already exists."))
-		playfiles.each{|file|
-			file=File.join(Dir.pwd, file) unless file =~ /^\//#absolute path
-			p client.command("add #{file}")
-		}
-		client.command("show")
-		client.close
-		exit 0
-	rescue Errno::ECONNREFUSED
-		ErrorError.new(_("Multissession: socket exists but server does not respond."))
-		File.delete(ZiKSocket::Address)
-	end
-end
-
-#Files needed for playlist managing
-require 'pathname'
-require 'rexml/document'
-begin
-	require 'taglib2'
-rescue LoadError
-	require 'taglib'
-	ErrorWarning.new("ruby-taglib is depreated.")
-end
-require File.join(Data_dir, 'playlist/song')
-require File.join(Data_dir, 'playlist/common')
-require File.join(Data_dir, 'playlist/export')
-require File.join(Data_dir, 'playlist/playlist')
-
-
-#Files needed for the audio player
-require 'gst'
-require File.join(Data_dir, 'player/player')
-
-#Files needed for graphical interface
-require 'gtk2'
-require 'find'
-require File.join(Data_dir, 'gui/common')
-require File.join(Data_dir, 'gui/preference')
-require File.join(Data_dir, 'gui/search')
-require File.join(Data_dir, 'playlist/editlist')
-require File.join(Data_dir, 'gui/edit')
-require File.join(Data_dir, 'gui/progress')
-require File.join(Data_dir, 'gui/gui')
-
-#Files needed for audio cd
-if $cd
-	begin
-		require 'musicbrainz'
-		require File.join(Data_dir, 'playlist/cdlist')
-		require File.join(Data_dir, 'player/cdplayer')
-		require File.join(Data_dir, 'gui/cdgui')
-	rescue LoadError
-		estock.add(ErrorERROR, _("CD support disable. mb-ruby is probably not installed."))
-		$cd=false
-	end
-end
-
-#Files needed for webradio
-if $radio
-	begin
-		require 'uri'
-		require 'net/http'
-		require File.join(Data_dir, 'playlist/radiolist')
-		require File.join(Data_dir, 'player/radioplayer')
-		require File.join(Data_dir, 'gui/radiogui')
-	rescue LoadError
-		estock.add(ErrorERROR, _("Radio support disable."))
-		$radio=false
-	end
-end
-
-#Playlists
-if (playfiles.empty? || append)
-	playlist=PlayList.new(File.join(User_dir,'playlist'),
-		config['current_song'], config['shuffle'], config['repeat'], config['name_format'], config['sort_by_track'])
-end
-playlist||=PlayList.new(nil, 0, config['shuffle'], config['repeat'], config['name_format'], config ['sort_by_track'])
-playfiles.each{|f| playlist.add(f)}
-
-cdlist=Cd::List.new(config) if $cd
-if $radio
-	radio_file=File.join(User_dir,'radio')
-	radiolist=Radio::List.new(radio_file)
-end
-
-#Players
-player=Player.new
-player.volume=config['volume']
-if $cd
-	begin
-		cdplayer=Cd::Player.new(config['cd_device'])
-		cdplayer.volume=config['volume']
-	rescue
-		estock.add(ErrorERROR, _("CD support disable (device not found?)."))
-		$cd=false
-	end
-end
-if $radio
-	radioplayer=Radio::Player.new
-	radioplayer.volume=config['volume']
-end
-
-cdplayer=nil unless $cd
-cdlist=nil unless $cd
-radiolist=nil unless $radio
-
-#Gui
-module View
-	View::ALL=0
-	View::PLAYLIST=1
-	View::BROWSER=2
-	View::COMPACT=3
-	if $cd
-		View::CD=4
-		$radio ? View::RADIO=5 : View::RADIO=View::ALL
-	else
-		View::CD=View::ALL
-		$radio ? View::RADIO=4 : View::RADIO=View::ALL
-	end
-end
-module DragType
-#Type of data
-	#General types
-	#DragType::STRING=104 #Gdk::Atom.intern('string',true).to_i
-	DragType::URI_LIST=105 #text/uri-list
-	#DragType::PLAIN=106 #text/plain
-	#ZiK types
-	DragType::BROWSER_SELECTION=700
-end
-begin
-	Gdk::Color.parse(config['playing_color'])
-rescue
-	ErrorError.new("#{config['playing_color']} is not a valid color. Use default one.")
-	config['playing_color']=config.default['playing_color']
-end
-if config_new
-	require File.join(Data_dir, 'gui/assistant')
-	assistant=Assistant.new(config)
-	def assistant.quit
-		self.destroy
-		Gtk.main_quit
-	end
-	Gtk.main
-end
-gui=Gui.new(player, playlist, config, cdplayer, cdlist, radioplayer, radiolist)
-gui.show
-Error.gui=gui
-ErrorsStock.gui=gui
-player.gui=gui
-cdplayer.gui=gui if $cd
-radioplayer.gui=gui if $radio
-
-#Socket (Server part)
-##See http://ruby-gnome2.sourceforge.jp/hiki.cgi?tips_threads if random crash happen (or try GLib::Idle before)
-module ZiKSocket
-	def ZiKSocket.clean
-		if File.socket?(Address)
-			c=ZiKSocket::Client.new
-			c.close_server
-			File.delete(Address)
-		end
-	end
-end
-if config['socket']
-	require File.join(Data_dir, 'gui/socket')
-	ZiKSocket.start_server(gui, config, playlist)
-end
-
-#Modules
-if $module
-	require File.join(Data_dir, 'gui/mod')
-	Mod.zik=gui
-	modinput={:config_dir=>File.join(User_dir, 'mod'), :mod_dir=>File.join(Data_dir,'mod'), :pix_dir=>Pix_dir}
-	ext='.rb'
-
-	mfiles=Dir.glob(File.join(Data_dir, 'mod', '*'+ext))
-	mfiles.each{|file|
-		begin
-			require file#require all modules in order to build preferences dialog.
-		rescue LoadError
-			estock.add(ErrorERROR, _("Cannot loaded a module (#{file})."))
-		rescue ModNotUniqueId
-			estock.add(ErrorERROR, _("Module id not unique (#{file})."))
-		end
-	}
-	Mod.own.each{|mod|
-		mod.init(modinput)
-		mod.load if config['module'].split(',').include?(mod.id)
-	}
-
-	Mod.global=false
-	mfiles=Dir.glob(File.join(User_dir, 'mod','*'+ext))
-	modinput[:mod_dir]=File.join(User_dir, 'mod')
-	mfiles.each{|file|
-		begin
-			require file#require all modules in order to build preferences dialog.
-		rescue LoadError
-			estock.add(ErrorERROR, _("Cannot loaded a module (#{file})."))
-		rescue ModNotUniqueId
-			estock.add(ErrorERROR, _("Module id not unique (#{file})."))
-		end
-	}
-	Mod.user.each{|mod|
-		mod.init(modinput)
-		mod.load if config['module'].split(',').include?(mod.id)
-	}
-	ModErrorLoadError.show_all
-end
-
-#Main
-gui.play if config['play_on_start']
-estock.show_all
-begin
-	Gtk.main
-	if $write_config
-		playlist.save_zik(File.join(User_dir,'playlist'), config['relative_playlist'])
-		config['current_song']=playlist.current
-		config['volume']=player.volume
-		config.write
-		radiolist.write if $radio
-	end
-	Mod.all.each{|mod| mod.quit} if $module
-ensure
-	player.stop
-	cdplayer.stop if $cd
-	radioplayer.stop if $radio
-	ZiKSocket.clean
-	begin
-		Dir.rmdir(Runtime_dir) if File.directory?(Runtime_dir)
-	rescue Errno::ENOTEMPTY
-		ErrorError.new("Cannot delete #{Runtime_dir}.")
-	end
-end
-
-ErrorInfo.new("Bye.")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zik
 version: !ruby/object:Gem::Version 
-  hash: 91
-  prerelease: false
+  hash: 89
+  prerelease: 
   segments: 
   - 0
   - 17
-  - 0
-  version: 0.17.0
+  - 1
+  version: 0.17.1
 platform: ruby
 authors: 
 - Vincent Carmona
@@ -36,8 +36,7 @@ cert_chain:
   oxzIRXlS
   -----END CERTIFICATE-----
 
-date: 2011-04-15 00:00:00 +02:00
-default_executable: 
+date: 2011-12-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gtk2
@@ -110,7 +109,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: ruby-libnotify
+  name: ruby-mp3info
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -124,7 +123,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: ruby-mp3info
+  name: globalhotkeys
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -137,20 +136,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: globalhotkeys
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id008
 description: 
 email: vinc4mai@gmail.com
 executables: 
@@ -232,9 +217,6 @@ files:
 - mod/brainz/ofa.rb
 - mod/brainz/song.rb
 - mod/brainz/widget.rb
-- mod/interact.rb
-- mod/interact/configwidget.rb
-- mod/interact/interaction.rb
 - doc/COPYING
 - doc/html/fr/index.html
 - doc/html/index.html
@@ -247,10 +229,8 @@ files:
 - doc/html/pix/logo.png
 - doc/html/styles/main.css
 - doc/ChangeLog
-- doc/man/zik.1.gz
 - doc/man/manpage.1
 - ./zik
-has_rdoc: true
 homepage: http://zik.rubyforge.org/
 licenses: 
 - General Public License v2
@@ -280,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - GStreamer Base Plugins
 rubyforge_project: zik
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: ZiK is an audio player based on gstreamer. It uses the path of your audio files instead of a music library.

metadata.gz.sig

@@ -1,3 +1,2 @@
-8�����l� 
-/�8]���
�(]�|ľ���8U߱��[��1D
-�}nl\�5�����j�A���k��,�l"0+��T�*����όd���}�M'�m]�k����yI��|���
�!�:I/�������Hh2:mă`�R{����4%��c�:\^E�׿j�5g���b�4�L�P�]�F��P�	�םz���J��4{�=��P::!��.-Tr���)�B�L�V���PL�tu��;�4@`F�K{�
+1��`;�p<��w���v3o�ĄW�S��������!ѧ��f?�bJ�{b�Z�ᵀg���.Z_K,>`hѯ���r���5B�B�V�b�=�%ī�����3�!:�ʩ
+U�&@��j�Fa0l���1|:

data/mod/interact.rb

@@ -1,131 +0,0 @@
-# encoding: UTF-8
-=begin
-Copyright 2007-2010 Vincent Carmona
-vinc4mai@gmail.com
-
-This file is part of ZiK.
-
-    ZiK is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    ZiK is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZiK; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-=end
-
-module Interact
-	Menu,LocalMenu=[], []
-	Arg, LocalArg=[], []
-	def self.menu_const_set(name, val, lval)
-		Menu.push(const_set(name, val))#Is it ok to push an object on a constant (not frozen) array ?
-		LocalMenu.push(const_set("LOCAL_"+name, lval))
-	end
-
-	def self.arg_const_set(name, val, lval)
-		Arg.push(const_set(name, val))
-		LocalArg.push(const_set("LOCAL_"+name, lval))
-	end
-
-	menu_const_set "MENU", "Menu", _("Menu")
-
-	arg_const_set "NONE", "None", _("None")
-	arg_const_set "PLAYLIST_FILES", "Playlit files", _("Playlit files")
-	arg_const_set "CURRENT_SONG", "Current Song", _("Current song")
-	arg_const_set "CURRENT_SONG_NAME", "Current song name", _("Current song name")
-
-	def Interact.mod
-		@m||=Mod.new('interact', "Interact", _("Add menu entries to interact with ZiK."),
-			'Vincent Carmona  <vinc4mai@gmail.com>', 'GPL-2')
-	end
-
-	Interact.mod
-	def @m.init(input)
-		@dir=input[:mod_dir]
-		require File.join(@dir, 'interact', 'interaction')
-		require File.join(@dir, 'interact', 'configwidget')
-		@interactions=Interaction.read(input[:config_dir])
-		@destroy_on_unload=[]
-	end
-
-	def @m.load
-		unless @loaded
-			@interactions.each{|interaction|
-				case interaction[:menu]
-				when MENU
-					it=Gtk::MenuItem.new(interaction[:name])
-					it.signal_connect('activate'){
-						arg=resolve_argument(interaction[:argument])
-						c=interaction[:command].split(' ')
-						t=[*c]+[*arg]
-						Thread.new{system(*t)}
-					}
-					menu_add(it.show)
-					@destroy_on_unload.push(it)
-				else
-					ModErrorError.new(self,
-						_("Cannot create interactions named #{interaction[:name]}(unknow menu type)."), true)
-				end
-			}
-			@loaded=true
-		else
-			false
-		end
-	end
-
-	def @m.unload
-		if @loaded
-			@destroy_on_unload.each{|w| w.destroy}
-			@destroy_on_unload.clear
-			menu_hide
-			@loaded=false
-			true
-		else
-			false
-		end
-	end
-
-	def @m.configwidget
-		@wconfig=ConfigWidget.new(@interactions)
-	end
-
-	def @m.saveconfig
-		old_interactions=@interactions
-		@interactions=@wconfig.interactions
-		reload if @loaded
-	end
-
-	def @m.quit
-		Interaction.write(@interactions)
-	end
-
-private
-
-	def @m.reload
-		unload
-		self.load
-	end
-
-	def @m.resolve_argument(type)
-		#escape=/[\ \'\#\[\]\(\)\&\;\|\!]/; String#gsub(escape){|s| '\\'+s}
-		case type
-		when NONE
-			""
-		when PLAYLIST_FILES
-			list=zik.playlist
-			list.songs.map{|song| song.path}
-		when CURRENT_SONG
-			list=zik.playlist
-			list.songs[list.current].path
-		when CURRENT_SONG_NAME
-			list=zik.playlist
-			list.songs[list.current].name
-		end
-	end
-end

data/mod/interact/configwidget.rb

@@ -1,107 +0,0 @@
-# encoding: UTF-8
-=begin
-Copyright 2007-2010 Vincent Carmona
-vinc4mai@gmail.com
-
-This file is part of ZiK.
-
-    ZiK is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    ZiK is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZiK; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-=end
-
-module Interact
-class InteractionWidget
-	attr_reader :menu, :name, :command, :argument, :rm
-
-	def initialize(interaction=nil)
-		@removed=false
-		if interaction
-			menu=Menu.index(interaction[:menu])
-			name=interaction[:name]
-			command=interaction[:command]
-			arg=Arg.index(interaction[:argument])
-			sensitive=true
-		end
-		menu||=-1
-		name||=""
-		command||=""
-		arg||=0
-		sensitive||=false
-
-		@menu=Gtk::ComboBox.new
-		@menu.append_text(LOCAL_MENU)
-		@menu.active=menu
-		@menu.signal_connect('changed'){
-			sensitive=@menu.active>=0
-			[@name, @command, @argument].each{|w| w.sensitive=sensitive}
-		}
-		@name=Gtk::Entry.new
-		@name.text=name
-		@command=Gtk::Entry.new
-		@command.text=command
-		@argument=Gtk::ComboBox.new
-		LocalArg.each{|c| @argument.append_text(c)}
-		@argument.active=arg
-		@rm=Gtk::Button.new
-		@rm.image=Gtk::Image.new(Gtk::Stock::REMOVE, Gtk::IconSize::BUTTON)
-		@rm.signal_connect('clicked'){
-			[@menu, @name, @command, @argument, @rm].each{|w| w.hide}
-			@removed=true
-		}
-		[@menu, @name, @command, @argument, @rm].each{|w| w.show}
-		[@name, @command, @argument].each{|w| w.sensitive=sensitive} unless sensitive
-	end
-
-	def to_h
-		if @removed||@menu.active<0
-			{}
-		else
-			{:menu=>Menu[LocalMenu.index(@menu.active_text)], :name=>@name.text,
-				:command=>@command.text, :argument=>Arg[LocalArg.index(@argument.active_text)]}
-		end
-	end
-end
-
-class ConfigWidget  < Gtk::Table
-	def initialize(interactions)
-		@iwidgets=[]; @nb=0
-		badd=Gtk::Button.new
-		badd.image=Gtk::Image.new(Gtk::Stock::ADD, Gtk::IconSize::BUTTON)
-		badd.signal_connect('clicked'){add_interaction}
-		super(interactions.length+1, 5)
-		self.attach(badd, 0, 5, 0, 1)
-		self.attach(Gtk::Label.new(_("Menu")), 0, 1, 1, 2)
-		self.attach(Gtk::Label.new(_("Name")), 1, 2, 1, 2)
-		self.attach(Gtk::Label.new(_("Command")), 2, 3, 1, 2)
-		self.attach(Gtk::Label.new(_("Argument")), 3, 4, 1, 2)
-		interactions.each_with_index{|interact, i| add_interaction(interact)}
-	end
-
-	def add_interaction(interaction=nil)
-		@iwidgets.push(iwidget=InteractionWidget.new(interaction))
-		self.attach(iwidget.menu, 0, 1, @nb+2, @nb+3)
-		self.attach(iwidget.name, 1, 2, @nb+2, @nb+3)
-		self.attach(iwidget.command, 2, 3, @nb+2, @nb+3)
-		self.attach(iwidget.argument, 3, 4, @nb+2, @nb+3)
-		self.attach(iwidget.rm, 4, 5, @nb+2, @nb+3)
-		@nb+=1
-	end
-
-	def interactions
-		tmp=@iwidgets.map{|w| w.to_h}
-		tmp.reject!{|h| h.empty?||h[:name].empty?||h[:command].empty?}
-		tmp.map{|h| Interaction.new(h)}
-	end
-end
-end

data/mod/interact/interaction.rb

@@ -1,79 +0,0 @@
-# encoding: UTF-8
-=begin
-Copyright 2007-2010 Vincent Carmona
-vinc4mai@gmail.com
-
-This file is part of ZiK.
-
-    ZiK is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    ZiK is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZiK; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-=end
-
-module Interact
-class Interaction < Hash
-	def Interaction.read(dir)
-		@file=File.join(dir,'interactionrc')
-		if File.exist?(@file)
-			begin
-				f=File.open(@file,'r')
-				interactions=f.read.split("\n\n").map!{|i| i.split("\n").reject{|a| a =~ /^#/}.reject{|a| a =~ /^\n/}}
-				interactions.map!{|i| Interaction.from_a(i)}
-				interactions.reject!{|i| i.empty?}
-			rescue
-				interactions=[]
-				ModErrorError.new(Interact.mod, "reading configuration file.")
-			ensure
-				f.close if f
-			end
-		else
-			ModErrorError.new(Interact.mod, "Configuration file not found.")
-		end
-		interactions||[]
-	end
-
-	def Interaction.write(interactions)
-		if $write_config
-			begin
-				dir=File.dirname(@file)
-				Dir.mkdir(dir) unless File.exist?(dir)
-				f=File.open(@file,'w')
-				f.puts '##Configuration file for interact module (ZiK audio player).'
-				interactions.each{|i|
-					i.each_pair{|key, value| f.puts "#{key}=#{value}"}
-					f.puts ""
-				}
-				ModErrorInfo.new(Interact.mod, "configuration saved")
-			rescue
-				ModErrorError.new(Interact.mod, "writting configuration file.")
-			ensure
-				f.close if f
-			end
-		end
-	end
-
-	def Interaction.from_a(a)
-		i=Interaction.new
-		a.each{|l|
-			k, v=l.split('=', 2)
-			i[k.to_sym]=v
-		}
-		i
-	end
-
-	def initialize(hash=nil)
-		super()
-		self.merge!(hash) if hash
-	end
-end
-end