zik 0.16.1 → 0.16.2

data/ChangeLog

@@ -1,3 +1,7 @@
+###Version 0.16.2
+Fix a bug : ZiK crash when showing an error before main window is defined.
+Fix a bug: ZiK crash when loading a module failed.
+
 ###Version 0.16.1
 Fix a bug in french translation
 

data/Makefile.in

@@ -1,5 +1,5 @@
 NAME=ZiK
-VERSION=0.16.1
+VERSION=0.16.2
 
 SHELL=/bin/sh
 RUBY=/usr/bin/ruby

data/doc/ChangeLog

@@ -1,3 +1,7 @@
+###Version 0.16.2
+Fix a bug : ZiK crash when showing an error before main window is defined.
+Fix a bug: ZiK crash when loading a module failed.
+
 ###Version 0.16.1
 Fix a bug in french translation
 

data/gui/error.rb

@@ -41,21 +41,21 @@ class Error
 		case type
 		when ErrorINFO, ModErrorINFO
 			puts message
-			if $show_errors&&user
+			if $show_errors&&user&&defined?(@@zik)
 				dialog=Gtk::MessageDialog.new(@@zik, Gtk::Dialog::MODAL|Gtk::Dialog::DESTROY_WITH_PARENT,
 					Gtk::MessageDialog::INFO, Gtk::MessageDialog::BUTTONS_CLOSE, @long_message)
 				dialog.run; dialog.destroy
 			end
 		when ErrorWARNING, ModErrorWARNING
 			$stderr.puts "WARNING. "+message
-			if $show_errors&&user
+			if $show_errors&&user&&defined?(@@zik)
 				dialog=Gtk::MessageDialog.new(@@zik, Gtk::Dialog::MODAL|Gtk::Dialog::DESTROY_WITH_PARENT,
 					Gtk::MessageDialog::WARNING, Gtk::MessageDialog::BUTTONS_CLOSE, @long_message)
 				dialog.run; dialog.destroy
 			end
 		when ErrorERROR, ModErrorERROR
 			$stderr.puts "ERROR. "+message
-			if $show_errors&&user
+			if $show_errors&&user&&defined?(@@zik)
 				dialog=Gtk::MessageDialog.new(@@zik, Gtk::Dialog::MODAL|Gtk::Dialog::DESTROY_WITH_PARENT,
 					Gtk::MessageDialog::ERROR, Gtk::MessageDialog::BUTTONS_CLOSE, @long_message)
 				dialog.run; dialog.destroy
@@ -106,7 +106,7 @@ class ErrorsStock
 	end
 
 	def show_all(message="")
-		if $show_errors
+		if $show_errors&&defined?(@@zik)
 			unless @stock.empty?
 				tmp=[]
 				@stock.each{|error| message+="\n#{error.long_message}"; tmp.push(error.type)}

data/gui/mod.rb

@@ -68,11 +68,11 @@ class ModErrorLoadError < ModError
 		end
 	end
 
-	def initialize(mod, type, message)
+	def initialize(mod, message)
 		@mod=mod; @message=message
 		@@stock.push(self)
 		$stderr.print "[#{mod.id}]: "
-		super(mod, ModErrorLOAD_ERROR, message, false)
+		super(mod, ModErrorLOAD_ERROR, message, false, nil)
 	end
 end
 

data/playlist/playlist.rb

@@ -53,7 +53,7 @@ private
 			f=File.open(file, 'r')
 			data=f.read
 		rescue
-			ErrorError.new("#{file} cannot be read.", true)
+			ErrorError.new("#{file} cannot be read.")
 		ensure
 			f.close if f
 		end
@@ -73,7 +73,7 @@ private
 				add_file(p.to_s, tag)
 			}
 		rescue
-			ErrorError.new("Error while parsing #{file}.", true)
+			ErrorError.new("Error while parsing #{file}.")
 		end
 	end
 

data/zik

@@ -1,2 +1,377 @@
 #!/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.16.2'
+
+#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/share/ZiK'
+Pix_dir=File.join(Data_dir,'pix')
+Doc_dir='/usr/share/doc/ZiK'
+Locale_dir='/usr/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.")
+ErrorWarning.new("ZiK is deprecated. You should call ZiK by zik") if __FILE__=~/ZiK$/
+
+#Global configuration
+$border=5
+
+#Configuration
+require File.join(Data_dir, 'gui/config')
+User_dir=File.join(ENV['HOME'],'.ZiK') unless (defined? User_dir)
+unless File.exist?(User_dir)
+	Dir.mkdir(User_dir)
+	config_new=true
+end
+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(User_dir, 'socket')
+end
+if config['socket']
+	require 'socket'
+	require File.join(Data_dir, 'gui/socket')
+	if File.socket?(ZiKSocket::Address)
+		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
+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']
+	ErrorError.new(_("Multisession: server not started."), true) if ZiKSocket.start_server(gui, config, playlist).status.nil?#Except raise in thread used to start server.
+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
+end
+
+ErrorInfo.new("Bye.")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zik
 version: !ruby/object:Gem::Version 
-  hash: 93
+  hash: 91
   prerelease: false
   segments: 
   - 0
   - 16
-  - 1
-  version: 0.16.1
+  - 2
+  version: 0.16.2
 platform: ruby
 authors: 
 - Vincent Carmona
@@ -36,7 +36,7 @@ cert_chain:
   oxzIRXlS
   -----END CERTIFICATE-----
 
-date: 2011-03-11 00:00:00 +01:00
+date: 2011-03-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -225,6 +225,7 @@ 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