[Ngetsuite-cvs] ngetsuite/ngetsuite core.rb,1.25,1.26 downloader.rb,1.16,1.17 downloadmanager.rb,1.13,1.14 group.rb,1.21,1.22 queue_file.rb,1.13,1.14 utils.rb,1.9,1.10

[<bla...@pr...>]

Update of /cvsroot/ngetsuite/ngetsuite/ngetsuite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv347/ngetsuite

Modified Files:
	core.rb downloader.rb downloadmanager.rb group.rb 
	queue_file.rb utils.rb 
Log Message:
httpd is now started by daemon.rb, misc fixes

Index: core.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/core.rb,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** core.rb	2 Feb 2004 02:41:57 -0000	1.25
--- core.rb	2 Feb 2004 17:44:19 -0000	1.26
***************
*** 40,45 ****
  	def get_manager
  		DRb.start_service()
! 		port = $config['port']
! 		manager = DRbObject.new(nil, 'druby://localhost:' + port)
  		if !manager
  			raise ManagerNotFoundException.new("localhost:#{port}")
--- 40,45 ----
  	def get_manager
  		DRb.start_service()
! 		port = $config.fetch('port', 12345)
! 		manager = DRbObject.new(nil, 'druby://localhost:' + port.to_s)
  		if !manager
  			raise ManagerNotFoundException.new("localhost:#{port}")

Index: downloader.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloader.rb,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** downloader.rb	2 Feb 2004 02:41:57 -0000	1.16
--- downloader.rb	2 Feb 2004 17:44:19 -0000	1.17
***************
*** 40,44 ****
  
  	def update_status(line)
! 		debug(Utils.red("begin update_status"))
  		if line =~ /^already have .*\n$/
  			@nbfiles += 1
--- 40,44 ----
  
  	def update_status(line)
! 		#debug(Utils.red("begin update_status"))
  		if line =~ /^already have .*\n$/
  			@nbfiles += 1
***************
*** 60,70 ****
  			speed = $3
  			filenb = $4
- 			#if (!@nbfiles)
- 			#	@nbfiles = $4
- 			#	debug "before sql"
- 			#	$dbh.do "update queue set `nbfiles`='#{@nbfiles}'
- 			#		where `id`='#{@id}'"
- 			#	debug "after sql"
- 			#end
  			@curfile.update(part, speed, filenb, size)
  		elsif line =~ /^uu_msg\(\d+\):Loaded from .*: '.*' \(.*\): (.*) part \d+.*end (.*)\n$/
--- 60,63 ----
***************
*** 77,81 ****
  		#TODO : handle decoding failures (=> @curfile.finish(false))
  		end
! 		debug (Utils.red "end update_status")
  	end
  
--- 70,74 ----
  		#TODO : handle decoding failures (=> @curfile.finish(false))
  		end
! 		#debug (Utils.red "end update_status")
  	end
  

Index: downloadmanager.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloadmanager.rb,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** downloadmanager.rb	2 Feb 2004 02:41:57 -0000	1.13
--- downloadmanager.rb	2 Feb 2004 17:44:19 -0000	1.14
***************
*** 20,23 ****
--- 20,24 ----
  		@poll_interval = 30
  		@started = false
+ 		start if $config.fetch('autostart', false)
  	end
  

Index: group.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/group.rb,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** group.rb	2 Feb 2004 02:41:57 -0000	1.21
--- group.rb	2 Feb 2004 17:44:19 -0000	1.22
***************
*** 92,97 ****
  		@_description = description
  		@_date_added = Time.now
! 		@nget = $config['nget']
! 		@yydecode = $config['yydecode']
  		@cachedir = $config['cachedir']
  		update_from_db if fetch_from_db
--- 92,97 ----
  		@_description = description
  		@_date_added = Time.now
! 		@nget = $config.fetch('nget', '/usr/bin/nget')
! 		@yydecode = $config.fetch('yydecode', '/usr/bin/yydecode')
  		@cachedir = $config['cachedir']
  		update_from_db if fetch_from_db

Index: queue_file.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/queue_file.rb,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** queue_file.rb	27 Dec 2003 20:01:54 -0000	1.13
--- queue_file.rb	2 Feb 2004 17:44:19 -0000	1.14
***************
*** 41,45 ****
  
  	def update(part, speed, filenb, size)
! 		puts "begin update : part = #{part}, speed = #{speed}, filenb = #{filenb}, size = #{size}"
  		@part = part
  		@_filenumber = filenb
--- 41,45 ----
  
  	def update(part, speed, filenb, size)
! 		#puts "begin update : part = #{part}, speed = #{speed}, filenb = #{filenb}, size = #{size}"
  		@part = part
  		@_filenumber = filenb
***************
*** 73,77 ****
  
  		sync_to_db
! 	end	
  end
  
--- 73,81 ----
  
  		sync_to_db
! 	end
! 
! 	def to_s
! 		"-- #{@_filename} : [#{@part}/#{@dlparts}], speed = #{@_avgspeed}"
! 	end
  end
  

Index: utils.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/utils.rb,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** utils.rb	2 Feb 2004 02:41:57 -0000	1.9
--- utils.rb	2 Feb 2004 17:44:19 -0000	1.10
***************
*** 24,28 ****
  
  	def Utils.debug(message=nil)
!   		puts "DEBUG: #{message}" if($config['debug'] && message)
  	end
  
--- 24,28 ----
  
  	def Utils.debug(message=nil)
!   		puts "DEBUG: #{message}" if($config.fetch('debug', false) && message)
  	end