[Ngetsuite-cvs] ngetsuite/ngetsuite group.rb,1.43,1.44 ngetcache.rb,1.9,1.10

[Johnjohn <jj...@us...>]

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

Modified Files:
	group.rb ngetcache.rb 
Log Message:
removed unnecessary nice (doesn't seem to stop the invocation of sh)
cleaner advancement printing (with timeout)


Index: ngetcache.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/ngetcache.rb,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ngetcache.rb	27 Feb 2004 13:12:07 -0000	1.9
--- ngetcache.rb	21 May 2004 08:42:20 -0000	1.10
***************
*** 59,62 ****
--- 59,68 ----
  		read_head
  
+ 		tracker = Thread.new do
+ 			loop do
+ 			NgetSuite::Utils.debug "#{@partscountcurrent}/#{@partscounttotal}", false
+ 			sleep 0.6
+ 			end
+ 		end
  		begin
  			read_body
***************
*** 66,69 ****
--- 72,76 ----
  		ensure
  			@fd.close
+ 			tracker.kill
  		end
  	end
***************
*** 144,148 ****
  		end
  		@partscountcurrent += 1
- 		NgetSuite::Utils.debug "#{@partscountcurrent}/#{@partscounttotal}", false if @partscountcurrent % 20 == 0
  		part
  	end
--- 151,154 ----

Index: group.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/group.rb,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** group.rb	17 Mar 2004 10:14:19 -0000	1.43
--- group.rb	21 May 2004 08:42:19 -0000	1.44
***************
*** 168,172 ****
  		
  		n = rand(900000)+100000
! 		cmdline = "nice -n#{$config['nice_nget_update']} -- #{$config['nget']} -g #{@_fullname} -cr '^#{n}Dummy' 2>&1"
  		
  		begin
--- 168,173 ----
  		
  		n = rand(900000)+100000
! 		cmdline = "#{$config['nget']} -g #{@_fullname} -cr '^#{n}Dummy' 2>&1"
! 		cmdline = "nice -n#{$config['nice_nget_update']} -- #{cmdline}" if $config['nice_nget_update'] != 0
  		
  		begin
***************
*** 237,243 ****
  		begin
  		# fetches the nfos, w/o decoding
! 		`nice -n#{$config['nice_nget_update']} -- #{$config['nget']} --path #{tempdir} -G #{@_fullname} -K -L 150 -r '\\.nfo|\\.txt' 2>&1`
  		# but mark them for nget as if we didn't download them
! 		`nice -n#{$config['nice_nget_update']} -- #{$config['nget']} --path #{tempdir} -qq -G #{@_fullname} -U -r '\\.nfo|\\.txt' 2>&1`
  		debug "Fetchnfos: #{Dir['ngettemp-*'].length} files downloaded in #{Utils.cooltime(Time.now-t)}"
  
--- 238,244 ----
  		begin
  		# fetches the nfos, w/o decoding
! 		`#{"nice -n#{$config['nice_nget_update']} -- " if $config['nice_nget_update'] != 0 }#{$config['nget']} --path #{tempdir} -G #{@_fullname} -K -L 150 -r '\\.nfo|\\.txt' 2>&1`
  		# but mark them for nget as if we didn't download them
! 		`#{"nice -n#{$config['nice_nget_update']} -- " if $config['nice_nget_update'] != 0 }#{$config['nget']} --path #{tempdir} -qq -G #{@_fullname} -U -r '\\.nfo|\\.txt' 2>&1`
  		debug "Fetchnfos: #{Dir['ngettemp-*'].length} files downloaded in #{Utils.cooltime(Time.now-t)}"