[Ngetsuite-cvs] ngetsuite/ngetsuite articles.rb,1.13,1.14 group.rb,1.48,1.49 utils.rb,1.16,1.17

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	articles.rb group.rb utils.rb 
Log Message:
better release listing (console)

Index: utils.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/utils.rb,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** utils.rb	27 Feb 2004 13:12:07 -0000	1.16
--- utils.rb	3 Sep 2004 09:12:03 -0000	1.17
***************
*** 21,26 ****

  	# print +message+ if debugging is enabled
! 	def debug(message=nil, linefeed=true)
! 		Utils.debug message, linefeed
  	end

--- 21,26 ----

  	# print +message+ if debugging is enabled
! 	def debug(*args)
! 		Utils.debug *args
  	end

***************
*** 48,53 ****
  		color(msg,WHITE_FG,1)
  	end
! 	def white msg
! 		Utils.white msg
  	end

--- 48,53 ----
  		color(msg,WHITE_FG,1)
  	end
! 	def white *args
! 		Utils.white *args
  	end

***************
*** 55,60 ****
  		color(msg,RED_FG,1)
  	end
! 	def red msg
! 		Utils.red msg
  	end

--- 55,60 ----
  		color(msg,RED_FG,1)
  	end
! 	def red *args
! 		Utils.red *args
  	end

***************
*** 62,67 ****
  		color(msg,BLUE_FG,1)
  	end
! 	def blue msg
! 		Utils.blue msg
  	end

--- 62,67 ----
  		color(msg,BLUE_FG,1)
  	end
! 	def blue *args
! 		Utils.blue *args
  	end

***************
*** 69,74 ****
  		color(msg,GREEN_FG,1)
  	end
! 	def green msg
! 		Utils.green msg
  	end

--- 69,74 ----
  		color(msg,GREEN_FG,1)
  	end
! 	def green *args
! 		Utils.green *args
  	end

***************
*** 76,86 ****
  		color(msg,YELLOW_FG,1)
  	end
! 	def yellow msg
! 		Utils.yellow msg
  	end

  	def format_date(date)
  		if date.class == Time
! 			date.strftime('%Y-%m-%d %H-%M-%S')
  		else
  			date
--- 76,86 ----
  		color(msg,YELLOW_FG,1)
  	end
! 	def yellow *args
! 		Utils.yellow *args
  	end

  	def format_date(date)
  		if date.class == Time
! 			date.strftime('%Y-%m-%d %H:%M:%S')
  		else
  			date
***************
*** 89,104 ****

  	def Utils.pretty_date(date)
! 		if date != nil
! 			day,time = date.to_s.split(' ').values_at(0,1)
! 			y,m,d = day.split('-').values_at(0,1,2)
! 			h,min,s = time.split(':').values_at(0,1,2)
! 			"#{d}/#{m}&nbsp;#{h}:#{min}"
! 		else
! 			""
! 		end
  	end

! 	def pretty_date(date)
! 		Utils.pretty_date(date)
  	end

--- 89,97 ----

  	def Utils.pretty_date(date)
! 		date.to_s.sub(/^....-(..)-(..) (..):(..):../, '\2/\1 \3:\4')
  	end

! 	def pretty_date(*args)
! 		Utils.pretty_date(*args)
  	end

***************
*** 120,132 ****
  		Utils.spreadbase(seconds.to_i, 60, 3, ['s', 'm', 'h'])
  	end
! 	def cooltime(seconds)
! 		Utils.cooltime(seconds)
  	end

! 	def Utils.pretty_size(size)
! 		Utils.spreadbase(size.to_i, 1024, 1, ['b', 'kb', 'Mb', 'Gb'])
  	end
! 	def pretty_size(asize)
! 		Utils.pretty_size(asize)
  	end
  end
--- 113,125 ----
  		Utils.spreadbase(seconds.to_i, 60, 3, ['s', 'm', 'h'])
  	end
! 	def cooltime(*args)
! 		Utils.cooltime(*args)
  	end

! 	def Utils.pretty_size(size, prec=1)
! 		Utils.spreadbase(size.to_i, 1024, prec, ['b', 'kb', 'Mb', 'Gb'])
  	end
! 	def pretty_size(*args)
! 		Utils.pretty_size(*args)
  	end
  end

Index: group.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/group.rb,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** group.rb	25 Jun 2004 11:10:05 -0000	1.48
--- group.rb	3 Sep 2004 09:12:03 -0000	1.49
***************
*** 126,135 ****

  	def search_releases(filter)
! 		sth = Db.dbh.execute('select articles.subject,releases.rlsmap,releases.nbactual,releases.nbexpected,releases.time from releases,articles where articles.artindex = releases.artindex and articles.groupindex = ? and articles.subject RLIKE ? order by releases.time desc', @_groupindex, filter)
  		i = 0
! 		subj, rlsmap, nbact, nbtot, time = nil
  		sth.fetch do |row|
! 			subj, rlsmap, nbact, nbtot, time = *row
! 			puts "#{time} #{yellow nbact}/#{yellow nbtot} [#{green rlsmap}] \"#{subj}\""
  			i += 1
  		end
--- 126,135 ----

  	def search_releases(filter)
! 		sth = Db.dbh.execute('select articles.subject,releases.rlsmap,releases.nbactual,releases.nbexpected,releases.time,releases.size from releases,articles where articles.artindex = releases.artindex and articles.groupindex = ? and articles.subject RLIKE ? order by releases.time desc', @_groupindex, filter)
  		i = 0
! 		subj, rlsmap, nbact, nbtot, time, size = nil
  		sth.fetch do |row|
! 			subj, rlsmap, nbact, nbtot, time, size = *row
! 			puts "#{blue pretty_date(time)} [#{yellow rlsmap}] (#{red nbact}/#{red nbtot}) \"#{subj}\" (#{green pretty_size(size, 2)})"
  			i += 1
  		end
***************
*** 139,145 ****

  	def search(filter)
! 		sth = Db.dbh.execute("select `subject` from `articles` where `groupindex`='#{@_groupindex}' and `subject` RLIKE ? order by `time` desc", filter)
  		sth.fetch do |row|
! 			puts row[0]
  		end
  		sth.finish
--- 139,145 ----

  	def search(filter)
! 		sth = Db.dbh.execute("select `time`,`subject`,`size` from `articles` where `groupindex`='#{@_groupindex}' and `subject` RLIKE ? order by `time` desc", filter)
  		sth.fetch do |row|
! 			puts "#{blue pretty_date(row[0])}#{white ':'} #{row[1]} (#{green pretty_size(row[2])})"
  		end
  		sth.finish

Index: articles.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/articles.rb,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** articles.rb	25 Jun 2004 11:17:11 -0000	1.13
--- articles.rb	3 Sep 2004 09:12:03 -0000	1.14
***************
*** 29,33 ****

  	def to_s
! 		@_subject		# TODO one day...
  	end
  end
--- 29,33 ----

  	def to_s
! 		"#{Utils.blue _time}#{Utils.white ':'} #{@_subject}"		# TODO one day...
  	end
  end
***************
*** 48,52 ****
  		elsif subject =~ /[^\d](\d{1,3})\/(\d{1,3})[^\d]/
  			return $1.to_i, $2.to_i, $2.length
! 		elsif subject =~ /(\d{1,3}) *of? *(\d{1,3})/
  			return $1.to_i, $2.to_i, $2.length
  		elsif subject =~ /(\d{1,3}) *sur *(\d{1,3})/
--- 48,52 ----
  		elsif subject =~ /[^\d](\d{1,3})\/(\d{1,3})[^\d]/
  			return $1.to_i, $2.to_i, $2.length
! 		elsif subject =~ /(\d{1,3}) *of *(\d{1,3})/
  			return $1.to_i, $2.to_i, $2.length
  		elsif subject =~ /(\d{1,3}) *sur *(\d{1,3})/