[Ngetsuite-cvs] ngetsuite mime.types,NONE,1.1 daemon.rb,1.15,1.16 ngetsuite.rb,1.24,1.25 sampleconfig,1.10,1.11 specifs.txt,1.2,1.3

[Kyoshiro <mib...@us...>]

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

Modified Files:
	daemon.rb ngetsuite.rb sampleconfig specifs.txt 
Added Files:
	mime.types 
Log Message:
sampleconfig: add httpd error and access log entries
web/
  top.rhtml: add (*) pseudo group to remove group filtering
  release.rhtml: remove non working pretty_date
  release.rhtml: add release view by filter
  queueview.rhtml: increase queue_add regex maxlength
  queueview.rhtml: add sort links to queue's columns headers
  queueview.rhtml: reorganize queue columns
  queueview.rhtml: replace regex input field with link to articles list (release
                   view by filter)
  group.rhtml: remove non working pretty_date
  search.rhtml: add file, allow searching with web interface
ngetsuite/
  web.rb: add some form attributes recognition
  web.rb: add start_html, end_html, urlencode methods
  queue.rb: add shortgroup method, enhance output (more \n)
  nfo.rb: add getnfobyregex method
  nfo.rb: add search method
  downloader.rb: remove db locks
  ngetsuite.rb, specif.txt, core.rb: add --search-nfo-by-subject (-N) and
            --search-nfo (-F) options which work like -g and -G
  daemon.rb: add mime types handling to make webrick send text/html for .rhtml files
  daemon.rb: make webrick log access/errors into files instead of output
  mime.types: contains css and rhtml type definitions...


Index: sampleconfig
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/sampleconfig,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sampleconfig	6 Feb 2004 23:46:59 -0000	1.10
--- sampleconfig	27 Sep 2004 14:59:40 -0000	1.11
***************
*** 61,63 ****
  # should the daemon start the httpd
  httpd_autostart = true
! 
--- 61,64 ----
  # should the daemon start the httpd
  httpd_autostart = true
! httpd_error_log = '/home/nget/weberrors.log'
! httpd_access_log = '/home/nget/webaccess.log'

--- NEW FILE: mime.types ---
text/html					htm html shtml rhtml
text/css					css

Index: ngetsuite.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite.rb,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ngetsuite.rb	3 Sep 2004 10:42:58 -0000	1.24
--- ngetsuite.rb	27 Sep 2004 14:59:40 -0000	1.25
***************
*** 25,28 ****
--- 25,30 ----
  	[ '--search-releases', '-G', GetoptLong::REQUIRED_ARGUMENT, 'groupid,filter', 'Searches the releases matching a filter in a group' ],
  	[ '--show-nfo', '-n', GetoptLong::REQUIRED_ARGUMENT, 'groupid,nfo_nb', 'Prints the specified nfo' ],
+ 	[ '--search-nfo', '-F', GetoptLong::REQUIRED_ARGUMENT, 'groupid,filter', 'Lists the NFOs containting filter' ],
+ 	[ '--search-nfo-by-subject', '-N', GetoptLong::REQUIRED_ARGUMENT, 'groupid,release_regex', 'Lists the NFOs associated to release matching regex' ],
  	[ '--queue-article', '-q', GetoptLong::REQUIRED_ARGUMENT, 'groupid,articleid', 'Adds an article to the download queue'],
  	[ '--queue-regexp', '-r', GetoptLong::REQUIRED_ARGUMENT, 'gid,regexp[,prio,period,dir]', 'Adds a regexp to the download queue' ],

Index: specifs.txt
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/specifs.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** specifs.txt	23 Oct 2003 21:44:29 -0000	1.2
--- specifs.txt	27 Sep 2004 14:59:40 -0000	1.3
***************
*** 21,24 ****
--- 21,34 ----
  $ ngetsuite --show-nfo group nfo
  	...
+ $ ngetsuite --search-nfo-by-subject group filter
+     [1] NFO id: 156151320
+         Article: subject
+     [2] NFO id: 156156100
+         Article: subject
+ $ ngetsuite --search-nfo group filter
+     [1] NFO id: 156151320
+         Article: subject
+     [2] NFO id: 156156100
+         Article: subject
  $ ngetsuite --show-rls group
  	[1] wam-ssx3

Index: daemon.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/daemon.rb,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** daemon.rb	15 Sep 2004 13:29:36 -0000	1.15
--- daemon.rb	27 Sep 2004 14:59:39 -0000	1.16
***************
*** 45,58 ****
  DRb.start_service(drburl, manager)
  
  if $config['httpd_autostart']
  	require 'webrick'
  	
! 	port = $config['httpd_port']
  	puts "Starting web server on port #{port}"
  	log 'Web server start'
! 	s = WEBrick::HTTPServer.new(
! 		:Port            => port,
! 		:DocumentRoot    => $wd + File::Separator + 'web'
! 	)
  	httpThread = Thread.new {
  		Dir.chdir($wd)
--- 45,81 ----
  DRb.start_service(drburl, manager)
  
+ puts $wd
  if $config['httpd_autostart']
  	require 'webrick'
  	
! 	if $config['httpd_port']
! 		port = $config['httpd_port']
! 	else
! 		port = 8000
! 	end
! 	if $config['httpd_access_log']
! 		puts "Logging web access into #{$config['httpd_access_log']}"
! 		access_log_stream = File.open($config['httpd_access_log'], 'w')
! 	else
! 		puts "Web access log disabled"
! 		access_log_stream = File.open("/dev/null", 'w')
! 	end	
! 	access_log = [[ access_log_stream, WEBrick::AccessLog::COMBINED_LOG_FORMAT]]
! 
! 	http_server_h = {
! 		:Port			=> port,
! 		:DocumentRoot	=> $wd + File::Separator + 'web',
! 		:MimeTypes		=> WEBrick::HTTPUtils::load_mime_types($wd +
! 				File::Separator + "mime.types"),
! 		:AccessLog		=> access_log
! 	}
! 	if $config['httpd_error_log']
! 		http_server_h[:Logger] = WEBrick::Log::new($config['httpd_error_log'])
! 	end
! 		
  	puts "Starting web server on port #{port}"
  	log 'Web server start'
! 	s = WEBrick::HTTPServer.new(http_server_h)
! 
  	httpThread = Thread.new {
  		Dir.chdir($wd)