[Ngetsuite-cvs] ngetsuite2/ngetsuite group.rb,1.5,1.6

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

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

Modified Files:
	group.rb 
Log Message:
updated --batch, added parrar-sh for autopar2+unrar


Index: group.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite2/ngetsuite/group.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** group.rb	2 Dec 2005 02:07:43 -0000	1.5
--- group.rb	3 Dec 2005 13:24:04 -0000	1.6
***************
*** 126,134 ****
  		list = []
  		sth.fetch do |row|
! 			row[0] =~ /#{filter}/i
! 			list << $~[0]
  		end
  		run = []
  		list.uniq!
  		while not list.empty?
  			if run.length < nr
--- 126,137 ----
  		list = []
  		sth.fetch do |row|
! #			row[0] =~ /#{filter}/i
! #			list << $~[0]
! 			list << row[0]
  		end
  		run = []
  		list.uniq!
+ 		list.sort!
+ 	begin
  		while not list.empty?
  			if run.length < nr
***************
*** 136,151 ****
  				run << fork {
  					Dir.chdir $startdir
! 					cmd = "nget -G #{@_fullname} -qq -r '#{Regexp.escape name}'"
! 					puts cmd
  					system cmd
  					exit!
  				}
- 				sleep 0.5
  			else
  				if run.delete Process.wait
! 					puts "1 done"
  				end
  			end
  		end
  	end
  	
--- 139,177 ----
  				run << fork {
  					Dir.chdir $startdir
! 					name = (Regexp.escape name).gsub("'", %q{'"'"'})
! 					cmd = "nget -G #{@_fullname} -qq -r '#{name}'"
  					system cmd
  					exit!
  				}
  			else
  				if run.delete Process.wait
! 					puts "done (#{list.length} left)"
  				end
  			end
  		end
+ 	ensure
+ 		run.delete Process.wait while not run.empty?
+ 	end
+ 		
+ 		Dir.chdir $startdir
+ 		done = []
+ 		Dir['*.par2'].each { |f|
+ 			next if f !~ /#{filter}/i
+ 			next if f =~ /vol\d+\+\d+.par2/
+ 			base = f.sub(/\.par2$/, '').gsub("'", %q{'"'"'})
+ 			next if done.include? base
+ 			done << base
+ 			puts "parrar-sh '#{base}'"
+ 			system "parrar-sh '#{base}'"
+ 		}
+ 		Dir['*.rar'].each { |f|
+ 			next if f !~ /#{filter}/i
+ 			next if f =~ /part(\d+)\.rar/ and $1.to_i != 1
+ 			base = f.sub(/\.rar$/, '').sub(/.part0*1$/, '').gsub("'", %q{'"'"'})
+ 			next if done.include? base
+ 			done << base
+ 			puts "parrar-sh '#{base}'"
+ 			system "parrar-sh '#{base}'"
+ 		}
  	end