[Ngetsuite-cvs] ngetsuite/ngetsuite downloader.rb,1.36,1.37 queue.rb,1.28,1.29 utils.rb,1.17,1.18

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

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

Modified Files:
	downloader.rb queue.rb utils.rb 
Log Message:
sexier console-mode queue status


Index: queue.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/queue.rb,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** queue.rb	3 Sep 2004 10:42:59 -0000	1.28
--- queue.rb	9 Sep 2004 12:11:10 -0000	1.29
***************
*** 124,140 ****
  
  	def group
! 		Group.getname(@_groupindex)
  	end
  	
  	def to_s
  		s = "#{yellow '<'}#{blue @_queueindex}#{yellow '>'} [#{red group}] #{yellow @_value}, prio : #{@_priority}, dest : #{green @_subdir}, status : #{@_status}"
  		case @_status
  			when PENDING
! 				s += ", added #{@_date_added.strftime('%d/%m %H:%M:%S')}"
  			when PROCESSING
! 				s += ", started #{@_date_started.strftime('%d/%m %H:%M:%S')}"
  			else
  				s += ", #{@_status.downcase}"
! 				s += " since #{@_date_finished.strftime('%d/%m %H:%M:%S')}" if @_date_finished
  		end
  		if @_period != 0
--- 124,155 ----
  
  	def group
! 		Group.getgroup(@_groupindex)._shortname
  	end
  	
  	def to_s
  		s = "#{yellow '<'}#{blue @_queueindex}#{yellow '>'} [#{red group}] #{yellow @_value}, prio : #{@_priority}, dest : #{green @_subdir}, status : #{@_status}"
+ 		if (@_status == FAILED || @_status == PROCESSING)
+ 			a = Db.dbh.select_all("select `status` from `queue_files` where `queueindex`='#{@_queueindex}'")
+ 			s += ' ' + yellow('[') + a.map { |x|
+ 				case x[0]
+ 				when 'FINISHED'
+ 					green '#'
+ 				when 'PROCESSING'
+ 					white '#'
+ 				when 'ERROR_DECODING'
+ 					red '#'
+ 				else
+ 					'_'
+ 				end
+ 			}.join + yellow(']')
+ 		end
  		case @_status
  			when PENDING
! 				s += ", added #{pretty_date @_date_added}"
  			when PROCESSING
! 				s += ", started #{pretty_date @_date_started}"
  			else
  				s += ", #{@_status.downcase}"
! 				s += " since #{pretty_date @_date_finished}" if @_date_finished
  		end
  		if @_period != 0

Index: utils.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/utils.rb,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** utils.rb	3 Sep 2004 09:12:03 -0000	1.17
--- utils.rb	9 Sep 2004 12:11:10 -0000	1.18
***************
*** 89,92 ****
--- 89,93 ----
  
  	def Utils.pretty_date(date)
+ 		return date.strftime('%d/%m %H:%M') if (date.class == Time)
  		date.to_s.sub(/^....-(..)-(..) (..):(..):../, '\2/\1 \3:\4')
  	end

Index: downloader.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloader.rb,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** downloader.rb	3 Sep 2004 10:42:59 -0000	1.36
--- downloader.rb	9 Sep 2004 12:11:10 -0000	1.37
***************
*** 109,112 ****
--- 109,113 ----
  			@finish_status = 'FINISHED' 
  			log "Download finished for file #{@curfile._filename}, queue #{@value}"
+ 			@curfile.sync_to_db
  			@curfile = nil
  
***************
*** 117,120 ****
--- 118,122 ----
  			# we do not know the file name
  #			log "Download failed for #{@curfile._filename}, queue #{@value}"
+ 			@curfile.sync_to_db
  			@curfile = nil
  
***************
*** 129,132 ****
--- 131,135 ----
  			@finish_status = 'FAILED'
  			log "Download finished, decoding failed for #{@curfile._filename}, queue #{@value}"
+ 			@curfile.sync_to_db
  			@curfile = nil