ngetsuite-cvs Mailing List for ngetsuite

Brought to you by: blackmor, jjie, ysc

ngetsuite-cvs — cvs commits

You can subscribe to this list here.

2003	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec (7)
2004	_Jan (4)	_Feb (56)	_Mar (10)	_Apr (1)	_May (6)	_Jun (5)	_Jul (2)	_Aug	_Sep (22)	_Oct (7)	_Nov (1)	_Dec
2005	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec (4)
2006	_Jan	_Feb	_Mar	_Apr (1)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

1 2 3 .. 6 > >> (Page 1 of 6)

[Ngetsuite-cvs] ngetsuite2/ngetsuite downloader.rb,1.1.1.1,1.2 group.rb,1.6,1.7

From: Yoann G. <jj...@us...> - 2006-04-24 16:33:14

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

Modified Files:
	downloader.rb group.rb 
Log Message:
added parrar-sh support, get rid of zombies on popen (-v), more robust on problematic group


Index: downloader.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite2/ngetsuite/downloader.rb,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** downloader.rb	11 Oct 2004 22:26:24 -0000	1.1.1.1
--- downloader.rb	24 Apr 2006 16:33:03 -0000	1.2
***************
*** 247,252 ****
  
  		
! 		subdirexpr = "-p '.#{File::Separator}#{@subdir}'"
! 		subdirexpr += " -P '.#{File::Separator}#{@subdir}#{File::Separator}#{$config['queue_tempsubdir']}'" if ($config['queue_tempsubdir'])
  		
  		@io = IO.popen("#{"nice -n#{$config['nice_nget_download']} -- " if $config['nice_nget_download'] != 0} #{$config['nget']} -q -dfI --makedirs yes #{subdirexpr} -G #{@group._fullname} #{downloadexpr} 2>&1")
--- 247,252 ----
  
  		
! 		subdirexpr = "-p '.#{File.join('', @subdir)}'"
! 		subdirexpr += " -P '.#{File.join('', @subdir, $config['queue_tempsubdir'])}'" if ($config['queue_tempsubdir'])
  		
  		@io = IO.popen("#{"nice -n#{$config['nice_nget_download']} -- " if $config['nice_nget_download'] != 0} #{$config['nget']} -q -dfI --makedirs yes #{subdirexpr} -G #{@group._fullname} #{downloadexpr} 2>&1")
***************
*** 275,278 ****
--- 275,300 ----
  				parent.stop
  				raise
+ 			else
+ 				Dir.chdir @subdir
+ 				done = []
+ 				Dir['*.par2'].each { |f|
+ 					next if f !~ /#@value/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 !~ /#@value/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}'"
+ 				}
+ 				puts 'finished'
  			end
  		}

Index: group.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite2/ngetsuite/group.rb,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** group.rb	3 Dec 2005 13:24:04 -0000	1.6
--- group.rb	24 Apr 2006 16:33:03 -0000	1.7
***************
*** 141,144 ****
--- 141,145 ----
  					name = (Regexp.escape name).gsub("'", %q{'"'"'})
  					cmd = "nget -G #{@_fullname} -qq -r '#{name}'"
+ #					sleep rand(10)
  					system cmd
  					exit!
***************
*** 199,203 ****
  	def update
  		updatengetcache unless $config['extern_headers_update'].split(',').include?(@_shortname)
! 		parsengetcache
  		recognizereleases
  		fetchnfos unless $config['extern_nfos_fetch'].split(',').include?(@_shortname)
--- 200,204 ----
  	def update
  		updatengetcache unless $config['extern_headers_update'].split(',').include?(@_shortname)
! 		parsengetcache rescue return
  		recognizereleases
  		fetchnfos unless $config['extern_nfos_fetch'].split(',').include?(@_shortname)
***************
*** 226,230 ****
  		begin
  			line = ''
! 			IO.popen(cmdline).each_byte { |char|
  				char = char.chr
  				if char != "\r" and char != "\n"
--- 227,232 ----
  		begin
  			line = ''
! 			io = IO.popen(cmdline)
! 			io.each_byte { |char|
  				char = char.chr
  				if char != "\r" and char != "\n"
***************
*** 243,246 ****
--- 245,250 ----
  		rescue Object=>e
  			print "\nInterrupted: #{e.inspect}"
+ 		ensure
+ 			io.close
  		end

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

From: Yoann G. <jj...@us...> - 2005-12-03 13:24:12

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

[Ngetsuite-cvs] ngetsuite2 parrar-sh,NONE,1.1 ngetsuite.rb,1.2,1.3

From: Yoann G. <jj...@us...> - 2005-12-03 13:24:12

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

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


--- NEW FILE: parrar-sh ---
#!/bin/sh
for base in "$@"
do
echo "working on $base"

# copy the bigger file as canonical name
for i in "$base".part*.rar.*.* "$base".r??.*.* "$base".0??.*.* "$base".vol*.par2.*.* "$base".vol*.PAR2.*.*
do
canon="${i%.*.*}"
[ -f "$i" ] && ( [ -f "$canon" ] || cp "$i" "$canon" )
[ -f "$i" ] && [ $(du -b "$i" |cut -f1) -gt $(du -b "$canon" |cut -f1) ] && cp "$i" "$canon"
done

# find the par2 file and run it
[ -f "$base.vol000+01.par2" ] && parfile="$base.vol000+01.par2"
[ -f "$base.par2" ] && parfile="$base.par2"
[ -f "$base.PAR2" ] && parfile="$base.PAR2"
if [ -z "$parfile" ]
then
	echo 'no par2 file detected..'
else
	par2 r -q "$parfile" &&
	# if successful, delete all non-good-data files
	rm -f "$base.PAR2" "$base.par2" "$base".vol*.par2* "$base".vol*.PAR2* "$base".r??.* "$base".part*.rar.* "$base".sfv "$base".nzb "$base"*.1
fi

# find the first archive file and unrar it, delete archives on success
[ -f "$base.001" ] && rarfile="$base.001"
[ -f "$base.rar" ] && rarfile="$base.rar"
[ -f "$base.part1.rar" ] && rarfile="$base.part1.rar"
[ -f "$base.part01.rar" ] && rarfile="$base.part01.rar"
[ -f "$base.part001.rar" ] && rarfile="$base.part001.rar"
[ -z "$rarfile" ] && { echo 'no rar file detected.. aborting' ; continue ; }
rar x "$rarfile" &&
rm -f "$base".r?? "$base".part*.rar &&
[ "$rarfile" == "$base.001" ] && rm -f "$base".0?? "$base".0??.*.*
done
echo ' finished!'

Index: ngetsuite.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite2/ngetsuite.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ngetsuite.rb	2 Dec 2005 02:07:43 -0000	1.2
--- ngetsuite.rb	3 Dec 2005 13:24:04 -0000	1.3
***************
*** 46,50 ****
  	[ '--show-next-queueitem', '-b', GetoptLong::NO_ARGUMENT, 'Shows the next available queue for the manager'],
  	[ '--start-manager', '-m', GetoptLong::NO_ARGUMENT, 'Launches the download manager'],
! 	[ '--batch', '-B', GetoptLong::REQUIRED_ARGUMENT, 'Starts to download a batch here']
  ]
  
--- 46,50 ----
  	[ '--show-next-queueitem', '-b', GetoptLong::NO_ARGUMENT, 'Shows the next available queue for the manager'],
  	[ '--start-manager', '-m', GetoptLong::NO_ARGUMENT, 'Launches the download manager'],
! 	[ '--batch', '-B', GetoptLong::REQUIRED_ARGUMENT, 'groupid,nrthread,regex', 'Starts to download a batch here']
  ]

[Ngetsuite-cvs] ngetsuite2 ngetsuite.rb,1.1.1.1,1.2

From: Yoann G. <jj...@us...> - 2005-12-02 02:07:52

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

Modified Files:
	ngetsuite.rb 
Log Message:
added --batch group,nr,regex which tries to download regex with a thread pool of nr threads - regex is matched against each subject in the group, and the matches are uniq!ed and downloaded to the current directory


Index: ngetsuite.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite2/ngetsuite.rb,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ngetsuite.rb	11 Oct 2004 22:26:20 -0000	1.1.1.1
--- ngetsuite.rb	2 Dec 2005 02:07:43 -0000	1.2
***************
*** 1,4 ****
  #!/usr/bin/env ruby
! 
  wd = __FILE__.sub(/^(.*)\/[^\/]*$/, '\1')
  Dir.chdir(wd) if FileTest.directory? wd
--- 1,4 ----
  #!/usr/bin/env ruby
! $startdir = Dir.getwd
  wd = __FILE__.sub(/^(.*)\/[^\/]*$/, '\1')
  Dir.chdir(wd) if FileTest.directory? wd
***************
*** 45,49 ****
  	[ '--set-poll-interval', '-o', GetoptLong::REQUIRED_ARGUMENT, 'intervall', 'Sets the polling intervall of the download manager'],
  	[ '--show-next-queueitem', '-b', GetoptLong::NO_ARGUMENT, 'Shows the next available queue for the manager'],
! 	[ '--start-manager', '-m', GetoptLong::NO_ARGUMENT, 'Launches the download manager']
  ]
  
--- 45,50 ----
  	[ '--set-poll-interval', '-o', GetoptLong::REQUIRED_ARGUMENT, 'intervall', 'Sets the polling intervall of the download manager'],
  	[ '--show-next-queueitem', '-b', GetoptLong::NO_ARGUMENT, 'Shows the next available queue for the manager'],
! 	[ '--start-manager', '-m', GetoptLong::NO_ARGUMENT, 'Launches the download manager'],
! 	[ '--batch', '-B', GetoptLong::REQUIRED_ARGUMENT, 'Starts to download a batch here']
  ]

[Ngetsuite-cvs] ngetsuite2/ngetsuite clihandler.rb,1.2,1.3 group.rb,1.4,1.5

From: Yoann G. <jj...@us...> - 2005-12-02 02:07:51

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

Modified Files:
	clihandler.rb group.rb 
Log Message:
added --batch group,nr,regex which tries to download regex with a thread pool of nr threads - regex is matched against each subject in the group, and the matches are uniq!ed and downloaded to the current directory


Index: group.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite2/ngetsuite/group.rb,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** group.rb	19 Nov 2004 11:38:28 -0000	1.4
--- group.rb	2 Dec 2005 02:07:43 -0000	1.5
***************
*** 121,124 ****
--- 121,152 ----
  		return @_directory
  	end
+ 
+ 	def batch(nr, filter)
+ 		sth = Db.dbh.execute('select subject from articles where groupindex=? and subject RLIKE ?', @_groupindex, filter)
+ 		list = []
+ 		sth.fetch do |row|
+ 			row[0] =~ /#{filter}/i
+ 			list << $~[0]
+ 		end
+ 		run = []
+ 		list.uniq!
+ 		while not list.empty?
+ 			if run.length < nr
+ 				name = list.shift
+ 				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
  	
  	def search_releases(filter)

Index: clihandler.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite2/ngetsuite/clihandler.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** clihandler.rb	20 Oct 2004 14:46:38 -0000	1.2
--- clihandler.rb	2 Dec 2005 02:07:43 -0000	1.3
***************
*** 72,75 ****
--- 72,79 ----
  	end
  
+ 	def batch(groupindex, nr, filter)
+ 		Group.getgroup(groupindex).batch(nr.to_i, filter)
+ 	end
+ 
  	def add_group(groupname, shortname = nil, dir = nil, desc = nil)
  		g = Group.new(nil, false, groupname, shortname, dir, true, desc)

[Ngetsuite-cvs] ngetsuite2/ngetsuite group.rb,1.3,1.4

From: Yoann G. <jj...@us...> - 2004-11-19 11:38:37

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

Modified Files:
	group.rb 
Log Message:
nfo dl optimisation


Index: group.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite2/ngetsuite/group.rb,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** group.rb	20 Oct 2004 14:46:38 -0000	1.3
--- group.rb	19 Nov 2004 11:38:28 -0000	1.4
***************
*** 254,260 ****
  		begin
  		# fetches the nfos, w/o decoding
! 		`#{"nice -n#{$config['nice_nget_update']} -- " if $config['nice_nget_update'] != 0 }#{$config['nget']} --path #{tempdir} -G #{@_fullname} -K -L 150 -R 'subject \\.nfo|\\.txt == subject read\\.nfo != subject read\\.nfo.*\\.nfo == || &&' 2>&1`
  		# but mark them for nget as if we didn't download them
! 		`#{"nice -n#{$config['nice_nget_update']} -- " if $config['nice_nget_update'] != 0 }#{$config['nget']} --path #{tempdir} -qq -G #{@_fullname} -U -r '\\.nfo|\\.txt' 2>&1`
  		debug "Fetchnfos: #{Dir['ngettemp-*'].length} files downloaded in #{Utils.cooltime(Time.now-t)}"
  
--- 254,260 ----
  		begin
  		# fetches the nfos, w/o decoding
! 		`#{"nice -n#{$config['nice_nget_update']} -- " if $config['nice_nget_update'] != 0 }#{$config['nget']} --path #{tempdir} -G #{@_fullname} -K -D -R 'subject \\.nfo|\\.txt == bytes 100000 <= &&' 2>&1`
  		# but mark them for nget as if we didn't download them
! 		`#{"nice -n#{$config['nice_nget_update']} -- " if $config['nice_nget_update'] != 0 }#{$config['nget']} --path #{tempdir} -qq -G #{@_fullname} -U -D -R 'subject \\.nfo|\\.txt == bytes 100000 <= &&' 2>&1`
  		debug "Fetchnfos: #{Dir['ngettemp-*'].length} files downloaded in #{Utils.cooltime(Time.now-t)}"

[Ngetsuite-cvs] ngetsuite2/web index.html,1.1.1.1,NONE

From: Yoann G. <jj...@us...> - 2004-10-30 12:44:30

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

Removed Files:
	index.html 
Log Message:
remove useless index.html


--- index.html DELETED ---

[Ngetsuite-cvs] ngetsuite2/ngetsuite clihandler.rb,1.1.1.1,1.2 group.rb,1.2,1.3 nfo.rb,1.1.1.1,1.2

From: Yoann G. <jj...@us...> - 2004-10-20 14:46:49

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

Modified Files:
	clihandler.rb group.rb nfo.rb 
Log Message:
better nfo handling


Index: nfo.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite2/ngetsuite/nfo.rb,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nfo.rb	11 Oct 2004 22:26:25 -0000	1.1.1.1
--- nfo.rb	20 Oct 2004 14:46:38 -0000	1.2
***************
*** 12,16 ****
  	def Nfo.searchbysubject(groupid, filter)
  		groupindex = Group.getindex(groupid)
! 		req = "select n.artindex, n.groupindex, a.subject from `articles` a right join `nfos` n using (`artindex`) "
  		req += "where a.groupindex='#{groupindex}' and a.subject RLIKE '#{filter}' "
  		req += "order by `subject`"
--- 12,16 ----
  	def Nfo.searchbysubject(groupid, filter)
  		groupindex = Group.getindex(groupid)
! 		req = "select n.artindex, n.groupindex, a.subject, n.text from `articles` a right join `nfos` n using (`artindex`) "
  		req += "where a.groupindex='#{groupindex}' and a.subject RLIKE '#{filter}' "
  		req += "order by `subject`"
***************
*** 18,33 ****
  
  		i = 0
  		sth.fetch do |row|
  			puts "NFO id: #{row[0]}"
  			puts "Article: #{row[2]}"
  			i += 1
  		end
  		sth.finish
! 		return "No nfos found." if i == 0
  	end
  
  	def Nfo.search(groupid, filter)
  		groupindex = Group.getindex(groupid)
! 		req = "select n.artindex, n.groupindex, a.subject from `articles` a "
  		req += "right join `nfos` n using (`artindex`) "
  		req += "where a.groupindex='#{groupindex}' and n.text RLIKE '#{filter}' "
--- 18,36 ----
  
  		i = 0
+ 		nfo_text = nil
  		sth.fetch do |row|
  			puts "NFO id: #{row[0]}"
  			puts "Article: #{row[2]}"
+ 			nfo_text = row[3] if i == 0
  			i += 1
  		end
  		sth.finish
! 		puts nfo_text if i == 1
! 		puts "No nfos found." if i == 0
  	end
  
  	def Nfo.search(groupid, filter)
  		groupindex = Group.getindex(groupid)
! 		req = "select n.artindex, n.groupindex, a.subject n.text from `articles` a "
  		req += "right join `nfos` n using (`artindex`) "
  		req += "where a.groupindex='#{groupindex}' and n.text RLIKE '#{filter}' "
***************
*** 36,47 ****
  
  		i = 0
  		sth.fetch do |row|
  			puts "NFO id: #{row[0]}"
  			puts "Article: #{row[2]}"
  			print "\n"
  			i += 1
  		end
  		sth.finish
! 		return "No nfos found." if i == 0
  	end
  
--- 39,53 ----
  
  		i = 0
+ 		nfo_text = nil
  		sth.fetch do |row|
  			puts "NFO id: #{row[0]}"
  			puts "Article: #{row[2]}"
  			print "\n"
+ 			nfo_text = row[3] if i == 1
  			i += 1
  		end
  		sth.finish
! 		puts nfo_text if i == 1
! 		puts "No nfos found." if i == 0
  	end
  

Index: group.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite2/ngetsuite/group.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** group.rb	12 Oct 2004 17:01:17 -0000	1.2
--- group.rb	20 Oct 2004 14:46:38 -0000	1.3
***************
*** 254,258 ****
  		begin
  		# fetches the nfos, w/o decoding
! 		`#{"nice -n#{$config['nice_nget_update']} -- " if $config['nice_nget_update'] != 0 }#{$config['nget']} --path #{tempdir} -G #{@_fullname} -K -L 150 -r '\\.nfo|\\.txt' 2>&1`
  		# but mark them for nget as if we didn't download them
  		`#{"nice -n#{$config['nice_nget_update']} -- " if $config['nice_nget_update'] != 0 }#{$config['nget']} --path #{tempdir} -qq -G #{@_fullname} -U -r '\\.nfo|\\.txt' 2>&1`
--- 254,258 ----
  		begin
  		# fetches the nfos, w/o decoding
! 		`#{"nice -n#{$config['nice_nget_update']} -- " if $config['nice_nget_update'] != 0 }#{$config['nget']} --path #{tempdir} -G #{@_fullname} -K -L 150 -R 'subject \\.nfo|\\.txt == subject read\\.nfo != subject read\\.nfo.*\\.nfo == || &&' 2>&1`
  		# but mark them for nget as if we didn't download them
  		`#{"nice -n#{$config['nice_nget_update']} -- " if $config['nice_nget_update'] != 0 }#{$config['nget']} --path #{tempdir} -qq -G #{@_fullname} -U -r '\\.nfo|\\.txt' 2>&1`
***************
*** 268,272 ****
  					text = `#{$config['yydecode']} #{file} -o - 2>/dev/null `.chomp
  					artindex = Db.dbh.select_one("select `artindex` from `articles` where `mid`='#{mid}'")
! 					if text and text.length < 15000 and text.length > 100 and artindex
  						sth.execute(artindex[0], text)
  						nb_nfos += 1
--- 268,272 ----
  					text = `#{$config['yydecode']} #{file} -o - 2>/dev/null `.chomp
  					artindex = Db.dbh.select_one("select `artindex` from `articles` where `mid`='#{mid}'")
! 					if text and text.length < 25000 and text.length > 100 and artindex
  						sth.execute(artindex[0], text)
  						nb_nfos += 1

Index: clihandler.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite2/ngetsuite/clihandler.rb,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** clihandler.rb	11 Oct 2004 22:26:26 -0000	1.1.1.1
--- clihandler.rb	20 Oct 2004 14:46:38 -0000	1.2
***************
*** 85,89 ****
  
  	def test(gid)
! 		Group.getgroup(gid).recognizereleases
  	end
  	
--- 85,89 ----
  
  	def test(gid)
! 		Group.getgroup(gid).fetchnfos
  	end
  	
***************
*** 110,118 ****
  
  	def search_nfo_by_subject(groupid, regex)
! 		puts Nfo.searchbysubject(groupid, regex)
  	end
  
  	def search_nfo(groupid, regex)
! 		puts Nfo.search(groupid, regex)
  	end
  
--- 110,118 ----
  
  	def search_nfo_by_subject(groupid, regex)
! 		Nfo.searchbysubject(groupid, regex)
  	end
  
  	def search_nfo(groupid, regex)
! 		Nfo.search(groupid, regex)
  	end

[Ngetsuite-cvs] ngetsuite2/ngetsuite config.rb,1.1.1.1,1.2

From: Yoann G. <jj...@us...> - 2004-10-15 18:23:12

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

Modified Files:
	config.rb 
Log Message:
better default value for web logs (none)
handling of '/', and displays a message for unimplemented uris


Index: config.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite2/ngetsuite/config.rb,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** config.rb	11 Oct 2004 22:26:21 -0000	1.1.1.1
--- config.rb	15 Oct 2004 18:22:15 -0000	1.2
***************
*** 34,39 ****
  httpd_port = 2000
  httpd_autostart = true
! httpd_error_log = '/home/nget/weberrors.log'
! httpd_access_log = '/home/nget/webaccess.log'
  queue_tempsubdir = 'temp'
  ".each("\n") { |l| self[$1] = eval($2) if l=~ /^(\S+)\s*=\s*(.*)$/ }
--- 34,39 ----
  httpd_port = 2000
  httpd_autostart = true
! httpd_error_log = false
! httpd_access_log = false
  queue_tempsubdir = 'temp'
  ".each("\n") { |l| self[$1] = eval($2) if l=~ /^(\S+)\s*=\s*(.*)$/ }

[Ngetsuite-cvs] ngetsuite2 daemon.rb,1.1.1.1,1.2

From: Yoann G. <jj...@us...> - 2004-10-15 18:23:11

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

Modified Files:
	daemon.rb 
Log Message:
better default value for web logs (none)
handling of '/', and displays a message for unimplemented uris


Index: daemon.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite2/daemon.rb,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** daemon.rb	11 Oct 2004 22:26:19 -0000	1.1.1.1
--- daemon.rb	15 Oct 2004 18:22:15 -0000	1.2
***************
*** 104,107 ****
--- 104,117 ----
  	s.mount("/ModifyQueues", ModifyQueuesServlet)
  	s.mount("/StopQueue", StopQueueServlet)
+ 	s.mount_proc('/') { |req, resp|
+ 		if req.unparsed_uri == '/'
+ 			resp.status='301'
+ 			resp.header['Location'] = '/Index'
+ 			resp.body = '<html><body>go to <a href="/Index">/Index</a></body></html>'
+ 		else
+ 			resp.status='404'
+ 			resp.body = "<html><body>#{req.unparsed_uri} is not yet implemented, sorry for the inconvenience</body></html>"
+ 		end
+ 	}
  
  	httpThread = Thread.new {

[Ngetsuite-cvs] ngetsuite2/ngetsuite group.rb,1.1.1.1,1.2

From: Yoann G. <jj...@us...> - 2004-10-12 17:01:30

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

Modified Files:
	group.rb 
Log Message:
fix to let added groups be active by default


Index: group.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite2/ngetsuite/group.rb,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** group.rb	11 Oct 2004 22:26:24 -0000	1.1.1.1
--- group.rb	12 Oct 2004 17:01:17 -0000	1.2
***************
*** 98,107 ****
  	end
  
! 	def initialize(index=nil, fetch_from_db=false, fullname=nil, shortname=nil, directory=nil, status='ACTIVE', description=nil)
  		@_groupindex = index
  		@_fullname = fullname
  		@_shortname = shortname
  		@_directory = directory
! 		@_status = status
  		@_description = description
  		@_date_added = Time.now
--- 98,107 ----
  	end
  
! 	def initialize(index=nil, fetch_from_db=false, fullname=nil, shortname=nil, directory=nil, actif=true, description=nil)
  		@_groupindex = index
  		@_fullname = fullname
  		@_shortname = shortname
  		@_directory = directory
! 		@_status = 'ACTIVE' if actif
  		@_description = description
  		@_date_added = Time.now

[Ngetsuite-cvs] ngetsuite/ngetsuite core.rb,1.44,1.45 group.rb,1.51,1.52

From: Yoann G. <jj...@us...> - 2004-10-05 16:15:55

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

Modified Files:
	core.rb group.rb 
Log Message:
batched sql inserts, small fix in resetdb


Index: group.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/group.rb,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** group.rb	27 Sep 2004 13:04:05 -0000	1.51
--- group.rb	5 Oct 2004 16:14:34 -0000	1.52
***************
*** 204,207 ****
--- 204,209 ----
  
  		sth = Db.dbh.prepare "insert into articles (`groupindex`, `artindex`, `mid`, `nbparts`, `size`, `subject`, `from`, `time`) values ('#{@_groupindex}', ?, ?, ?, ?, ?, ?, FROM_UNIXTIME(?))"
+ 		bli = Array.new
+ 		
  		lasthigh = @_cache_high
  		filecallback = Proc.new { |f|
***************
*** 220,224 ****
  				partcnt += 1
  				if partcnt >= f.req
! 					sth.execute(artidx, artmid, f.req, size, f.subject, f.author, artdate)
  				end
  			}
--- 222,234 ----
  				partcnt += 1
  				if partcnt >= f.req
! 					bli << [artidx, artmid, f.req, size, f.subject, f.author, artdate]
! 					if bli.size > 100
! 						db=Db.dbh
! 						db.do 'insert into articles (`groupindex`, `artindex`, `mid`, `nbparts`, `size`, `subject`, `from`, `time`) values ' +
! 						bli.map{ |e| "('#{@_groupindex}',#{db.quote e[0]},#{db.quote e[1]},#{db.quote e[2]},#{db.quote e[3]},#{db.quote e[4]},#{db.quote e[5]},FROM_UNIXTIME(#{db.quote e[6]}))"}.join(',')
! 						bli = Array.new
! 					end
! #						('#{@_groupindex}', ?, ?, ?, ?, ?, ?, FROM_UNIXTIME(?))"
! #					sth.execute(artidx, artmid, f.req, size, f.subject, f.author, artdate)
  				end
  			}
***************
*** 227,230 ****
--- 237,245 ----
  		}
  		cache.parse(filecallback)
+ 		unless bli.empty?
+ 			db=Db.dbh
+ 			db.do 'insert into articles (`groupindex`, `artindex`, `mid`, `nbparts`, `size`, `subject`, `from`, `time`) values ' +
+ 				bli.map{ |e| "('#{@_groupindex}',#{db.quote e[0]},#{db.quote e[1]},#{db.quote e[2]},#{db.quote e[3]},#{db.quote e[4]},#{db.quote e[5]},FROM_UNIXTIME(#{db.quote e[6]}))"}.join(',')
+ 		end
  		@_cache_low,@_cache_high = cache.servers[0].low, cache.servers[0].high
  		nb_rows = Db.dbh.select_one("select count(*) from `articles` where `groupindex`='#{@_groupindex}'")[0]

Index: core.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/core.rb,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** core.rb	27 Sep 2004 14:59:40 -0000	1.44
--- core.rb	5 Oct 2004 16:14:34 -0000	1.45
***************
*** 85,89 ****
  
  	def test(gid)
! 		Group.getgroup(gid).recognizereleases
  	end
  	
--- 85,89 ----
  
  	def test(gid)
! 		Group.getgroup(gid).parsengetcache
  	end

[Ngetsuite-cvs] ngetsuite ngetcache.sql,1.14,1.15 resetdb.rb,1.7,1.8

From: Yoann G. <jj...@us...> - 2004-10-05 16:15:55

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

Modified Files:
	ngetcache.sql resetdb.rb 
Log Message:
batched sql inserts, small fix in resetdb


Index: ngetcache.sql
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetcache.sql,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ngetcache.sql	29 Sep 2004 16:07:43 -0000	1.14
--- ngetcache.sql	5 Oct 2004 16:14:34 -0000	1.15
***************
*** 135,139 ****
    `queueindex` integer,
    `type` set('ERROR','WARNING','NOTICE','PARINFO','START','FINISH') NOT NULL default 'NOTICE',
!   `message` varchar(255) NOT NULL
    PRIMARY KEY  (`id`)
  ) TYPE=MyISAM;
--- 135,139 ----
    `queueindex` integer,
    `type` set('ERROR','WARNING','NOTICE','PARINFO','START','FINISH') NOT NULL default 'NOTICE',
!   `message` varchar(255) NOT NULL,
    PRIMARY KEY  (`id`)
  ) TYPE=MyISAM;

Index: resetdb.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/resetdb.rb,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** resetdb.rb	29 Sep 2004 12:17:58 -0000	1.7
--- resetdb.rb	5 Oct 2004 16:14:34 -0000	1.8
***************
*** 6,10 ****
  require 'ngetsuite/config'
  $config = Config.new(conffile)
- require 'ngetsuite/core'
  require 'ngetsuite/db'
  
--- 6,9 ----

[Ngetsuite-cvs] ngetsuite/ngetsuite downloader.rb,1.43,1.44

From: Yoann G. <jj...@us...> - 2004-09-29 20:56:54

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

Modified Files:
	downloader.rb 
Log Message:
queue_tempdir cleanup


Index: downloader.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloader.rb,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** downloader.rb	29 Sep 2004 16:32:12 -0000	1.43
--- downloader.rb	29 Sep 2004 20:56:44 -0000	1.44
***************
*** 260,263 ****
--- 260,267 ----
  		end
  		@t.exit
+ 		if $config['queue_tempsubdir']
+ 			sd = ".#{File::Separator}#{@subdir}#{File::Separator}#{$config['queue_tempsubdir']}"
+ 			Dir.unlink(sd) if (File.directory?(sd) and (Dir.entries(sd) - ['.', '..']).empty?)
+ 		end
  		time = Time.now.to_s
  		Db.dbh.do 'lock tables queue write'

[Ngetsuite-cvs] ngetsuite/ngetsuite config.rb,1.6,1.7 downloader.rb,1.42,1.43

From: Yoann G. <jj...@us...> - 2004-09-29 16:32:22

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

Modified Files:
	config.rb downloader.rb 
Log Message:
added config option for the temporary subdir for nget


Index: downloader.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloader.rb,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** downloader.rb	29 Sep 2004 12:18:00 -0000	1.42
--- downloader.rb	29 Sep 2004 16:32:12 -0000	1.43
***************
*** 154,157 ****
--- 154,161 ----
  			
  		when /close\(fast\)$/
+ 		when /\(temp\)path:(.*)/
+ 			ldebug "Downloading in #{green $1}"
+ 		when /temppath:(.*)/
+ 			ldebug "Temp files in #{green $1}"
  		when /^error, will try .* again \(server says byebye: (.*)\)/
  			ldebug red("Disconnected (#{$1})") + '. Reconnecting...', false
***************
*** 193,197 ****
  		end
  
! 		subdirexpr = "-p ." + File::Separator + "'#{@subdir}' -P ." + File::Separator + "'#{@subdir}'" + File::Separator + "temp"
  		
  		@io = IO.popen("#{"nice -n#{$config['nice_nget_download']} -- " if $config['nice_nget_download'] != 0} #{$config['nget']} -q -dfI --makedirs yes #{subdirexpr} -G #{@group._fullname} #{downloadexpr} 2>&1")
--- 197,203 ----
  		end
  
! 		
! 		subdirexpr = "-p '.#{File::Separator}#{@subdir}'"
! 		subdirexpr += " -P '.#{File::Separator}#{@subdir}#{File::Separator}#{$config['queue_tempsubdir']}'" if ($config['queue_tempsubdir'])
  		
  		@io = IO.popen("#{"nice -n#{$config['nice_nget_download']} -- " if $config['nice_nget_download'] != 0} #{$config['nget']} -q -dfI --makedirs yes #{subdirexpr} -G #{@group._fullname} #{downloadexpr} 2>&1")

Index: config.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/config.rb,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config.rb	6 Jul 2004 10:41:21 -0000	1.6
--- config.rb	29 Sep 2004 16:32:12 -0000	1.7
***************
*** 34,37 ****
--- 34,40 ----
  httpd_port = 2000
  httpd_autostart = true
+ httpd_error_log = '/home/nget/weberrors.log'
+ httpd_access_log = '/home/nget/webaccess.log'
+ queue_tempsubdir = 'temp'
  ".each("\n") { |l| self[$1] = eval($2) if l=~ /^(\S+)\s*=\s*(.*)$/ }
        IO.foreach(@file) do |line|

[Ngetsuite-cvs] ngetsuite sampleconfig,1.11,1.12

From: Yoann G. <jj...@us...> - 2004-09-29 16:32:22

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

Modified Files:
	sampleconfig 
Log Message:
added config option for the temporary subdir for nget


Index: sampleconfig
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/sampleconfig,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** sampleconfig	27 Sep 2004 14:59:40 -0000	1.11
--- sampleconfig	29 Sep 2004 16:32:08 -0000	1.12
***************
*** 23,31 ****
  #
  # where nget stores its cache
! cachedir = '/home/nget/.nget4'
  # where to download unless otherwise specified
  basedir = '/home/nget/testdl'
  # ngetsuite will create subdirectories here
  tempdir = '/tmp'
  
  
--- 23,34 ----
  #
  # where nget stores its cache
! cachedir = '/home/nget/.nget5'
  # where to download unless otherwise specified
  basedir = '/home/nget/testdl'
  # ngetsuite will create subdirectories here
  tempdir = '/tmp'
+ # nget will put temporary files in this subdir for each queue
+ # false to disable
+ queue_tempsubdir = 'temp'

[Ngetsuite-cvs] ngetsuite/web group.rhtml,1.9,1.10 grouphome.rhtml,1.2,1.3 index.rhtml,1.6,1.7 ngetsuite.css,1.12,1.13 queueview.rhtml,1.5,1.6 release.rhtml,1.5,1.6 search.rhtml,1.2,1.3 top.rhtml,1.5,1.6

From: YS <ys...@us...> - 2004-09-29 16:08:09

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

Modified Files:
	group.rhtml grouphome.rhtml index.rhtml ngetsuite.css 
	queueview.rhtml release.rhtml search.rhtml top.rhtml 
Log Message:
- subdir fix
- sexy headers in web interface's pages


Index: grouphome.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/grouphome.rhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** grouphome.rhtml	27 Sep 2004 18:01:27 -0000	1.2
--- grouphome.rhtml	29 Sep 2004 16:07:44 -0000	1.3
***************
*** 37,41 ****
  <body>
  
! <div class="sectiontitle"><%= web.group._fullname %></div>
  <p>Added <b><%= web.group._date_added %></b></p>
  <p>Last updated <b><%= web.group._date_updated %></b></p>
--- 37,41 ----
  <body>
  
! <div class="pagetitle"><%= web.group._fullname %></div>
  <p>Added <b><%= web.group._date_added %></b></p>
  <p>Last updated <b><%= web.group._date_updated %></b></p>

Index: release.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/release.rhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** release.rhtml	27 Sep 2004 14:59:41 -0000	1.5
--- release.rhtml	29 Sep 2004 16:07:44 -0000	1.6
***************
*** 24,28 ****
  			artq = "select * from `articles` a left join `nfos` n using (`artindex`) "
  			artq += "where a.groupindex='#{groupindex}' and `rlsartindex`='#{artindex}' "
! 			artq += "and DATE_FORMAT(`time`, '%Y-%m-%d')='#{date}' " if date != "any"
  			artq += "order by `subject`"
  		else
--- 24,28 ----
  			artq = "select * from `articles` a left join `nfos` n using (`artindex`) "
  			artq += "where a.groupindex='#{groupindex}' and `rlsartindex`='#{artindex}' "
! #			artq += "and DATE_FORMAT(`time`, '%Y-%m-%d')='#{date}' " if date != "any"
  			artq += "order by `subject`"
  		else
***************
*** 67,83 ****
  %>
  <a name="top"></a>
- <h1>Release details</h1>
- 
- <ul>
- 	<% if !rls.nfos.empty? %>
- 		<li><a href="#nfos"><%= rls.nfos.size %> viewable text file(s)</a></li>
- 	<% end %>
- 	<li><a href="#artlist">View articles list</a></li>
- 	<li><a href="#actions">Search/queue</a></li>
- </ul>
  
  
! <a name="nfos"></a>
! <% rls.nfos.each { |nfo| %>
  	<div class="group">Contents of: <i><%= nfo[1] %></i></div>
  	<pre>
--- 67,91 ----
  %>
  <a name="top"></a>
  
+ <div class="pagetitle">Release details:&nbsp;
+ <%
+ if !rls.nfos.empty?
+ 	1.upto(rls.nfos.size) { |i|
+ %>
+ 	<a class="titlelink" href="#nfo<%=i%>">NFO<%=i%></a> |
+ <%
+ 	}
+ end
+ %>
+ 	<a class="titlelink" href="#artlist">articles</a><!-- |
+ 	<a class="titlelink" href="#actions">actions</a> -->
+ </div>
  
! <%
! idnfo = 0
! rls.nfos.each { |nfo|
! 	idnfo += 1
! %>
! 	<a name="nfo<%=idnfo%>"></a>
  	<div class="group">Contents of: <i><%= nfo[1] %></i></div>
  	<pre>
***************
*** 90,95 ****
  <% else %>
  
! <h1>Orphan files</h1>
! <%= "<h2>posted on #{web.date_str}</h2>" if web.date %>
  
  <% end %>
--- 98,103 ----
  <% else %>
  
! 
! <div class="pagetitle">Orphans - <%= "#{web.date_str}" if web.date %></div>
  
  <% end %>

Index: queueview.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/queueview.rhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** queueview.rhtml	27 Sep 2004 14:59:40 -0000	1.5
--- queueview.rhtml	29 Sep 2004 16:07:44 -0000	1.6
***************
*** 31,34 ****
--- 31,36 ----
  <body>
  
+ <div class="pagetitle">Queue view</div>
+ 
  <% if web.group %>
  	<div class="add_queue">

Index: top.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/top.rhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** top.rhtml	27 Sep 2004 18:01:27 -0000	1.5
--- top.rhtml	29 Sep 2004 16:07:44 -0000	1.6
***************
*** 57,61 ****
  		<table>
  			<tr>
! 				<td class="grouptab"><a href="index.rhtml" target="_top">*</a></td>
  				<% NgetSuite::GroupList.new("order by `shortname`").each { |group| %>
  				<td class="<%= (servlet_request.query["group"] == group._fullname) ? "grouptabsel" : "grouptab" %>"><a href="index.rhtml?group=<%= group._fullname %>" target="_top"><%= group._shortname %></a></td>
--- 57,61 ----
  		<table>
  			<tr>
! 				<td class="ngetsuitebutton"><a class="ngetsuitelink" href="index.rhtml" target="_top"><b>nget</b><i>suite</i></a></td>
  				<% NgetSuite::GroupList.new("order by `shortname`").each { |group| %>
  				<td class="<%= (servlet_request.query["group"] == group._fullname) ? "grouptabsel" : "grouptab" %>"><a href="index.rhtml?group=<%= group._fullname %>" target="_top"><%= group._shortname %></a></td>

Index: index.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/index.rhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** index.rhtml	27 Sep 2004 18:01:27 -0000	1.6
--- index.rhtml	29 Sep 2004 16:07:44 -0000	1.7
***************
*** 23,27 ****
  		<title>NgetSuite: CFUJ Downloader Edition</title>
  	</head>
! 		<frameset rows="60,*" cols="*" border="1" frameborder="1" framespacing="0" resize="no">
  			<frame src="<%= url_top %>" name="top" frameborder="0" scrolling="no" />
  			<frameset cols="50%, 50%" framespacing="1" frameborder="1" border="1">
--- 23,27 ----
  		<title>NgetSuite: CFUJ Downloader Edition</title>
  	</head>
! 		<frameset rows="59,*" cols="*" border="1" frameborder="1" framespacing="0" resize="no">
  			<frame src="<%= url_top %>" name="top" frameborder="0" scrolling="no" />
  			<frameset cols="50%, 50%" framespacing="1" frameborder="1" border="1">

Index: ngetsuite.css
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/ngetsuite.css,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ngetsuite.css	21 Feb 2004 15:58:34 -0000	1.12
--- ngetsuite.css	29 Sep 2004 16:07:44 -0000	1.13
***************
*** 13,16 ****
--- 13,17 ----
  	font-size: 10pt;
  	background: #dddddd;
+ 	margin-top: 3ex;
  }
  
***************
*** 38,41 ****
--- 39,62 ----
  }
  
+ div.pagetitle {
+ 	color: white;
+ 	background-color: gray;
+ 	left: 0px;
+ 	top: 0px;
+ 	width: 100%;
+ 	font-family: Arial, Helvetica, sans-serif;
+ 	font-size: 10pt;
+ 	position: fixed;
+ 	margin-bottom: 10ex;
+ }
+ 
+ a.titlelink {
+ 	color: #AAAAAA;
+ }
+ 
+ a.titlelink:hover {
+ 	color: #BBBBBB;
+ }
+ 
  table.banner {
  	border: 1px solid black;
***************
*** 48,51 ****
--- 69,82 ----
  }
  
+ td.ngetsuitebutton {
+ 	border: 1px solid black;
+ 	background-color: #8080FF;
+ }
+ 
+ a.ngetsuitelink {
+ 	color: white;
+ 	text-decoration: none;
+ }
+ 
  td.grouptab {
  	border: 1px solid black;

Index: group.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/group.rhtml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** group.rhtml	27 Sep 2004 18:01:26 -0000	1.9
--- group.rhtml	29 Sep 2004 16:07:44 -0000	1.10
***************
*** 67,71 ****
  
  
! <div class="sectiontitle"><%= web.date_str %></div>
  
  <% releases = Releases.new(web.group._groupindex, web.date) %>
--- 67,71 ----
  
  
! <div class="pagetitle">Releases - <%= web.date_str %></div>
  
  <% releases = Releases.new(web.group._groupindex, web.date) %>

Index: search.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/search.rhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** search.rhtml	27 Sep 2004 18:01:27 -0000	1.2
--- search.rhtml	29 Sep 2004 16:07:44 -0000	1.3
***************
*** 72,76 ****
  
  %>
! <h3>Search releases/articles</h3>
  <div class="search_form">
  <form method='post' name='search' target="left">
--- 72,76 ----
  
  %>
! <div class="pagetitle">Search releases/articles</div>
  <div class="search_form">
  <form method='post' name='search' target="left">
***************
*** 107,111 ****
  	if (web.want_release == "1")
  %>
! <h3>Search results</h3>
  <table class='articles'>
  	<tr class='headers'>
--- 107,111 ----
  	if (web.want_release == "1")
  %>
! <div class="pagetitle">Search results</div>
  <table class='articles'>
  	<tr class='headers'>
***************
*** 156,160 ****
  	end
  end
  
! #<%= web.end_html() %>
  <% NgetSuite::Db.dbh.disconnect %>
--- 156,161 ----
  	end
  end
+ %>
  
! <%= web.end_html() %>
  <% NgetSuite::Db.dbh.disconnect %>

[Ngetsuite-cvs] ngetsuite/ngetsuite queue.rb,1.31,1.32

From: YS <ys...@us...> - 2004-09-29 16:07:53

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

Modified Files:
	queue.rb 
Log Message:
- subdir fix
- sexy headers in web interface's pages


Index: queue.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/queue.rb,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** queue.rb	29 Sep 2004 12:18:00 -0000	1.31
--- queue.rb	29 Sep 2004 16:07:43 -0000	1.32
***************
*** 100,117 ****
  		@_period = period
  
! 		# fine-tune subdir
! 		@_subdir = nil
! 		if groupindex and not fetch_from_db
! 			@_subdir = Group.getgroup(groupindex)._directory.sub(/#{$config['basedir']}(#{File::Separator})*/, '')
! 			if subdir
! 				@_subdir += File::Separator + subdir
! 				dir = $config['basedir'] + File::Separator + @_subdir
! 				if FileTest.exists? dir
! 					puts "The download target #{dir} already exists"
! 				else
! 					File.makedirs dir
! 				end
! 			end
! 		end
  		update_from_db if fetch_from_db
  	end
--- 100,116 ----
  		@_period = period
  
! 		@_subdir = (subdir) ? subdir : value
! #		if groupindex and not fetch_from_db
! #			@_subdir = Group.getgroup(groupindex)._directory.sub(/#{$config['basedir']}(#{File::Separator})*/, '')
! #			if subdir
! #				@_subdir += File::Separator + subdir
! #				dir = $config['basedir'] + File::Separator + @_subdir
! #				if FileTest.exists? dir
! #					puts "The download target #{dir} already exists"
! #				else
! #					File.makedirs dir
! #				end
! #			end
! #		end
  		update_from_db if fetch_from_db
  	end

[Ngetsuite-cvs] ngetsuite ngetcache.sql,1.13,1.14

From: YS <ys...@us...> - 2004-09-29 16:07:53

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

Modified Files:
	ngetcache.sql 
Log Message:
- subdir fix
- sexy headers in web interface's pages


Index: ngetcache.sql
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetcache.sql,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ngetcache.sql	27 Sep 2004 18:01:24 -0000	1.13
--- ngetcache.sql	29 Sep 2004 16:07:43 -0000	1.14
***************
*** 122,123 ****
--- 122,140 ----
    PRIMARY KEY  (`queueindex`,`artindex`)
  ) TYPE=MyISAM;
+ 
+ # --------------------------------------------------------
+ 
+ #
+ # Table structure for table `log`
+ #
+ 
+ CREATE TABLE `log` (
+   `id` integer NOT NULL auto_increment,
+   `date` datetime NOT NULL,
+   `groupindex` integer,
+   `queueindex` integer,
+   `type` set('ERROR','WARNING','NOTICE','PARINFO','START','FINISH') NOT NULL default 'NOTICE',
+   `message` varchar(255) NOT NULL
+   PRIMARY KEY  (`id`)
+ ) TYPE=MyISAM;
+

[Ngetsuite-cvs] ngetsuite/ngetsuite downloader.rb,1.41,1.42 queue.rb,1.30,1.31

From: Yoann G. <jj...@us...> - 2004-09-29 12:18:14

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

Modified Files:
	downloader.rb queue.rb 
Log Message:
misc fixes


Index: queue.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/queue.rb,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** queue.rb	27 Sep 2004 14:59:40 -0000	1.30
--- queue.rb	29 Sep 2004 12:18:00 -0000	1.31
***************
*** 132,137 ****
  	
  	def to_s
! 		s = "#{yellow '<'}#{blue @_queueindex}#{yellow '>'} [#{red group}] #{yellow @_value},\n\tdest : #{green @_subdir},\n\tprio : #{@_priority}, 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|
--- 132,137 ----
  	
  	def to_s
! 		s = "#{yellow '<'}#{blue @_queueindex}#{yellow '>'} [#{red group}] #{yellow @_value}, dest : #{green @_subdir}, prio : #{@_priority}, status : #{@_status} "
! 		if (@_status == FAILED or @_status == PROCESSING or @_status == STOPPED)
  			a = Db.dbh.select_all("select `status` from `queue_files` where `queueindex`='#{@_queueindex}'")
  			s += ' ' + yellow('[') + a.map { |x|

Index: downloader.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloader.rb,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** downloader.rb	27 Sep 2004 18:01:25 -0000	1.41
--- downloader.rb	29 Sep 2004 12:18:00 -0000	1.42
***************
*** 208,212 ****
  			rescue IOError
  				puts 'nget got killed!'
! 				parent.stop
  			rescue Object => e
  				puts 'Exception while parsing nget output: '+e.class.to_s, e.backtrace
--- 208,219 ----
  			rescue IOError
  				puts 'nget got killed!'
! 				if @curfile
! 					@curfile.finish_err
! 					@curfile.sync_to_db
! 					@curfile = nil
! 				end
! 				# unless requested by -k
! 				parent.stop if (@finish_status == 'FAILED')
! 				
  			rescue Object => e
  				puts 'Exception while parsing nget output: '+e.class.to_s, e.backtrace
***************
*** 225,229 ****
  	def stop(command=false)
  		# oh no they killed kenny !
- 		ldebug red('dlder.stop')
  		@finish_status = (command ? 'STOPPED' : 'PENDING')
  		newstat = "`status`='#{@finish_status}',`date_finished`=NOW()"
--- 232,235 ----
***************
*** 235,238 ****
--- 241,245 ----
  		Process.kill('SIGTERM', @io.pid)
  		@io.close
+ 		sleep 2
  		@t.exit

[Ngetsuite-cvs] ngetsuite resetdb.rb,1.6,1.7

From: Yoann G. <jj...@us...> - 2004-09-29 12:18:14

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

Modified Files:
	resetdb.rb 
Log Message:
misc fixes


Index: resetdb.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/resetdb.rb,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** resetdb.rb	27 Sep 2004 18:01:24 -0000	1.6
--- resetdb.rb	29 Sep 2004 12:17:58 -0000	1.7
***************
*** 1,4 ****
--- 1,6 ----
  #!/usr/bin/env ruby
  module NgetSuite
+ class NgetsuiteException < Exception
+ end
  conffile = ENV['HOME'] + File::Separator + '.ngetsuite'
  require 'ngetsuite/config'

[Ngetsuite-cvs] ngetsuite daemon.rb,1.17,1.18 ngetcache.sql,1.12,1.13 resetdb.rb,1.5,1.6

From: YS <ys...@us...> - 2004-09-27 18:02:07

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

Modified Files:
	daemon.rb ngetcache.sql resetdb.rb 
Log Message:
- download in subdir is handled by nget with temp files in a temp/ subdir
- orphan files link works
- cosmetics on search.rthml
- ...


Index: ngetcache.sql
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetcache.sql,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ngetcache.sql	17 Mar 2004 10:14:18 -0000	1.12
--- ngetcache.sql	27 Sep 2004 18:01:24 -0000	1.13
***************
*** 1,13 ****
! # phpMyAdmin SQL Dump
! # version 2.5.3
! # http://www.phpmyadmin.net
! #
! # Host: localhost
! # Generation Time: Oct 28, 2003 at 01:00 AM
! # Server version: 4.0.14
! # PHP Version: 4.3.3
! # 
! # Database : `ngetcache`
! # 
  
  # --------------------------------------------------------
--- 1,6 ----
! # NgetSuite MySQL database structure
! # Run the resetdb.rb script to (re)build it
! # (the .ngetsuite config file must already be created in your $HOME, and the
! # database itself must already exist and be accessible for the specified user)
  
  # --------------------------------------------------------
***************
*** 104,107 ****
--- 97,102 ----
    `status` set('PENDING','PROCESSING','FINISHED','STOPPED','FAILED') NOT NULL default 'PENDING',
    `nbfiles` smallint(6) NOT NULL default '0',
+   `nbgoodfiles` smallint(6) NOT NULL default '0',
+   `nberrors` smallint(6) NOT NULL default '0',
    `finalword` varchar(64) default NULL,
    `period` integer default '0',
***************
*** 121,125 ****
    `date_finished` datetime default NULL,
    `filenumber` int(4) NOT NULL default '0',
!   `status` set('PROCESSING','FINISHED','ERROR_DECODING','ERROR_RETRIEVING') NOT NULL default 'PROCESSING',
    `filename` varchar(128) NOT NULL default '',
    `size` integer NOT NULL default '0',
--- 116,120 ----
    `date_finished` datetime default NULL,
    `filenumber` int(4) NOT NULL default '0',
!   `status` set('PROCESSING','FINISHED','ERROR_DECODING','ERROR_RETRIEVING','ERROR_UNKNOWN') NOT NULL default 'PROCESSING',
    `filename` varchar(128) NOT NULL default '',
    `size` integer NOT NULL default '0',

Index: resetdb.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/resetdb.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** resetdb.rb	14 Mar 2004 22:32:33 -0000	1.5
--- resetdb.rb	27 Sep 2004 18:01:24 -0000	1.6
***************
*** 4,7 ****
--- 4,8 ----
  require 'ngetsuite/config'
  $config = Config.new(conffile)
+ require 'ngetsuite/core'
  require 'ngetsuite/db'
  

Index: daemon.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/daemon.rb,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** daemon.rb	27 Sep 2004 15:07:20 -0000	1.17
--- daemon.rb	27 Sep 2004 18:01:24 -0000	1.18
***************
*** 47,50 ****
--- 47,52 ----
  if $config['httpd_autostart']
  	require 'webrick'
+ 		
+ 	port = $config['httpd_port']
  	
  	if $config['httpd_port']
***************
*** 69,72 ****
--- 71,76 ----
  		:AccessLog		=> access_log
  	}
+ #	WEBrick::HTTPUtils::DefaultMimeTypes["rhtml"] = "text/html"
+ 	
  	if $config['httpd_error_log']
  		http_server_h[:Logger] = WEBrick::Log::new($config['httpd_error_log'])

[Ngetsuite-cvs] ngetsuite/web group.rhtml,1.8,1.9 grouphome.rhtml,1.1,1.2 index.rhtml,1.5,1.6 search.rhtml,1.1,1.2 top.rhtml,1.4,1.5 welcome.rhtml,1.1,1.2

From: YS <ys...@us...> - 2004-09-27 18:01:54

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

Modified Files:
	group.rhtml grouphome.rhtml index.rhtml search.rhtml top.rhtml 
	welcome.rhtml 
Log Message:
- download in subdir is handled by nget with temp files in a temp/ subdir
- orphan files link works
- cosmetics on search.rthml
- ...


Index: grouphome.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/grouphome.rhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** grouphome.rhtml	21 Feb 2004 15:58:34 -0000	1.1
--- grouphome.rhtml	27 Sep 2004 18:01:27 -0000	1.2
***************
*** 32,36 ****
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
  <head>
! <link href="ngetsuite.css" rel="stylesheet" type="text/css">
  <title>Group home</title>
  </head>
--- 32,36 ----
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
  <head>
! <link href="ngetsuite.css" rel="stylesheet" type="text/css" />
  <title>Group home</title>
  </head>

Index: welcome.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/welcome.rhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** welcome.rhtml	9 Nov 2003 01:25:33 -0000	1.1
--- welcome.rhtml	27 Sep 2004 18:01:27 -0000	1.2
***************
*** 15,19 ****
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
  <head>
! <link href="ngetsuite.css" rel="stylesheet" type="text/css">
  <title>Queue editor</title>
  <script language="JavaScript">
--- 15,19 ----
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
  <head>
! <link href="ngetsuite.css" rel="stylesheet" type="text/css" />
  <title>Queue editor</title>
  <script language="JavaScript">

Index: top.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/top.rhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** top.rhtml	27 Sep 2004 14:59:41 -0000	1.4
--- top.rhtml	27 Sep 2004 18:01:27 -0000	1.5
***************
*** 39,47 ****
  
  %>
- <?xml version="1.0" encoding="ISO-8859-1"?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
  <head>
! <link href="ngetsuite.css" rel="stylesheet" type="text/css">
  <title>Queue editor</title>
  </head>
--- 39,46 ----
  
  %>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
  <head>
! <link href="ngetsuite.css" rel="stylesheet" type="text/css" />
  <title>Queue editor</title>
  </head>

Index: index.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/index.rhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** index.rhtml	21 Feb 2004 15:58:34 -0000	1.5
--- index.rhtml	27 Sep 2004 18:01:27 -0000	1.6
***************
*** 18,22 ****
  %>
  
- <?xml version="1.0" encoding="iso-8859-1" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/dtd/xhtml11.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
--- 18,21 ----

Index: group.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/group.rhtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** group.rhtml	27 Sep 2004 14:59:40 -0000	1.8
--- group.rhtml	27 Sep 2004 18:01:26 -0000	1.9
***************
*** 31,38 ****
  				for i in 0..row["rlsmap"].size-1
  					if row["rlsmap"][i] == "#"[0] then
! 						row["graphmap"] += "<img src=\"green.png\" width=\"3\" height=\"5\">"
  #						row["graphmap"] += "<td class=\"greenbox\">#{i+1}</td>"
  					else
! 						row["graphmap"] += "<img src=\"red.png\" width=\"3\" height=\"5\">"
  #						row["graphmap"] += "<td class=\"redbox\">#{i+1}</td>"
  					end
--- 31,38 ----
  				for i in 0..row["rlsmap"].size-1
  					if row["rlsmap"][i] == "#"[0] then
! 						row["graphmap"] += "<img src=\"green.png\" width=\"3\" height=\"5\" alt=\"#\">"
  #						row["graphmap"] += "<td class=\"greenbox\">#{i+1}</td>"
  					else
! 						row["graphmap"] += "<img src=\"red.png\" width=\"3\" height=\"5\" alt=\"_\">"
  #						row["graphmap"] += "<td class=\"redbox\">#{i+1}</td>"
  					end
***************
*** 43,47 ****
  			else
  				for i in 1..row["nbactual"]
! 					row["graphmap"] += "<img src=\"cyan.png\" width=\"3\" height=\"5\">"
  #					row["graphmap"] += "<td class=\"cyanbox\">#{i}</td>"
  #					row["graphmap"] += "</tr><tr>" if i % 20 == 19
--- 43,47 ----
  			else
  				for i in 1..row["nbactual"]
! 					row["graphmap"] += "<img src=\"cyan.png\" width=\"3\" height=\"5\" alt=\"=\">"
  #					row["graphmap"] += "<td class=\"cyanbox\">#{i}</td>"
  #					row["graphmap"] += "</tr><tr>" if i % 20 == 19
***************
*** 61,65 ****
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
  <head>
! <link href="ngetsuite.css" rel="stylesheet" type="text/css">
  <title>Queue editor</title>
  </head>
--- 61,65 ----
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
  <head>
! <link href="ngetsuite.css" rel="stylesheet" type="text/css" />
  <title>Queue editor</title>
  </head>
***************
*** 80,84 ****
  		<td class="time"><i><%= rls["time"] %></i><br>
  		<b><%= NgetSuite::Utils.pretty_size(rls["size"]) %><b></td>
! 		<td class="subject"><a class="rlslink" target="right" href="release.rhtml?group=<%= web.group._fullname %>&rlsartind=<%= rls["artindex"].to_s %>"><%= rls["subject"] %></a><br>
  		<%= rls["graphmap"] %>
  	</tr>
--- 80,84 ----
  		<td class="time"><i><%= rls["time"] %></i><br>
  		<b><%= NgetSuite::Utils.pretty_size(rls["size"]) %><b></td>
! 		<td class="subject" valign="bottom"><a class="rlslink" target="right" href="release.rhtml?group=<%= web.group._fullname %>&rlsartind=<%= rls["artindex"].to_s %>"><%= rls["subject"] %></a><br>
  		<%= rls["graphmap"] %>
  	</tr>

Index: search.rhtml
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/web/search.rhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** search.rhtml	27 Sep 2004 14:59:41 -0000	1.1
--- search.rhtml	27 Sep 2004 18:01:27 -0000	1.2
***************
*** 75,92 ****
  <div class="search_form">
  <form method='post' name='search' target="left">
! Filter <input class='regexp' type='text' name="filter" size='30' maxlength='50' />
! <br />
! <input type='radio' name='want_release' value="1" checked="checked" /> Search for releases
  <br />
! <input type='radio' name='want_release' value="0" /> Search for articles
  <br />
! <input type="text" name="aging" size="5" maxlength="5" />
  <select name="aging_unit" />
  <option value="w">weeks</option>
  <option value="d" selected="selected">days</option>
  <option value="h">hours</option>
! </select> old articles only
  <br />
! Limit search to these groups :
  <select name="groups" multiple="multiple" size="8" />
  <% NgetSuite::GroupList.new("order by `shortname`").each { |group| %>
--- 75,92 ----
  <div class="search_form">
  <form method='post' name='search' target="left">
! Search for
! <input type='radio' name='want_release' value="1" checked="checked" /> releases&nbsp;&nbsp;
! <input type='radio' name='want_release' value="0" /> articles
  <br />
! matching <input class='regexp' type='text' name="filter" size='30' maxlength='50' />
  <br />
! posted the last <input type="text" name="aging" size="5" maxlength="5" />
  <select name="aging_unit" />
  <option value="w">weeks</option>
  <option value="d" selected="selected">days</option>
  <option value="h">hours</option>
! </select>
  <br />
! Limit search to these groups :<br />
  <select name="groups" multiple="multiple" size="8" />
  <% NgetSuite::GroupList.new("order by `shortname`").each { |group| %>

[Ngetsuite-cvs] ngetsuite/ngetsuite downloader.rb,1.40,1.41 downloadmanager.rb,1.26,1.27 queue_file.rb,1.17,1.18

From: YS <ys...@us...> - 2004-09-27 18:01:41

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

Modified Files:
	downloader.rb downloadmanager.rb queue_file.rb 
Log Message:
- download in subdir is handled by nget with temp files in a temp/ subdir
- orphan files link works
- cosmetics on search.rthml
- ...


Index: queue_file.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/queue_file.rb,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** queue_file.rb	25 Feb 2004 22:37:17 -0000	1.17
--- queue_file.rb	27 Sep 2004 18:01:25 -0000	1.18
***************
*** 75,82 ****
  	end
  
! 	def finish_err
  		finish('ERROR_RETRIEVING')
  	end
  	
  	def to_s
  		"-- #{@_filename} : [#{@part}/#{@dlparts}], speed = #{@_avgspeed}"
--- 75,86 ----
  	end
  
! 	def finish_err_dl
  		finish('ERROR_RETRIEVING')
  	end
  	
+ 	def finish_err
+ 		finish('ERROR_UNKNOWN')
+ 	end
+ 	
  	def to_s
  		"-- #{@_filename} : [#{@part}/#{@dlparts}], speed = #{@_avgspeed}"

Index: downloadmanager.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloadmanager.rb,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** downloadmanager.rb	27 Sep 2004 13:04:05 -0000	1.26
--- downloadmanager.rb	27 Sep 2004 18:01:25 -0000	1.27
***************
*** 67,73 ****
  		@current_dlers += 1
  		queueindex, groupindex, type, value, subdir, prio = row.values_at(0, 1, 2, 3, 4, 5)
! 		group = Group.getname(groupindex)
! 		log "found /#{value}/ for group #{group}\n"
! 		dler = Downloader.new(queueindex, type, value, group, @basedir + File::Separator + subdir, prio)
  		@dlers[queueindex] = dler
  		dler.start
--- 67,74 ----
  		@current_dlers += 1
  		queueindex, groupindex, type, value, subdir, prio = row.values_at(0, 1, 2, 3, 4, 5)
! 		group = Group.getgroup(groupindex)
! 		basedir = @basedir
! 		basedir += File::Separator + group._directory if group._directory
! 		dler = Downloader.new(queueindex, type, value, group, basedir, subdir, prio)
  		@dlers[queueindex] = dler
  		dler.start

Index: downloader.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloader.rb,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** downloader.rb	27 Sep 2004 14:59:40 -0000	1.40
--- downloader.rb	27 Sep 2004 18:01:25 -0000	1.41
***************
*** 21,26 ****
  	# the group
  	attr_reader :group
! 	# the directory of destination
! 	attr_reader :dest
  	# the priority
  	attr_reader :prio
--- 21,28 ----
  	# the group
  	attr_reader :group
! 	# base destination directory (group-wise)
! 	attr_reader :basedir
! 	# subdirectory for this download
! 	attr_reader :subdir
  	# the priority
  	attr_reader :prio
***************
*** 30,39 ****
  	attr_reader :nbfiles
  	
! 	def initialize(queueindex, type, value, group, dest, prio)
  		@queueindex = queueindex
  		@type = type
  		@value = value
  		@group = group
! 		@dest = dest
  		@prio = prio
  		@status = 'PENDING'
--- 32,42 ----
  	attr_reader :nbfiles
  	
! 	def initialize(queueindex, type, value, group, basedir, subdir, prio)
  		@queueindex = queueindex
  		@type = type
  		@value = value
  		@group = group
! 		@basedir = basedir
! 		@subdir = subdir
  		@prio = prio
  		@status = 'PENDING'
***************
*** 50,54 ****
  		case line
  		when /^(\d+) \((\d+)\/(\d+)\): (\d+)\/(\d+)L (\d+)\/(\d+)B\s+(\d+)% (\d+)B\/s (\w+) (\d+)\/(\d+) (\w+)$/
! 			part, size, speed, filenb = $2, $7, $9, $12
  			ldebug "#{green $5+'L'}(#{green $7+'B'}) at #{$9+'B/s'} [#{blue $2}/#{blue $3}] [#{yellow $11}/#{yellow $12}]", false
  			@curfile.update(part, speed, filenb, size) if @curfile
--- 53,57 ----
  		case line
  		when /^(\d+) \((\d+)\/(\d+)\): (\d+)\/(\d+)L (\d+)\/(\d+)B\s+(\d+)% (\d+)B\/s (\w+) (\d+)\/(\d+) (\w+)$/
! 			part, size, speed, filenb = $2, $7, $9, $11
  			ldebug "#{green $5+'L'}(#{green $7+'B'}) at #{$9+'B/s'} [#{blue $2}/#{blue $3}] [#{yellow $11}/#{yellow $12}]", false
  			@curfile.update(part, speed, filenb, size) if @curfile
***************
*** 116,120 ****
  		when 'download error occured, keeping temp files.'
  			ldebug "#{yellow 'Error'} while downloading"
! 			@curfile.finish_err if @curfile
  			@finish_status = 'FAILED'
  			# we do not know the file name
--- 119,123 ----
  		when 'download error occured, keeping temp files.'
  			ldebug "#{yellow 'Error'} while downloading"
! 			@curfile.finish_err_dl if @curfile
  			@finish_status = 'FAILED'
  			# we do not know the file name
***************
*** 175,180 ****
  
  	def start
! 		File.makedirs(@dest)
! 		Dir.chdir(@dest)
  		# unused
  		@start_time = Time.new
--- 178,183 ----
  
  	def start
! 		File.makedirs(@basedir)
! 		Dir.chdir(@basedir)
  		# unused
  		@start_time = Time.new
***************
*** 183,187 ****
  		Db.dbh.do "update queue set `status`='PROCESSING', `date_started`=NOW() where `queueindex`='#{@queueindex}'"
  #		Db.dbh.do 'unlock tables'
! 		ignoreme = (Db.dbh.select_one "select `ignoreregex` from `groups` where `groupindex`='#{Group.getindex(@group)}'")[0]
  		if ignoreme and ignoreme.length > 0
  			downloadexpr = "-R 'subject #{@value} == subject #{ignoreme} != &&'"
--- 186,190 ----
  		Db.dbh.do "update queue set `status`='PROCESSING', `date_started`=NOW() where `queueindex`='#{@queueindex}'"
  #		Db.dbh.do 'unlock tables'
! 		ignoreme = (Db.dbh.select_one "select `ignoreregex` from `groups` where `groupindex`='#{@group._groupindex}'")[0]
  		if ignoreme and ignoreme.length > 0
  			downloadexpr = "-R 'subject #{@value} == subject #{ignoreme} != &&'"
***************
*** 189,193 ****
  			downloadexpr = "-r '#{@value}'"
  		end
! 		@io = IO.popen("#{"nice -n#{$config['nice_nget_download']} -- " if $config['nice_nget_download'] != 0} #{$config['nget']} -q -G #{@group} #{downloadexpr} 2>&1")
  		@t = Thread.new(@io, self){ |io, parent|
  			begin
--- 192,199 ----
  			downloadexpr = "-r '#{@value}'"
  		end
! 
! 		subdirexpr = "-p ." + File::Separator + "'#{@subdir}' -P ." + File::Separator + "'#{@subdir}'" + File::Separator + "temp"
! 		
! 		@io = IO.popen("#{"nice -n#{$config['nice_nget_download']} -- " if $config['nice_nget_download'] != 0} #{$config['nget']} -q -dfI --makedirs yes #{subdirexpr} -G #{@group._fullname} #{downloadexpr} 2>&1")
  		@t = Thread.new(@io, self){ |io, parent|
  			begin
***************
*** 210,214 ****
  		}
  		ldebug 'Downloader started for ' + green(@value)
! 		log "Download started for #{@value}, group #{@group} to #{@dest}"
  	end
  
--- 216,220 ----
  		}
  		ldebug 'Downloader started for ' + green(@value)
! 		log "Download started for #{@value}, group #{@group._fullname} to #{@subdir}"
  	end
  
***************
*** 231,236 ****
  		@t.exit
  		
! 		ldebug "Download stopped for #{green @value}, group #{@group}"	
! 		log "Download stopped for #{@value}, group #{@group}"	
  	end
  
--- 237,242 ----
  		@t.exit
  		
! 		ldebug "Download stopped for #{green @value}, group #{@group._fullname}"	
! 		log "Download stopped for #{@value}, group #{@group._fullname}"	
  	end
  
***************
*** 248,252 ****
  		Db.dbh.do 'unlock tables'
  		ldebug "Download #{newstatus.downcase} for #{green @value}"		
! 		log "Download #{newstatus.downcase} for #{@value}, group #{@group}"		
  	end
  
--- 254,258 ----
  		Db.dbh.do 'unlock tables'
  		ldebug "Download #{newstatus.downcase} for #{green @value}"		
! 		log "Download #{newstatus.downcase} for #{@value}, group #{@group._fullname}"		
  	end

[Ngetsuite-cvs] ngetsuite daemon.rb,1.16,1.17

From: Kyoshiro <mib...@us...> - 2004-09-27 15:07:29

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

Modified Files:
	daemon.rb 
Log Message:
remove debug puts


Index: daemon.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/daemon.rb,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** daemon.rb	27 Sep 2004 14:59:39 -0000	1.16
--- daemon.rb	27 Sep 2004 15:07:20 -0000	1.17
***************
*** 45,49 ****
  DRb.start_service(drburl, manager)
  
- puts $wd
  if $config['httpd_autostart']
  	require 'webrick'
--- 45,48 ----

Flat | Threaded

1 2 3 .. 6 > >> (Page 1 of 6)

2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (7)
2004	Jan (4)	Feb (56)	Mar (10)	Apr (1)	May (6)	Jun (5)	Jul (2)	Aug	Sep (22)	Oct (7)	Nov (1)	Dec
2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (4)
2006	Jan	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec