rgadu 0.1.0 → 0.1.1

data/lib/gg/dccclient.rb

@@ -32,6 +32,8 @@ class DCCClient < DCCServer
 		@callback[@code] = callback if callback
 		begin
 			send7(@code, @socket, filename, filesize, offset)
+		rescue SystemCallError
+			callback.call(:aborted)
 		ensure
 			@progress.delete(@server_uin)
 		end
@@ -41,6 +43,8 @@ class DCCClient < DCCServer
 		@callback[@code] = callback if callback
 		begin
 			recv7(@code, @socket, filename, filesize, offset)
+		rescue SystemCallError, RuntimeError
+			callback.call(:aborted) if callback
 		ensure
 			@progress.delete(@server_uin)
 		end

data/lib/gg/dccserver.rb

@@ -40,6 +40,8 @@ class DCCServer
 				session.write(code)
 				begin
 					send7(code, session, filename, filesize, offset)
+				rescue SystemCallError
+					@callback[code].call(:aborted) if @callback[code]
 				ensure
 					@progress[code]=@callback[code]=nil
 				end
@@ -47,6 +49,8 @@ class DCCServer
 				session.write(packet_raw)
 				begin
 					recv7(code, session, filename, filesize, offset)
+				rescue SystemCallError, RuntimeError
+					@callback[code].call(:aborted) if @callback[code]
 				ensure
 					@progress[code]=@callback[code]=nil
 				end
@@ -62,11 +66,18 @@ class DCCServer
 		base=File.basename(filename)
 		alternate=base[0..12].upcase
 		session.write([0x01, 0x03, 0, 0, fileattr, creationlow, creationhigh, accesslow, accesshigh, writelow, writehigh, sizehigh, filesize, 0, 0, base, alternate].pack('LLLLLLLLLLLLLLLa262a14'))
-		packet_raw = session.read(12) or return
+		begin
+			packet_raw = session.read(12) or raise
+		rescue SystemCallError, RuntimeError
+			@callback[client_uin].call(:rejected) if @callback[client_uin]
+			return
+		end
 		type, offset = packet_raw.unpack('LLL')
 		if type==0x06 and offset<filesize
 			begin
 				send(client_uin, session, filename, filesize, offset)
+			rescue SystemCallError
+				@callback[client_uin].call(:aborted) if @callback[client_uin]
 			ensure
 				@progress[client_uin]=@callback[client_uin]=nil
 			end
@@ -75,7 +86,7 @@ class DCCServer
 
 	def send(client_uin, session, filename, filesize, offset)
 		@progress[client_uin] = bytes = offset
-		file=File.open(filename, 'r')
+		file=File.open(filename, 'rb')
 		file.seek(offset) if offset>0
 		while bytes<filesize and data=file.read(4096)
 			length = data.length
@@ -90,6 +101,7 @@ class DCCServer
 			@progress[client_uin] = bytes
 			@callback[client_uin].call(bytes) if @callback[client_uin]
 		end
+		file.close
 	end
 
 	def init_recv(session, client_uin)
@@ -116,6 +128,8 @@ class DCCServer
 				session.write([0x06, offset, 0].pack('LLL')) or return
 				begin
 					recv(client_uin, session, local_filename, filesize, offset)
+				rescue SystemCallError, RuntimeError
+					@callback[client_uin].call(:aborted) if @callback[client_uin]
 				ensure
 					@progress[client_uin]=@callback[client_uin]=nil
 				end
@@ -126,19 +140,20 @@ class DCCServer
 
 	def recv(client_uin, session, filename, filesize, offset)
 		if offset>0
-			mode='a'
+			mode='ab'
 		else
-			mode='w'
+			mode='wb'
 		end
 		file=File.open(filename, mode)
 		@progress[client_uin] = bytes = offset
-		while packet_raw=session.read(12)
+		while bytes < filesize
+			packet_raw=session.read(12) or raise
 			type, length = packet_raw.unpack('LLL')
 			if bytes+length > filesize
 				break
 			end
 			if type==0x03 or type==0x02
-				packet=session.read(length) or return
+				packet=session.read(length) or raise
 				file.write(packet)
 				bytes+=length
 				@progress[client_uin] = bytes
@@ -152,7 +167,7 @@ class DCCServer
 	def send7(code, session, filename, filesize, offset)
 		return unless File.exist?(filename)
 		@progress[code]=bytes=offset
-		file=File.open(filename, 'r')
+		file=File.open(filename, 'rb')
 		file.seek(offset) if offset>0
 		while bytes<filesize and data=file.read(4096)
 			session.write(data) or return
@@ -160,17 +175,19 @@ class DCCServer
 			@progress[code] = bytes
 			@callback[code].call(bytes) if @callback[code]
 		end
+		file.close
 	end
 
 	def recv7(code, session, filename, filesize, offset)
 		if offset>0
-			mode='a'
+			mode='ab'
 		else
-			mode='w'
+			mode='wb'
 		end
 		file=File.open(filename, mode)
 		@progress[code]=bytes=offset
-		while bytes<filesize and data=session.read(4096)
+		while bytes<filesize
+			data=session.read(4096) or raise
 			file.write(data)
 			bytes += data.length
 			@progress[code] = bytes

data/lib/gg.rb

@@ -36,9 +36,9 @@ class GG
 		0x1f => 'LLa8a21a43'}
 
 =begin rdoc
-Tworzy nowy obiekt GG i loguje sie na serwerze. Opcjonalnie uruchamia serwer DCC na porcie *dccport*.
+Tworzy nowy obiekt GG i loguje sie na serwerze. Opcjonalnie uruchamia serwer DCC na porcie *dccport* i przesy�a serwerowi tablic� z list� kontakt�w.
 =end
-	def initialize(uin, password, dccport=0, server='217.17.45.146', port=8074)
+	def initialize(uin, password, dccport=0, contacts=nil, server='217.17.45.146', port=8074)
 		@uin=uin
 		@dccport=dccport
 		@socket=TCPSocket.new(server, port)
@@ -60,7 +60,11 @@ Tworzy nowy obiekt GG i loguje sie na serwerze. Opcjonalnie uruchamia serwer DCC
 		unless type==0x03 or type==0x14
 			raise "Authorization failed"
 		end
-		write(0x12, '')
+		if contacts and contacts.length > 0
+			write(0x10, 'LC'*contacts.length, *(contacts.map {|contact| [contact, 0x03] }.flatten))
+		else
+			write(0x12, '')
+		end
 		@action, @status, @search_reply, @dcc_code, @dcc_action, @dcc_client_action = {}, {}, {}, [], {}, {}
 		@action_thread, @dcc_client, @dcc_client_thread = [], [], []
 		@action[0x0a] = lambda {|sender, seq, time, cl, message| msg_received(sender, seq, time, cl, message) }
@@ -71,6 +75,7 @@ Tworzy nowy obiekt GG i loguje sie na serwerze. Opcjonalnie uruchamia serwer DCC
 		@action[0x0e] = lambda {|type, seq, response| @search_reply[seq] = response }
 		@action[0x23] = lambda {|type, code| @dcc_code << code }
 		@action[0x21] = lambda {|uin, code, offset, x| @dcc_action[code].call(offset) if @dcc_action[code] }
+		@action[0x22] = lambda {|uin, code, reason| @dcc_action[code].call(-1) if @dcc_action[code] }
 		@action[0x1f] = lambda do |uin, x, code, ip_port, y|
 			if action = @dcc_client_action[code]
 				@dcc_client_action.delete(code)
@@ -95,7 +100,7 @@ Tworzy nowy obiekt GG i loguje sie na serwerze. Opcjonalnie uruchamia serwer DCC
 Wysyla wiadomosc *message* do *uin*.
 =end
 	def msg(uin, message)
-		write(0x0b, 'LLLa*C', uin, rand(2**32), 0x04, message, 0)
+		write(0x0b, 'LLLa*C', uin, rand(2**32), 0x08, message, 0)
 	end
 
 =begin rdoc
@@ -177,42 +182,53 @@ Wyszukiwanie w katalogu publicznym. *params* moze byc numerem GG lub tablica aso
 	end
 
 =begin rdoc
-Wysyla plik *filename* do *uin*. Jesli dolaczono blok kodu, blok ten bedzie wywolywany podczas wysylania pliku. Blok przyjmuje jeden parametr - aktualna pozycje pliku w bajtach. Funkcja w zaleznosci od wersji protokolu DCC zwraca kod transferu lub numer GG odbiorcy.
+Wysyla plik *filename* do *uin*. Mo�na poda� hash SHA1 pliku w postaci ci�gu bajt�w, w przeciwnym razie hash jest obliczany w razie potrzeby. Jesli dolaczono blok kodu, blok ten bedzie wywolywany podczas wysylania pliku. Blok przyjmuje jeden parametr - aktualn� pozycj� pliku w bajtach, symbol :rejected je�li po��czenie zosta�o odrzucone lub :aborted w przypadku przerwania transferu. Funkcja w zaleznosci od wersji protokolu DCC zwraca kod transferu lub numer GG odbiorcy.
 =end
-	def dcc_request(uin, filename, &callback)
+	def dcc_request(uin, filename, hash=nil, &callback)
 		raise "No DCC server" unless @dcc
 		if File.exist?(filename)
-			if @status[uin] and version=@status[uin][:version] and version.to_f >= 7.7
+			if @status[uin] and version=@status[uin][:version] and version.to_f >= 7.6
 				write(0x23, 'L', 0x04)
 				sleep 0.1 until code = @dcc_code.shift
 				filesize=File.size(filename)
-				hash=Digest::SHA1.digest(File.read(filename))
+				unless hash
+					checksum = Digest::SHA1.new
+					file = File.open(filename, 'rb')
+					while chunk = file.read(1048576)
+						checksum << chunk
+					end
+					file.close
+					hash = checksum.digest
+				end
 				write(0x20, 'a8LLLa226a29LLa20', code, @uin, uin, 0x04, File.basename(filename), '', filesize, 0, hash)
 				@dcc_action[code] = lambda do |offset|
-					if callback
-						@dcc.add_send_code(code, filename, filesize, offset) {|pos| callback.call(pos) }
+					if offset == -1
+						callback.call(:rejected)
 					else
-						@dcc.add_send_code(code, filename, filesize, offset)
-					end
-					write(0x1f, 'LLa8a21a43', uin, 0x01, code, @socket.addr[3]+' '+@dccport.to_s, '')
-					if @socket.addr[3] =~ /^(10\.|172\.16\.|192\.168\.)/
-						@dcc_client_action[code] = lambda do |ip, port|
-							@dcc_client_thread << Thread.new(ip, port, @uin, uin, code, filename, filesize, offset, callback) do |ip, port, client_uin, server_uin, code, filename, filesize, offset, callback|
-								begin
-									client = DCCClient.new(ip, port, client_uin, server_uin, code)
-									@dcc_client << client
-									if callback
-										client.client_send7(filename, filesize, offset) {|pos| callback.call(pos) }
-									else
-										client.client_send7(filename, filesize, offset)
+						if callback
+							@dcc.add_send_code(code, filename, filesize, offset) {|pos| callback.call(pos) }
+						else
+							@dcc.add_send_code(code, filename, filesize, offset)
+						end
+						write(0x1f, 'LLa8a21a43', uin, 0x01, code, @socket.addr[3]+' '+@dccport.to_s, '')
+						if @socket.addr[3] =~ /^(10\.|172\.16\.|192\.168\.)/
+							@dcc_client_action[code] = lambda do |ip, port|
+								@dcc_client_thread << Thread.new(ip, port, @uin, uin, code, filename, filesize, offset, callback) do |ip, port, client_uin, server_uin, code, filename, filesize, offset, callback|
+									begin
+										client = DCCClient.new(ip, port, client_uin, server_uin, code)
+										@dcc_client << client
+										if callback
+											client.client_send7(filename, filesize, offset) {|pos| callback.call(pos) }
+										else
+											client.client_send7(filename, filesize, offset)
+										end
+									rescue
+										warn "Error: #{$!}"
 									end
-								rescue
-									warn "Error: #{$!}"
 								end
 							end
 						end
 					end
-									
 				end
 				code
 			else
@@ -362,7 +378,7 @@ Rozlacza sie z serwerem GG, wylacza serwer DCC i zamyka wszystkie polaczenia DCC
 		@ping_loop.exit
 		@read_loop.exit
 		@socket.close
-		@dcc.close
+		@dcc.close if @dcc
 		@dcc_client_thread.each {|t| t.exit }
 	end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rgadu
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-08-04 00:00:00 +02:00
+  version: 0.1.1
+date: 2007-08-22 00:00:00 +02:00
 summary: A simple pure-Ruby implementation of the Gadu-Gadu protocol.
 require_paths: 
 - lib
@@ -12,7 +12,7 @@ email: bl4@playker.info
 homepage: 
 rubyforge_project: 
 description: 
-autorequire: gg
+autorequire: 
 default_executable: 
 bindir: bin
 has_rdoc: true