XDCC-Fetch 1.386 → 1.409

data/src/GUI/Main_Window.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 
@@ -68,6 +68,7 @@ require 'src/GUI/About_Dialog'
 require 'src/GUI/Download_Finished_Box'
 require 'src/GUI/Application_Builder'
 require 'src/GUI/Gui_Logic'
+require 'src/GUI/Search_Engine'
 
 require 'src/Network/IRC_Server'
 require 'src/Network/XDCC_Announcement_Storage'
@@ -125,6 +126,8 @@ class Main_Window < FXMainWindow
 		@data = Recursive_Open_Struct.new
 		@gui = Recursive_Open_Struct.new
 		@logic = Gui_Logic.new(@gui, @data)
+		@gui.logic = @logic
+		
 		
 		# load configuration
 		@data.config = Configuration.new($cfg)
@@ -149,9 +152,7 @@ class Main_Window < FXMainWindow
 		Application_Builder.new(self, @gui, @data, @logic)
 		
 		# TODO start
-		#sleep 1
-		#just_testing
-		@logic.connect_to_saved_servers		
+		@logic.connect_to_saved_servers
 	end
 	
 	# Automatically called when the Fox application is created
@@ -190,18 +191,17 @@ class Main_Window < FXMainWindow
 		@data.ann_storage.connect_to_events(XDCC_Announcement_Storage::ON_ANNOUNCEMENT_NEW, @logic)
 		@data.ann_storage.connect_to_events(XDCC_Announcement_Storage::ON_ANNOUNCEMENT_LOST, @logic)
 		@data.download_handlers = Hash.new
-	end
-	
-	
+	end	
 
 	# debugging stuff
 	def just_testing
 		icons = [$cfg.icons.packet, $cfg.icons.free_slots, $cfg.icons.slots_unknown]
-		50000.times do |i|
+		5000.times do |i|
 			# set slot representing icon
 			icon = icons[rand(3)]
 			# create an unconnected item
-			item = Packet_Item.new(nil, icon, "bot-#{rand(1e3)}", "#{rand(1e10).to_s(36)}", rand(100).to_s + ["M","K","G"][rand(3)])
+			name = rand(1e10).to_s(36).upcase + " " + rand(1e10).to_s(36) 
+			item = Packet_Item.new(nil, icon, "bot-#{rand(1e3)}", name, rand(100).to_s + ["M","K","G"][rand(3)])
 			@data.allpack_to_item[i] = item
 			# item needs to be added to a list, before calling match()
 			item.parent = @gui.packet_list
@@ -217,6 +217,50 @@ class Main_Window < FXMainWindow
 		#@gui.packet_list.on_cmd_header(2)
 		#@gui.packet_list.sortItems
 	end
+	
+	# stress testing
+	def stress_test_iconlist
+	
+		@added=0
+		@removed = 0
+		@size = 0
+		items = Array.new
+		100000.times do 
+			@data.gui_mutex.synchronize do 
+				#add
+				icon = [$cfg.icons.packet, $cfg.icons.free_slots, $cfg.icons.slots_unknown][rand(3)]
+				10.times do
+					item = Packet_Item.new(nil, icon, rand(1e10).to_s(36), rand(1e50).to_s(36), rand(1e4).to_s)
+					items.push item
+					item.parent = @gui.packet_list
+					item.show
+					app.forceRefresh
+					@size += 1
+					@added += 1
+				end
+				@gui.packet_list.sortItems
+				app.forceRefresh
+			end
+			@data.gui_mutex.synchronize do 
+				# remove
+				
+				rand(items.size/4).times do
+					break if items.empty?
+					pos = rand(items.size)
+					item = items[pos]
+					items[pos] = items.last
+					items.pop
+					item.parent = nil
+					app.forceRefresh
+					@removed += 1
+					@size -= 1
+				end
+			end
+			printf "%5d, %5d, %5d\n", @added, @removed, @size
+		end
+		puts "Yeah! You got it!!!"
+		exit
+	end
 end
 
 Thread.abort_on_exception= true

data/src/GUI/Packet_Item.rb

@@ -23,6 +23,19 @@
 # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+class MutexDummy
+	def synchronize
+		yield
+	end
+end
+
+# Lock used to synchronize item removes.
+# for now, a global lock is good enough. 
+$fx_icon_item_remove_mutex = Mutex.new
+
+
+
+
 # An item for Packet_List. This is a convenient wrapper for the FXIconItem.
 class Packet_Item
 
@@ -37,8 +50,26 @@ class Packet_Item
 			@packet_item = packet_item
 			@sort_key = nil
 			@reversed = 1
+			@is_deleted = false
 			super(*args)
 		end
+
+		# Sometimes draw is called AFTER the item has been removed. 
+		# In this case: return immediately. Otherwise a Runtime Error would occur!
+		def draw(*args)
+			$fx_icon_item_remove_mutex.synchronize do
+				#puts "draw"
+				return if @is_deleted
+				super
+			end
+		end
+
+		# Mark item as deleted, to prevent execution of draw afterwards
+		# this is called from Packet_List which uses the same mutex
+		# as draw.
+		def deleted
+			@is_deleted = true
+		end
 		
 		# Called from sortItems, uses packet_item's comparison.
 		def <=>(other)
@@ -54,6 +85,10 @@ class Packet_Item
 		def data
 			@packet_item.data
 		end
+		
+		def draw(*args)
+			super
+		end
 	end
 	
 	# Creates a Packet_Item with newParent as the parent list, which is allowed to be nil.
@@ -168,4 +203,4 @@ class Packet_Item
 	def create_item
 		@item = Fox_Item.new(self, @content.join("\t"), @icon, @icon)
 	end
-end
+end

data/src/GUI/Packet_List.rb

@@ -121,6 +121,53 @@ class Packet_List < FXIconList
 		item
 	end
 	
+	def appendItem(*args)
+		$fx_icon_item_remove_mutex.synchronize do
+			#puts "appendItem"
+			super
+		end
+	end
+	
+	# Before actually deleting, the item has to be marked as deleted to prevent 
+	# drawing afterwards.
+	def removeItem(*args)
+		$fx_icon_item_remove_mutex.synchronize do
+			#puts "removeitem"
+			# at first, mark item as deleted to prevent drawing afterwards
+			getItem(args[0]).deleted
+			# do the evil delete
+			super
+		end
+	end
+	
+	# Remove all items, but do this within the mutex to be sure everything goes ok.
+	def clearItems(*args)
+		$fx_icon_item_remove_mutex.synchronize do
+			#puts "clearitems"
+			super
+		end
+	end
+	
+	# This may be called when the item is currently beeing deleted.
+	# this method works only before or after the delete, therefore
+	# the mutex is necessary.
+	def getContentWidth(*args)
+		$fx_icon_item_remove_mutex.synchronize do
+			#puts "contentwidth"
+			super
+		end
+	end
+	
+	# This may be called when the item is currently beeing deleted.
+	# this method works only before or after the delete, therefore
+	# the mutex is necessary.
+	def getContentHeight(*args)
+		$fx_icon_item_remove_mutex.synchronize do
+			#puts "contentheight"
+			super
+		end
+	end
+	
 	# Removes all items from the list.
 	def clear
 		@items.each { |item| item.clear }
@@ -141,5 +188,3 @@ class Packet_List < FXIconList
 		@conversions[header_item_index]
 	end
 end	
-
-

data/src/GUI/Search_Engine.rb

@@ -0,0 +1,187 @@
+# Copyright (c) 2005 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.
+#
+# 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 
+# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 
+# 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.
+
+class Search_Engine
+	def initialize(gui, data)
+		@gui = gui
+		@data = data
+	end	
+	
+	# Executed whenever a search criteria changes to update the packet list.
+	def on_search
+		# restart current search
+		@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 = get_match_data
+				
+					# 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
+					
+				end # synchronize
+			end while @restart_search# || match_data != @gui.search_field.text.downcase.split
+		end #thread.new
+	end
+	
+	def get_match_data
+		str_to_match_data(@gui.search_field.text)
+	end
+
+	# Converts a string into a match_data representation.
+	def str_to_match_data(str, index=0)
+		words = [ ]
+		exclude = [ ]
+		min = nil
+		max = nil
+		is_exclude = false
+		
+		while str[index]
+			case str[index]
+			when ?", ?'
+				word, index = get_word(str, index+1, str[index])
+				unless word.empty?
+					if is_exclude
+						exclude.push word
+						is_exclude = false
+					else
+						words.push word
+					end
+				end
+			
+			when 32 # space
+				is_exclude = false
+				
+			when ?>
+				min, index = get_word(str, index+1)
+				min = @gui.logic.size_to_nr(min)
+				
+			when ?<
+				max, index = get_word(str, index+1)
+				max = @gui.logic.size_to_nr(max)
+			
+			when ?-
+				is_exclude = true
+			
+			else
+				word, index = get_word(str, index)
+				if is_exclude
+					exclude.push word
+					is_exclude = false
+				else
+					words.push word
+				end				
+			end
+			
+			index += 1
+		end
+		[words, exclude, min, max]
+	end
+	
+	def get_word(str, index, delim=32) # 32==space
+		word = ""
+		c = str[index]
+		while (c && c != delim)
+			word += c.chr
+			index += 1
+			c = str[index]
+		end
+		[word, index]
+	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?
+		
+		words, exclude, min, max = match_data
+		
+		# check size
+		size = -item.sortable(2)
+		return false if (min && size < min) || (max && size > max)
+		
+		# check text that has to be there
+		item_str = item.sortable(1)
+		words.each do |match_str|
+			return false unless item_str.include?(match_str)
+		end
+		
+		# check text not allowed to be there
+		exclude.each do |match_str|
+			# the next items are not allowed to be contained in pack name
+			return false if item_str.include?(match_str)
+		end
+		
+		# each check ok
+		true
+	end
+end

data/src/GUI/Talk_Back.rb

@@ -28,7 +28,6 @@ include Fox
 
 require 'src/Utilities/Globals'
 
-
 # Unfortunately Talk_Back only works for email server that allow non-secure connections, 
 # and therefore is useless. Let's wait until smtp supports everything requird.
 class Talk_Back < FXDialogBox
@@ -115,4 +114,4 @@ class Talk_Back < FXDialogBox
 		end
 		exit
 	end
-end
+end

data/src/GUI/Toggle_Button.rb

@@ -53,4 +53,4 @@ class Toggle_Button
 			@btn.state = STATE_UP
 		end
 	end
-end
+end