XDCC-Fetch 1.386 → 1.409

data/src/Network/DCC_File.rb

@@ -24,10 +24,9 @@
 
 DCC_Resume_Verification = Struct.new("DCC_Resume_Verification", 
 									 :verified, 
-									 :bytes_mine, 
-									 :md5_mine,
-									 :bytes_their,
-									 :md5_their)
+									 :bytes_total,
+									 :bytes_mine,
+									 :bytes_their)
 						  
 DCC_File_Info = Struct.new("DCC_File_Info",
 						   :status,					# Status of DCC
@@ -86,7 +85,7 @@ class DCC_File
 								  "",
 								  nil,
 								  nil,
-								  DCC_Resume_Verification.new(false, 0, nil, 0, nil),
+								  DCC_Resume_Verification.new(false, 0, "", ""),
 								  false,
 								  ON_DCC_ERROR,
 								  "",
@@ -138,14 +137,22 @@ class DCC_File
 		end
 		# As of now, no md5 checksum will be calculated for resumed packs in order to not
 		# slow down everything only due to md5 checksum calculation for the received data
-		@info.bytes_received = File.size(@info.joined_filename)
+		local_filesize = File.size(@info.joined_filename)
+		
 		# Initialize verification
-		@info.verification.verified = false
-		@info.verification.bytes_mine = (@info.bytes_received > $cfg.network.dcc.verification_bytes) ? $cfg.network.dcc.verification_bytes : @info.bytes_received
+		if $cfg.network.dcc.enable_verification
+			@info.verification.verified = false
+			@info.verification.bytes_total = (local_filesize > $cfg.network.dcc.verification_bytes) ? $cfg.network.dcc.verification_bytes : local_filesize
+		else
+			# Verification disabled
+			@info.verification.verified = true 
+			@info.verification.bytes_total = 0
+		end
+		@info.bytes_received = local_filesize - @info.verification.bytes_total
 		if @info.bytes_received < @info.bytes_total
 			# Ask for DCC RESUME
 			@info.irc_user.irc_server.connect_to_events(IRC_Server::ON_USER_MESSAGE, self)
-			@info.irc_user.send("\001DCC RESUME #{@info.filename} #{@info.address.port} #{@info.bytes_received - @info.verification.bytes_mine}\001")
+			@info.irc_user.send("\001DCC RESUME #{@info.filename} #{@info.address.port} #{@info.bytes_received}\001")
 		elsif @info.bytes_received == @info.bytes_total
 			# Pack already received. At least filesize tells us so. We therefore download a single byte from bot in 
 			# order to terminate the connection fast and make it available for other packs.
@@ -206,10 +213,8 @@ class DCC_File
 						return
 					end
 					if !@info.verification.verified
-						@info.file.seek(-@info.verification.bytes_mine, IO::SEEK_END)
-						@info.verification.md5_mine = Digest::MD5.new
-						@info.verification.md5_their = Digest::MD5.new
-						@info.verification.md5_mine << @info.file.read
+						@info.file.seek(-@info.verification.bytes_total, IO::SEEK_END)
+						@info.verification.bytes_mine << @info.file.read
 					else
 						@info.file.seek(0, IO::SEEK_END)
 					end
@@ -232,6 +237,8 @@ class DCC_File
 				end
 			
 			when TCP_Connection::ON_CLOSED
+				@tcp_con.close if @tcp_con.connected?
+				@info.file.close if @info.file && !@info.file.closed?
 				if @info.bytes_received != @info.bytes_total
 					if !@info.status == ON_DCC_ERROR
 						# No other code has yet triggered a download failed event
@@ -239,7 +246,6 @@ class DCC_File
 						self.fire_event(ON_DCC_ERROR, $cfg.text.network.xdcc.err_con_closed)
 					end
 				else
-					@tcp_con.close if @tcp_con.connected?
 					@info.status = ON_DCC_COMPLETED
 					self.fire_event(ON_DCC_COMPLETED, @info.md5)
 				end
@@ -247,6 +253,8 @@ class DCC_File
 			when TCP_Connection::ON_ERROR
 				# See if some other code has already triggered a download failed
 				if @info.status != ON_DCC_ERROR && @info.status != ON_DCC_COMPLETED
+					@tcp_con.close if @tcp_con.connected?
+					@info.file.close if @info.file && !@info.file.closed?
 					@info.status = ON_DCC_ERROR
 					self.fire_event(ON_DCC_ERROR, eventargs[0])
 				end
@@ -256,32 +264,28 @@ class DCC_File
 					return
 				end
 				
-				# Verify bytes if necessary
-				if !@info.verification.verified
-					self.add_verification_bytes(eventargs[0])
-					if @info.verification.bytes_mine == @info.verification.bytes_their
-						# Ready for md5 comparison
-						if @info.verification.md5_mine.hexdigest != @info.verification.md5_their.hexdigest
-							@info.status = ON_DCC_ERROR
-							self.fire_event(ON_DCC_ERROR, $cfg.text.network.dcc.err_verification)
-							@tcp_con.close
-							@info.file.close
-							return	
-						else
-							@info.verification.verified = true
-							# Write remaining bytes to file
-						end
-					else
-						# All bytes have been eat up by verification
-						return
-					end
-				end		
-				
 				# Increment download count after possible verification, as @info.bytes_received
 				# starts counting at local filesize.
 				@info.bytes_received += eventargs[0].length
 				# Ack data, as 4 byte integer big-endian network byte order
 				@tcp_con.send([@info.bytes_received].pack('N'))
+				
+				# Verify bytes if necessary
+				if !@info.verification.verified
+					if !self.verify_bytes(eventargs[0])
+						@info.status = ON_DCC_ERROR
+						self.fire_event(ON_DCC_ERROR, $cfg.text.network.dcc.err_verification)
+						@tcp_con.close
+						@info.file.close
+						return	
+					end
+				elsif @info.verification.bytes_mine.length == @info.verification.bytes_their.length
+					@info.verification.verified = true
+					# Write remaining bytes to file
+				else
+					# All bytes have been eaten up by verification
+					return
+				end
 					
 				# Write to file
 				@info.file.syswrite(eventargs[0])
@@ -308,16 +312,22 @@ class DCC_File
 		end
 	end
 	
-	def add_verification_bytes(bytes)
-		return if @info.verification.bytes_their == @info.verification.bytes_mine
-		their_length = bytes.length
-		if (@info.verification.bytes_their + their_length <= @info.verification.bytes_mine)
-			@info.verification.bytes_their += their_length
-			@info.verification.md5_their << bytes.slice!(0..-1)
+	def verify_bytes(bytes)
+		my_length = @info.verification.bytes_mine.length
+		their_length = @info.verification.bytes_their.length
+		return true if my_length == their_length
+		startpos = their_length
+		endpos = 0
+		if their_length + bytes.length < my_length
+			# All bytes are required for verification
+			endpos = their_length + bytes.length - 1
+			@info.verification.bytes_their << bytes.slice!(0..-1)
 		else
-			req_length = @info.verification.bytes_mine - @info.verification.bytes_their
-			@info.verification.bytes_their += req_length
-			@info.verification.md5_their << bytes.slice!(0..req_length - 1)
+			# Bytes are partly required for verification
+			req_bytes = bytes.slice!(0..(my_length - their_length - 1))
+			endpos = their_length + req_bytes.length - 1
+			@info.verification.bytes_their << req_bytes
 		end
+		return @info.verification.bytes_their[startpos..endpos] == @info.verification.bytes_mine[startpos..endpos]	
 	end
 end

data/src/Network/TCP_Connection.rb

@@ -24,7 +24,8 @@
 
 
 require 'socket'
-require 'resolv-replace'
+# Disable ruby's own resolver, seemed to cause serious troubles on some windowses.
+#require 'resolv-replace'
 require 'src/Utilities/Events.rb'
 require 'timeout'
 
@@ -69,6 +70,8 @@ class TCP_Connection
 			# That way, the the main thread is not blocked if connection cannot be 
 			# established
 			connect_thread = Thread.new do
+				# Lower priority of connect thread. This may help higher level applications to increase there response time
+				Thread.current.priority = $cfg.network.tcp.connect_thread_priority
 				if @address && @port
 					begin
 						timeout($cfg.network.tcp.connect_timeout) {
@@ -83,13 +86,13 @@ class TCP_Connection
 								end
 							self.close
 							self.fire_event(ON_CLOSED)
-							rescue IOError, Errno::ECONNRESET, Errno::ENOTSOCK, SocketError => err
+							rescue IOError, SystemCallError, SocketError => err
 								self.fire_event(ON_ERROR, err.to_s)
 							end
 						end
 					rescue TimeoutError => err
 						self.fire_event(ON_ERROR, $cfg.text.network.tcp.err_con_timeout)
-					rescue IOError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ETIMEDOUT, SocketError => err
+					rescue IOError, SystemCallError, SocketError => err
 						self.close
 						self.fire_event(ON_ERROR, err.to_s)
 					end
@@ -101,8 +104,6 @@ class TCP_Connection
 			# Already connected
 			self.fire_event(ON_ERROR, $cfg.text.network.tcp.err_con_active)
 		end
-		# Lower priority of connect thread. This may help higher level applications to increase there response time
-		connect_thread.priority = $cfg.network.tcp.connect_thread_priority
 	end
 	
 	# Send data to socket

data/src/Network/XDCC_Download_Handler.rb

@@ -350,7 +350,11 @@ class XDCC_Download_Handler
 				elsif status = $cfg.network.xdcc.md5_regexp.match(message)
 					handle_delayed_md5(status[1])
 				elsif status = $cfg.network.xdcc.punish_slowness_regexp.match(message)
+					@mutex.synchronize do 
+						@current_pack_status = ON_DOWNLOAD_FAILED
+					end
 					self.fire_event(ON_DOWNLOAD_FAILED, @current_pack, $cfg.text.network.xdcc.err_punish_slowness)
+					@dcc_con.close
 					self.next_pack(5)
 				end
 				
@@ -362,7 +366,7 @@ class XDCC_Download_Handler
 				self.fire_event(ON_DOWNLOAD_STARTED, @current_pack)
 			
 			when DCC_File::ON_DCC_ERROR
-				@mutex.synchronize do 
+				@mutex.synchronize do
 					@current_pack_status = ON_DOWNLOAD_FAILED
 				end
 				self.fire_event(ON_DOWNLOAD_FAILED, @current_pack, eventargs[0])		

data/src/Translations/check_translations

@@ -21,7 +21,7 @@ if __FILE__ == $0
 				end
 			end
 			# english is the reference language
-			@reference_language = $cfg.text.en
+			@reference_language = $cfg.translations.en
 		end
 		
 		def self.usage
@@ -41,10 +41,10 @@ if __FILE__ == $0
 		end
 		
 		def check
-			$cfg.text.attrs.each do |lang_name|
-				next if $cfg.text[lang_name] == @reference_language
-				@attr_stack = [ "$cfg.text", lang_name]
-				check_attrs(@reference_language, $cfg.text[lang_name])
+			$cfg.translations.attrs.each do |lang_name|
+				next if $cfg.translations[lang_name] == @reference_language
+				@attr_stack = [ "$cfg.translations", lang_name]
+				check_attrs(@reference_language, $cfg.translations[lang_name])
 			end
 			# print status
 			print_status(@missing, "missing translation items:")

data/src/Translations/de.rb

@@ -24,7 +24,7 @@
 
 # Language definition #################################
 
-lang = $cfg.text.de
+lang = $cfg.translations.de
 lang.language_name = "German"
 
 lang.about = "&�ber\t\tZeigt �ber-Dialog"
@@ -110,6 +110,8 @@ lang.speed = "Geschwindigkeit"
 lang.download_finished_box = "Fertig Heruntergeladen"
 
 lang.show_warning = "&Fehler Zeigen"
+lang.language = "&Sprache"
+lang.options = "Optionen"
 
 
 # Network messages

data/src/Translations/en.rb

@@ -24,7 +24,7 @@
 
 # Language definition #################################
 
-lang = $cfg.text.en
+lang = $cfg.translations.en
 lang.language_name = "English"
 
 lang.about = "&About\t\tShows an about dialog"
@@ -118,6 +118,10 @@ lang.credits = "Credits"
 lang.download_finished_box = "Download Finished"
 
 lang.show_warning = "&Show Error"
+lang.options = "&Options"
+lang.language = "&Language"
+
+lang.you_have_to_restart = "Restart XDCC-Fetch to apply changes"
 
 # Network messages
 lang.network.ip.err_notroutable_ip = "Not routable ip address given"

data/src/Translations/pl.rb

@@ -0,0 +1,145 @@
+# 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.
+#
+# 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.
+
+# Language definition #################################
+
+lang = $cfg.translations.pl
+lang.language_name = "Polish"
+
+lang.about = "&O programie\t\tPokazuje okno dialogowe O programie"
+lang.help = "&Pomoc"
+lang.add_server = "&Dodaj serwer\tCtrl-A\tDodaje i ��czy si� z serwerem IRC"
+lang.remove_server = "Usu�\t\tRoz��cza i usuwa serwer IRC"
+lang.add_channel = "Dodaj kana�\t\tDodaje (wchodzi) kana�"
+lang.add_channel_dialog = "Dodaj kana�"
+lang.remove_channel = "Usu�\t\tUsuwa (opuszcza) kana�"
+lang.specify_server = "Okre�l serwer"
+
+lang.server = "Serwer"
+lang.port = "Port"
+lang.nickname = "Nick"
+lang.password = "Has�o"
+lang.channel = "Kana�"
+
+lang.disconnect = "&Roz��cz"
+lang.connect = "&Po��cz"
+
+
+lang.file = "&Plik"
+lang.quit = "&Wyj�cie\tCtrl-X\tZamyka program i wszystkie aktywne po��czenia"
+
+lang.speed_widget_init = "0.0 kb\tPokazuje ca�kowit� pr�dko�� pobierania w kilobajtach\tPokazuje ca�kowit� pr�dko�� pobierania w kilobajtach"
+
+lang.enter_ip_or_domain = "Wpisz IP lub domen�"
+lang.the_servers_port = "Port serwera"
+
+lang.channel_name = "Nazwa kana�u"
+lang.connections = "Po��czenia\tPrawoklik na zasadniczym obszarze\naby doda� serwery IRC oraz kana�y\tPrawoklik na zasadniczym obszarze aby doda� serwery IRC oraz kana�y"
+lang.search = "Szukaj\tWpisz swoje zapytanie w pole po prawej\tWpisz swoje zapytanie w pole po prawej"
+
+lang.free_slots = "\tPoka�/ukryj pakiety gdzie\nbot ma wolne sloty\tPokazuje/ukrywa pakiety gdzie bot ma wolne sloty"
+lang.slots_unknown = "\tPoka�/ukryj pakiety gdzie\nilo�� slot�w jest nieznana\tPokazuje/ukrywa pakiety gdzie ilo�� slot�w jest nieznana"
+lang.no_free_slots = "\tPoka�/ukryj pakiety gdzie\nbot nie posiada wolnych slot�w\tPokazuje/ukrywa pakiety gdzie bot nie posiada wolnych slot�w"
+
+lang.what_do_you_want_to_fetch_today = "Co chcesz dzisiaj �ci�gn��?"
+
+lang.bot = "Bot"
+lang.name = "Nazwa"
+lang.size = "Rozmiar"
+
+lang.active = "Aktywne\tPokazuje aktywne pobierania\tPokazuje aktywne pobierania"
+lang.completed = "Zako�czone\tPokazuje zako�czone pobierania\tPokazuje zako�czone pobierania"
+lang.error = "B��d\tPokazuje przerwane pobierania\tPokazuje przerwane pobierania"
+
+lang.download = "&Pobierz\t\tPobierz tego packa"
+lang.status = "Status"
+lang.target_directory = "Katalog pobiera�"
+lang.clear_list = "&Czy�� list�"
+
+lang.download_waiting = "Oczekiwanie"
+lang.download_requesting = "��danie"
+lang.download_timeout = "Timeout"
+lang.download_cancelling = "Anulowanie"
+lang.download_started = "Pobieranie"
+lang.download_finished = "Uko�czone"
+lang.download_failed = "Nieudane"
+lang.queue_remote = "Zdalnie zakolejkowane: "
+lang.queue_local = "Lokalnie zakolejkowane: "
+lang.speed = "Szybko��"
+
+lang.version = "Wersja"
+lang.revision = "Podwersja"
+lang.credits = "Developerzy"
+lang.thanks = "Specjalne podzi�kowania dla"
+
+
+# "x of x packs"
+lang.of = "/"
+lang.packs = ""
+lang.status_label_tooltip = "\tPokazuje ilo�� widocznych\npack�w / ca�kowit� ilo�� pack�w\tPokazuje ilo�� widocznych pack�w / ca�kowit� ilo�� pack�w"
+
+lang.cancel = "&Anuluj\t\tAnuluje pobieranie"
+lang.submit = "&Wy�lij"
+
+lang.md5.disabled = "nieznane"
+lang.md5.unavailable = "nieznane"
+lang.md5.ok = "ok"
+lang.md5.failed = "z�e"
+
+lang.checksum = "Suma kontrolna"
+
+lang.speed = "Szybko��"
+
+lang.version = "Wersja"
+lang.revision = "Podwersja"
+lang.credits = "Podzi�kowania"
+
+lang.download_finished_box = "Pobieranie zako�czone"
+
+lang.show_warning = "&Poka� b��d"
+
+# Network messages
+lang.network.ip.err_notroutable_ip = "Nie wpisano rutowalnego adresu ip"
+lang.network.tcp.err_invalid_address = "Nieprawid�owe info o adresie/porcie TCP"
+lang.network.tcp.err_con_closed = "Po��czenie zosta�o zamkni�te"
+lang.network.tcp.err_con_active = "Po��czenie jest aktywne"
+lang.network.tcp.err_con_timeout = "Timeout podczas pr�by po��czenia"
+lang.network.tcp.err_con_no_remote = "Nie zosta� okre�lony adres i/lub port"
+lang.network.dcc.err_dir_notexist = "Nie istnieje katalog docelowy"
+lang.network.dcc.err_file_permission = "Nie mo�na zapisa� do pliku"
+lang.network.dcc.err_filesize_differ = "Rozmiar pliku wygl�da na inny"
+lang.network.dcc.err_verification = "Nieudana weryfikacja pliku"
+lang.network.xdcc.err_punish_slowness = "Zbyt ma�a pr�dko�c pobierania od bota"
+lang.network.xdcc.err_pack_already_requested = "Ju� za��dano tego packa"
+lang.network.xdcc.err_max_packs_requested = "Max ilo�� pack�w ��danych od bota"
+lang.network.xdcc.err_bot_left = "Bot opu�ci� IRC"
+lang.network.xdcc.err_server_disconnect = "Utracono po��czenie z serwerem IRC"
+lang.network.xdcc.err_con_closed = "Po��czenie zosta�o zdalnie zamkni�te"
+lang.network.xdcc.err_no_answer = "Brak odpowiedzi XDCC"
+lang.network.xdcc.err_ip_address_conversion = "Nie mo�na okre�li� adresu IP"
+lang.network.xdcc.cancel_download_default = "U�ytkownik anulowa� pobieranie"
+
+
+lang.message.connection_error_title = "B��d po��czenia"
+lang.message.connection_error = "Nieudane po��czenie z serwerem IRC"

data/src/Utilities/Configuration.rb

@@ -74,7 +74,7 @@ class Configuration
 		
 	def set_language(lang_id)
 		@lang.re_open
-		copy(@lang[lang_id], @lang)
+		copy(@whole_config.translations[lang_id], @lang)
 		@lang.close
 	end