[Ngetsuite-cvs] ngetsuite/ngetsuite downloader.rb,1.20,1.21 downloadmanager.rb,1.18,1.19 group.rb,1.29,1.30

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

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

Modified Files:
	downloader.rb downloadmanager.rb group.rb 
Log Message:
better nget output parsing


Index: downloader.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloader.rb,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** downloader.rb	4 Feb 2004 07:13:05 -0000	1.20
--- downloader.rb	4 Feb 2004 15:21:48 -0000	1.21
***************
*** 42,47 ****
  		line.chomp!
  		case line
! 		when /^already have (.*)$/
! 			debug 'file already there : ' + $1
  			@nbfiles += 1
  		when /^Retrieving: (\d+).*\t(\d+)l.*(<.*>)$/
--- 42,47 ----
  		line.chomp!
  		case line
! 		when /^already have article (<.*>) \(.*\/([^\/]*)\)$/
! 			debug yellow('file already there') + ' : ' + green($1) + ' in ' + blue($2)
  			@nbfiles += 1
  		when /^Retrieving: (\d+).*\t(\d+)l.*(<.*>)$/
***************
*** 71,76 ****
  			filenb = $4
  			@curfile.update(part, speed, filenb, size)
! 		when /^autopar/
! 			debug 'autopar: ' + blue(line)
  			
  		when /^uu_msg\(\d+\):Loaded from .*: '.*' \(.*\): (.*) part \d+.*end (.*)$/
--- 71,76 ----
  			filenb = $4
  			@curfile.update(part, speed, filenb, size)
! 		when /^autopar.*seems like a par2 \((.*)\)/
! 			debug 'autopar: found a par2 for ' + blue($1)
  			
  		when /^uu_msg\(\d+\):Loaded from .*: '.*' \(.*\): (.*) part \d+.*end (.*)$/
***************
*** 87,90 ****
--- 87,97 ----
  			debug blue('Connected')
  		when />> (480|381|281)/, /<< (GROUP|AUTHINFO)/
+ 			# nothing
+ 		when /^download error occured, keeping temp file$/
+ 			# same as below
+ 		when /^couldn't get (<.*>) from anywhere$/
+ 			debug red("Couldn't download mid ") + green($1)
+ 		when /^ERRORS: (.*)$/
+ 			debug red("Finished, got errors for #{$1}")
  		else
  		#TODO : handle decoding failures (=> @curfile.finish(false))

Index: downloadmanager.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloadmanager.rb,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** downloadmanager.rb	4 Feb 2004 12:22:46 -0000	1.18
--- downloadmanager.rb	4 Feb 2004 15:21:48 -0000	1.19
***************
*** 91,95 ****
  				d.stop
  			}
! 			@mainThread.run
  			10.times do |i|
  				sleep 0.1
--- 91,95 ----
  				d.stop
  			}
! 			@mainThread.run if @mainThread.alive?
  			10.times do |i|
  				sleep 0.1
***************
*** 106,110 ****
  		@dlers.each {|id, dler|
  			next unless dler.finished?
- 			log "Finished download of queue #{dler.value}"
  			dler.finish(true)
  			@dlers.delete(id)
--- 106,109 ----

Index: group.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/group.rb,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** group.rb	4 Feb 2004 12:22:46 -0000	1.29
--- group.rb	4 Feb 2004 15:21:48 -0000	1.30
***************
*** 218,222 ****
  	def fetchnfos
  		# fetches the nfos
! 		`nice -n19 #{@nget} --path #{$tempdir} -G #{@_fullname} -K -L 150 -r '\.nfo|\.txt'`
  		# but mark them as if we didn't download them
  		`#{@nget} --path #{$tempdir} -qq -G #{@_fullname} -U -r '\.nfo|\.txt'`
--- 218,222 ----
  	def fetchnfos
  		# fetches the nfos
! 		`nice -n19 #{@nget} --path #{$tempdir} -G #{@_fullname} -K -L 150 -r '\\.nfo|\\.txt'`
  		# but mark them as if we didn't download them
  		`#{@nget} --path #{$tempdir} -qq -G #{@_fullname} -U -r '\.nfo|\.txt'`