[Ngetsuite-cvs] ngetsuite/ngetsuite downloader.rb,1.31,1.32 downloadmanager.rb,1.24,1.25

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

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

Modified Files:
	downloader.rb downloadmanager.rb 
Log Message:
fix typo making the download manager ignoring the period


Index: downloadmanager.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloadmanager.rb,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** downloadmanager.rb	25 Feb 2004 22:37:10 -0000	1.24
--- downloadmanager.rb	25 May 2004 22:41:59 -0000	1.25
***************
*** 63,67 ****
  		row = Db.dbh.select_one("select * from `queue` where (`status`='FINISHED' and (`period`!='0') and ((NOW()-`date_finished`) > `period`)) order by `priority` desc limit 1") if not row and $config['resume_downloads']
  		row = Db.dbh.select_one("select * from `queue` where (`status`='STOPPED' and (`period`!='0') and ((NOW()-`date_finished`) > `period`)) order by `priority` desc limit 1") if not row and $config['resume_downloads']
! 		row = Db.dbh.select_one("select * from `queue` where (`status`='FAILED' and (`period`!='0') and ((NOW()-`date_finished`) > 'period')) order by `priority` desc limit 1") if not row and $config['resume_downloads']
  		
  		return false if row == nil
--- 63,67 ----
  		row = Db.dbh.select_one("select * from `queue` where (`status`='FINISHED' and (`period`!='0') and ((NOW()-`date_finished`) > `period`)) order by `priority` desc limit 1") if not row and $config['resume_downloads']
  		row = Db.dbh.select_one("select * from `queue` where (`status`='STOPPED' and (`period`!='0') and ((NOW()-`date_finished`) > `period`)) order by `priority` desc limit 1") if not row and $config['resume_downloads']
! 		row = Db.dbh.select_one("select * from `queue` where (`status`='FAILED' and (`period`!='0') and ((NOW()-`date_finished`) > `period`)) order by `priority` desc limit 1") if not row and $config['resume_downloads']
  		
  		return false if row == nil

Index: downloader.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloader.rb,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** downloader.rb	23 May 2004 07:28:48 -0000	1.31
--- downloader.rb	25 May 2004 22:41:59 -0000	1.32
***************
*** 66,72 ****
  			ldebug "#{blue 'Loaded'} #{artfile} (last)", false
  		
! 		when /^uu_msg\(\d+\):Loaded from (.*): '.*' \(.*\):.*part (\d+)\s+(yEnc|UUdata|Base64|XXdata|BinHex|plaintext|qptext|unknown)$/
! 			artfile, nb = $1, $3
! 			# basename
  			artfile.sub!(/^.*\/([^\/]*)$/, '\1')
  			ldebug "#{blue 'Loaded'} #{artfile}", false
--- 66,74 ----
  			ldebug "#{blue 'Loaded'} #{artfile} (last)", false
  		
! 		when /^uu_msg\(\d+\):Loaded from (.*): '.*' \((.*)\): ?(.*) ?part (\d+)\s+(yEnc|UUdata|Base64|XXdata|BinHex|plaintext|qptext|unknown|Text)$/
! 			artfile, base, filename, nb, enc = $1, $2, $3, $4, $5
! 			if (@curfile._filename == 'unknown')
! 				@curfile._filename = filename
! 			end
  			artfile.sub!(/^.*\/([^\/]*)$/, '\1')
  			ldebug "#{blue 'Loaded'} #{artfile}", false