XDCC-Fetch 1.386 → 1.409

data/XDCC-Fetch.rbw

@@ -6,14 +6,14 @@
 # Redistribution and use in source and binary forms, with or without modification, 
 # are permitted provided that the following conditions are met:
 #
-#    * Redistributions of source code must retain the above copyright notice, this list 
-#      of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above copyright notice, this list 
-#      of conditions and the following disclaimer in the documentation and/or other materials 
-#      provided with the distribution.
-#    * Neither the name of Christoph Heindl and Martin Ankerl nor the names of its contributors 
-#      may be used to endorse or promote products derived from this software without specific 
-#      prior written permission.
+# * Redistributions of source code must retain the above copyright notice, this list 
+#   of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice, this list 
+#   of conditions and the following disclaimer in the documentation and/or other materials 
+#   provided with the distribution.
+# * Neither the name of Christoph Heindl and Martin Ankerl nor the names of its contributors 
+#   may be used to endorse or promote products derived from this software without specific 
+#   prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 
 # OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 
@@ -24,9 +24,10 @@
 # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 
 # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-begin
+#begin
 	Dir.chdir(File.dirname(File.expand_path(__FILE__)))
 	require 'src/GUI/Main_Window'
+=begin
 rescue Exception => err
 	outPath = ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH']
 	logfile = nil
@@ -39,16 +40,16 @@ rescue Exception => err
 	logfile.puts("Encountered fatal error on #{Time.now}")
 	logfile.puts(err.message)
 	logfile.puts(err.backtrace)
+	logfile.puts("Ruby Version: #{RUBY_PLATFORM}, #{RUBY_VERSION} (#{RUBY_RELEASE_DATE})")
+	logfile.puts("Reason: #{err.message}")
+	logfile.puts("Where: #{err.backtrace[0]}")
+	logfile.puts("Inspect: #{err.inspect}")
+	logfile.puts("Full Backtrace:")
+	logfile.puts(err.backtrace.map{|t| "\t#{t}\n"}.join)
 	logfile.puts("----------------------END--------------------------")
 	logfile.close
 	
-	# use prettyexception. For internal use, or whoever wants to hack the source.
-	require 'src/Utilities/PrettyException'
-	pe = PrettyException.new(err)
-	File.open(outPath + "/.xdcc-fetch-prettylog.html", "w") do |f|
-		f.puts pe.print
-	end
-	
 	#require 'src/GUI/Talk_Back'
 	#Talk_Back.run(err)
 end
+=end

data/doc/index.html

@@ -30,6 +30,9 @@
 		</div>
 		
 		<div id="news">
+			<h1>2005-01-30</h1>
+			<p>XDCC-Fetch 1.386 Better error handling, faster search + sort</p>
+			
 			<h1>2005-01-22</h1>
 			<p>XDCC-Fetch 1.338 New features, several bugfixes</p>
 			
@@ -136,7 +139,7 @@
 			</tr>
 		</table>
 
-		<a name="download"></a><h1>Download</h1>		
+		<a name="download"></a><h1>Download</h1>
 		<dl>
 			<dt>
 				<a href="http://sourceforge.net/project/showfiles.php?group_id=127145">XDCC-Fetch Release</a>
@@ -152,6 +155,14 @@
 			As the name says,the nightly is updated (almost) each night. Have a look at the 
 			<a href="changelog.html">changelog</a> to find out if your favourite bug has been fixed.</dd>
 		</dl>
+		<p>
+			The XDCC-Fetch releases are also available as <a href="http://rubygems.rubyforge.org/wiki/wiki.pl?RubyGems">Ruby Gems</a>.
+			You can install it via this command:
+		</p>
+			<pre>gem install xdcc-fetch</pre>
+		<p>
+			After installation you can start XDCC-Fetch by executing <tt>XDCC-Fetch.rbw</tt>.
+		</p>
 		
 		<a name="install"></a><h1>Installation</h1>
 		<p>

data/doc/xdccfetch.css

@@ -18,9 +18,14 @@ table,tr {
 img {
 	border:none;
 }
-tt {
+tt, pre {
 	background-color: #d0d0d0;
 }
+pre {
+	border-left:3px solid grey;
+	margin:0px 0px 0px 20px;
+	padding:5px;
+}
 ol, ul {
 	margin-top:0px;
 	margin-bottom:0px;

data/src/GUI/Application_Builder.rb

@@ -1,17 +1,17 @@
-# Copyright (c) 2004, Christoph Heindl and Martin Ankerl
+# Copyright (c) 2004-2005 Christoph Heindl and Martin Ankerl
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification, 
 # are permitted provided that the following conditions are met:
 #
-#    * Redistributions of source code must retain the above copyright notice, this list 
-#      of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above copyright notice, this list 
-#      of conditions and the following disclaimer in the documentation and/or other materials 
-#      provided with the distribution.
-#    * Neither the name of Christoph Heindl and Martin Ankerl nor the names of its contributors 
-#      may be used to endorse or promote products derived from this software without specific 
-#      prior written permission.
+# * Redistributions of source code must retain the above copyright notice, this list 
+#   of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice, this list 
+#   of conditions and the following disclaimer in the documentation and/or other materials 
+#   provided with the distribution.
+# * Neither the name of Christoph Heindl and Martin Ankerl nor the names of its contributors 
+#   may be used to endorse or promote products derived from this software without specific 
+#   prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 
 # OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 
@@ -50,6 +50,22 @@ class Application_Builder
 			file.add_separator
 			file.add($cfg.text.quit, $cfg.icons.quit) { FXApp::instance.exit }
 			
+			options = Context_Menu.new(menu_bar, $cfg.text.options)
+			
+			# build languages
+			languages = Context_Menu.new(@gui.main_window)
+			lang_defs = Array.new
+			$cfg.translations.attrs.each do |lang|
+				lang_defs.push [$cfg.translations[lang].language_name, lang]
+			end
+			@gui.language_radios = Array.new
+			lang_defs.sort.each do |name, lang|
+				cmd = languages.add_radio(name, lang==$cfg.config.current_language) { |*args| @logic.on_language_change(lang, *args) }
+				@gui.language_radios.push cmd
+			end
+			options.add_submenu($cfg.text.language, languages, $cfg.icons.translations)
+			
+			
 			help = Context_Menu.new(menu_bar, $cfg.text.help)
 			help.add($cfg.text.about, $cfg.icons.about) { @logic.on_about_click }
 		end

data/src/GUI/Context_Menu.rb

@@ -4,14 +4,14 @@
 # Redistribution and use in source and binary forms, with or without modification, 
 # are permitted provided that the following conditions are met:
 #
-#    * Redistributions of source code must retain the above copyright notice, this list 
-#      of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above copyright notice, this list 
-#      of conditions and the following disclaimer in the documentation and/or other materials 
-#      provided with the distribution.
-#    * Neither the name of Martin Ankerl nor the names of its contributors may be used to 
-#      endorse or promote products derived from this software without specific prior written 
-#      permission.
+# * Redistributions of source code must retain the above copyright notice, this list 
+#   of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice, this list 
+#   of conditions and the following disclaimer in the documentation and/or other materials 
+#   provided with the distribution.
+# * Neither the name of Martin Ankerl nor the names of its contributors may be used to 
+#   endorse or promote products derived from this software without specific prior written 
+#   permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 
 # OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 
@@ -24,7 +24,7 @@
 
 # Context_Menu is a more convenient way to use context menus. It allows the creation of states that enable/disable items.
 class Context_Menu
-	attr_accessor :data
+	attr_accessor :data, :pane
 	
 	# Creates a new Context_Menu for given parent. If you provide a block, 
 	# this code is called whenever the menu is shown.
@@ -56,6 +56,30 @@ class Context_Menu
 		cmd
 	end
 	
+	def add_check(text, checked=false, icon=nil, &proc)
+		cmd = FXMenuCheck.new(@pane, text, icon)
+		@menu_commands.push cmd
+		cmd.check = checked
+		cmd.connect(SEL_COMMAND) { |sender, sel, data| proc.call(self, sender, sel, data) }
+		@pane.recalc
+		cmd
+	end
+		
+	def add_radio(text, checked=false, icon=nil, &proc)
+		cmd = FXMenuRadio.new(@pane, text, icon)
+		@menu_commands.push cmd
+		cmd.check = checked
+		cmd.connect(SEL_COMMAND) { |sender, sel, data| proc.call(self, sender, sel, data) }
+		@pane.recalc
+		cmd
+	end
+	
+	# adds a subcontextmenu
+	def add_submenu(text, menu, icon=nil)
+		FXMenuCascade.new(@pane, text, icon, menu.pane)	
+	end
+	
+	
 	# Create a new state which can later be accessed using the key state_name.
 	# For each menu entry, you need to specify if it should be enabled or disabled (true/false).
 	def new_state(state_name, *args)

data/src/GUI/Download_Finished_Box.rb

@@ -1,17 +1,20 @@
-# Copyright (c) 2004, Christoph Heindl and Martin Ankerl
-# All rights reserved.
+# Authors:: Martin Ankerl (mailto:martin.ankerl@gmail.com)\<br>
+#           Christoph Heindl (mailto:christoph.heindl@gmail.com)
+#
+# Copyright:: Copyright (c) 2004-2005 Christoph Heindl, Martin Ankerl
+# License:: XDCC-Fetch may be redistributed under the terms of the BSD licence:
 #
 # Redistribution and use in source and binary forms, with or without modification, 
 # are permitted provided that the following conditions are met:
 #
-#    * Redistributions of source code must retain the above copyright notice, this list 
-#      of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above copyright notice, this list 
-#      of conditions and the following disclaimer in the documentation and/or other materials 
-#      provided with the distribution.
-#    * Neither the name of Christoph Heindl and Martin Ankerl nor the names of its contributors 
-#      may be used to endorse or promote products derived from this software without specific 
-#      prior written permission.
+# * Redistributions of source code must retain the above copyright notice, this list 
+#   of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice, this list 
+#   of conditions and the following disclaimer in the documentation and/or other materials 
+#   provided with the distribution.
+# * Neither the name of Christoph Heindl and Martin Ankerl nor the names of its contributors 
+#   may be used to endorse or promote products derived from this software without specific 
+#   prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 
 # OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 

data/src/GUI/Empty_Text_Field_Handler.rb

@@ -22,6 +22,7 @@
 # IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 
 # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
 # Shows a grey text in an FXTextField if the user did not enter any input. This is a nice way to 
 # give the user more information about what to enter into a text field, without the need of additional
 # space in the GUI.
@@ -83,4 +84,4 @@ class Empty_Text_Field_Handler
 		@textField.text = @myText
 		@isEmpty = true
 	end
-end
+end

data/src/GUI/Gui_Logic.rb

@@ -4,14 +4,14 @@
 # Redistribution and use in source and binary forms, with or without modification, 
 # are permitted provided that the following conditions are met:
 #
-#    * Redistributions of source code must retain the above copyright notice, this list 
-#      of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above copyright notice, this list 
-#      of conditions and the following disclaimer in the documentation and/or other materials 
-#      provided with the distribution.
-#    * Neither the name of Martin Ankerl nor the names of its contributors may be used to 
-#      endorse or promote products derived from this software without specific prior written 
-#      permission.
+# * Redistributions of source code must retain the above copyright notice, this list 
+#   of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice, this list 
+#   of conditions and the following disclaimer in the documentation and/or other materials 
+#   provided with the distribution.
+# * Neither the name of Martin Ankerl nor the names of its contributors may be used to 
+#   endorse or promote products derived from this software without specific prior written 
+#   permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 
 # OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 
@@ -35,6 +35,19 @@ class Gui_Logic
 	def initialize(gui, data)
 		@gui = gui
 		@data = data
+		@search_engine = Search_Engine.new(@gui, @data)
+	end
+	
+	def on_search
+		@search_engine.on_search
+	end
+	
+	def match?(*args)
+		@search_engine.match?(*args)
+	end
+	
+	def update_search_status_text
+		@search_engine.update_search_status_text
 	end
 	
 	# Adds a new IRC_server and connects to it.
@@ -126,93 +139,6 @@ class Gui_Logic
 		x
 	end
 	
-	# Update the text for the number of displayed packs.
-	def update_search_status_text
-		@gui.search_status_label.text = " #{@gui.packet_list.numItems} #{$cfg.text.of} #{@data.allpack_to_item.size} #{$cfg.text.packs}"
-	end
-
-	# Find out if item is matched by current search criteria.
-	def match?(item, match_data)
-		# check icon
-		return false unless @data.packet_icon_to_toggle_btn[item.icon].toggled?
-		
-		# check text
-		return true if match_data.empty?
-		item_str = item.sortable(1)
-		match_data.each do |match_str|
-			if match_str[0] == ?-
-				# the next items are not allowed to be contained in pack name
-				return false if (match_str[1..-1]!="") && (item_str.include?(match_str[1..-1]))
-			else
-				return false if !item_str.include?(match_str)
-			end
-		end
-		true
-	end
-
-	# Executed whenever a search criteria changes to update the packet list.
-	def on_search
-		# restart current search
-		# TODO what happens when new announcements come every 0.2 second or so?
-		# the list will never be updated... :-/
-		@end_time = Time.now + 0.5
-		@restart_search = true
-		@gui.search_label.enabled = false
-		return if @search_thread && @search_thread.status
-			
-		@search_thread = Thread.new(@search_thread) do
-			begin
-				@gui.search_label.enabled = false
-				# wait untill deadline
-				while (t = (@end_time - Time.now)) > 0
-					sleep(t)
-				end
-				
-				@data.gui_mutex.synchronize do
-					# the thread has to use the gui mutex inside
-					@restart_search = false
-					
-					@match_data = @gui.search_field.text.downcase.split
-				
-					# remove all items
-					@gui.packet_list.dirty_clear
-					
-					# add all items that match the search criteria
-					sort_deadline = Time.now
-					status_text_deadline = Time.now
-					@data.allpack_to_item.each_value do |item|
-						#item.parent = @gui.packet_list if match?(item, match_data)
-						if match?(item, @match_data)
-							item.show
-							
-							# take only about 10% of the cpu to sort items.
-							# with few items this results to very fast sorts,
-							# with many items this leads to fast updates.
-							if (sort_deadline < Time.now)
-								before = Time.now
-								@gui.packet_list.sortItems
-								after = Time.now
-								sort_deadline = after + (after-before) *10
-							end
-							
-							# update every 0.1 second
-							if (status_text_deadline < Time.now)
-								update_search_status_text
-								status_text_deadline = Time.now + 0.1
-							end
-						end
-						break if @restart_search
-					end
-					update_search_status_text
-					@gui.packet_list.sortItems
-					@gui.search_label.enabled = true
-					
-					FXApp::instance.flush
-				end # synchronize
-			end while @restart_search# || @match_data != @gui.search_field.text.downcase.split
-		end #thread.new
-	end
-	
 	def add_server(ip, port, nick, pwd, do_connect)
 		name = "#{ip}"
 		server_item = @gui.connections.addItemLast(nil, name, $cfg.icons.disconnected, $cfg.icons.disconnected)
@@ -349,6 +275,16 @@ class Gui_Logic
 		About_Dialog.new(@gui.main_window).execute
 	end
 	
+	# change configured language
+	def on_language_change(lang, menu, sender, sel, data)
+		@gui.language_radios.each do |radio|
+			radio.check = false unless radio == sender
+		end
+		# update config
+		$cfg.config.current_language = lang
+		@data.config.save
+	end
+	
 	
 	# Let user select a target directory and initiate download if user clicks OK.
 	def on_download_click(menu, sender, sel, data)
@@ -497,7 +433,7 @@ class Gui_Logic
 				end
 				
 				is_added = false
-				match_data = @gui.search_field.text.downcase.split
+				match_data = @search_engine.get_match_data
 				ann.packs.each do |pack|
 					# create an unconnected item
 					item = Packet_Item.new(nil, icon, bot, pack.name, pack.size)
@@ -515,7 +451,6 @@ class Gui_Logic
 					update_search_status_text
 					@gui.packet_list.sortItems
 				end
-				#on_search
 				
 			when XDCC_Announcement_Storage::ON_ANNOUNCEMENT_LOST
 				ann = args[0]
@@ -620,8 +555,10 @@ class Gui_Logic
 				if irc_user == caller.me
 					server_item = @data.irc_server_to_item[caller]
 					channel_item = @data.server_to_channels[server_item].detect { |channel_item| channel_item.text == channel_name }
-					channel_item.closedIcon = $cfg.icons.connection_failed
-					channel_item.openIcon = $cfg.icons.connection_failed
+					if channel_item
+						channel_item.closedIcon = $cfg.icons.connection_failed
+						channel_item.openIcon = $cfg.icons.connection_failed
+					end
 				end
 			end
 		end