[Ngetsuite-cvs] ngetsuite/ngetsuite config.rb,1.6,1.7 downloader.rb,1.42,1.43

[Yoann G. <jj...@us...>]

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

Modified Files:
	config.rb downloader.rb 
Log Message:
added config option for the temporary subdir for nget


Index: downloader.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloader.rb,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** downloader.rb	29 Sep 2004 12:18:00 -0000	1.42
--- downloader.rb	29 Sep 2004 16:32:12 -0000	1.43
***************
*** 154,157 ****
--- 154,161 ----
  			
  		when /close\(fast\)$/
+ 		when /\(temp\)path:(.*)/
+ 			ldebug "Downloading in #{green $1}"
+ 		when /temppath:(.*)/
+ 			ldebug "Temp files in #{green $1}"
  		when /^error, will try .* again \(server says byebye: (.*)\)/
  			ldebug red("Disconnected (#{$1})") + '. Reconnecting...', false
***************
*** 193,197 ****
  		end
  
! 		subdirexpr = "-p ." + File::Separator + "'#{@subdir}' -P ." + File::Separator + "'#{@subdir}'" + File::Separator + "temp"
  		
  		@io = IO.popen("#{"nice -n#{$config['nice_nget_download']} -- " if $config['nice_nget_download'] != 0} #{$config['nget']} -q -dfI --makedirs yes #{subdirexpr} -G #{@group._fullname} #{downloadexpr} 2>&1")
--- 197,203 ----
  		end
  
! 		
! 		subdirexpr = "-p '.#{File::Separator}#{@subdir}'"
! 		subdirexpr += " -P '.#{File::Separator}#{@subdir}#{File::Separator}#{$config['queue_tempsubdir']}'" if ($config['queue_tempsubdir'])
  		
  		@io = IO.popen("#{"nice -n#{$config['nice_nget_download']} -- " if $config['nice_nget_download'] != 0} #{$config['nget']} -q -dfI --makedirs yes #{subdirexpr} -G #{@group._fullname} #{downloadexpr} 2>&1")

Index: config.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/config.rb,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config.rb	6 Jul 2004 10:41:21 -0000	1.6
--- config.rb	29 Sep 2004 16:32:12 -0000	1.7
***************
*** 34,37 ****
--- 34,40 ----
  httpd_port = 2000
  httpd_autostart = true
+ httpd_error_log = '/home/nget/weberrors.log'
+ httpd_access_log = '/home/nget/webaccess.log'
+ queue_tempsubdir = 'temp'
  ".each("\n") { |l| self[$1] = eval($2) if l=~ /^(\S+)\s*=\s*(.*)$/ }
        IO.foreach(@file) do |line|