[Ngetsuite-cvs] ngetsuite/ngetsuite core.rb,1.32,1.33 downloadmanager.rb,1.21,1.22 group.rb,1.35,1.36

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

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

Modified Files:
	core.rb downloadmanager.rb group.rb 
Log Message:
added -G to search within releases, the daemon now retries the download of failed queues with a period defined (with 'resume_downloads')


Index: core.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/core.rb,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** core.rb	8 Feb 2004 12:55:48 -0000	1.32
--- core.rb	9 Feb 2004 21:34:49 -0000	1.33
***************
*** 68,71 ****
--- 68,76 ----
  	end
  
+ 	def search_releases(groupid, filter)	
+ 		g = Group.getgroup(groupid)
+ 		g.search_releases(filter)
+ 	end
+ 
  	def add_group(groupname, shortname = nil, dir = nil, desc = nil)
  		g = Group.new(groupname, false, shortname, dir, true, desc)
***************
*** 253,256 ****
--- 258,264 ----
  						search_group(*args)
  					end
+ 				when 'search-releases'
+ 					args = arg.split(',')
+ 					search_releases(*args)
  				when 'set-period'
  					args = arg.split(',')

Index: downloadmanager.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloadmanager.rb,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** downloadmanager.rb	7 Feb 2004 16:21:20 -0000	1.21
--- downloadmanager.rb	9 Feb 2004 21:34:49 -0000	1.22
***************
*** 60,64 ****
  	def start_new_downloader
  		row = Db.dbh.select_one("select * from queue where `status`='PENDING' order by `priority` desc limit 1")
! 		row = Db.dbh.select_one("select * from queue where `status`='STOPPED' order by `priority` desc limit 1") if not row and $config['resume_downloads']
  		
  		return false if row == nil
--- 60,65 ----
  	def start_new_downloader
  		row = Db.dbh.select_one("select * from queue where `status`='PENDING' order by `priority` desc limit 1")
! 		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: group.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/group.rb,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** group.rb	9 Feb 2004 15:32:58 -0000	1.35
--- group.rb	9 Feb 2004 21:34:49 -0000	1.36
***************
*** 127,130 ****
--- 127,143 ----
  	end
  	
+ 	def search_releases(filter)
+ 		sth = Db.dbh.execute('select articles.subject,releases.rlsmap,releases.nbactual,releases.nbexpected from releases,articles where articles.mid = releases.mid and articles.group = ? and articles.subject RLIKE ? order by articles.time desc', @_fullname, filter)
+ 		i = 0
+ 		subj, rlsmap, nbact, nbtot = nil
+ 		sth.fetch do |row|
+ 			subj, rlsmap, nbact, nbtot = *row
+ 			puts "#{yellow nbact}/#{yellow nbtot} [#{green rlsmap}] \"#{subj}\""
+ 			i += 1
+ 		end
+ 		sth.finish
+ 		puts "#{green i} matche#{i>1 ? 's' : ''} found"
+ 	end
+ 
  	def search(filter)
  		sth = Db.dbh.execute('select * from `articles` where `group` = ? and `subject` RLIKE ? order by `time` desc', @_fullname, filter)