Update of /cvsroot/ngetsuite/ngetsuite/ngetsuite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10708/ngetsuite
Modified Files:
downloader.rb downloadmanager.rb ngetcache.rb
Log Message:
minor updates, howto improved, sampleconfig commented, added a config option to start STOPPED queues automatically
Index: downloader.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloader.rb,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** downloader.rb 4 Feb 2004 05:56:50 -0000 1.19
--- downloader.rb 4 Feb 2004 07:13:05 -0000 1.20
***************
*** 72,76 ****
@curfile.update(part, speed, filenb, size)
when /^autopar/
! debug 'autopar: ' + blue(line.gsub(/\t/, red('\\t')))
when /^uu_msg\(\d+\):Loaded from .*: '.*' \(.*\): (.*) part \d+.*end (.*)$/
--- 72,76 ----
@curfile.update(part, speed, filenb, size)
when /^autopar/
! debug 'autopar: ' + blue(line)
when /^uu_msg\(\d+\):Loaded from .*: '.*' \(.*\): (.*) part \d+.*end (.*)$/
***************
*** 82,87 ****
@curfile.finish(true)
log "Download finished for file #{@curfile._filename}, queue #{@value}"
! #TODO : handle decoding failures (=> @curfile.finish(false))
else
debug "unhandled msg : #{blue line}"
end
--- 82,92 ----
@curfile.finish(true)
log "Download finished for file #{@curfile._filename}, queue #{@value}"
! when /^Connecting to (.*)$/
! debug blue("Connection to #{$1}..")
! when />> 200/
! debug blue('Connected')
! when />> (480|381|281)/, /<< (GROUP|AUTHINFO)/
else
+ #TODO : handle decoding failures (=> @curfile.finish(false))
debug "unhandled msg : #{blue line}"
end
Index: downloadmanager.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/downloadmanager.rb,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** downloadmanager.rb 4 Feb 2004 05:56:50 -0000 1.16
--- downloadmanager.rb 4 Feb 2004 07:13:05 -0000 1.17
***************
*** 57,66 ****
def start_new_downloader
row = $dbh.select_one("select * from queue where `status`='PENDING' order by `priority` desc limit 1")
return false if row == nil
- debug(green("New downloader starting"))
@current_dlers += 1
id, group, type, value, subdir, prio = row.values_at(0, 1, 2, 3, 4, 5)
log "found #{value} for group #{group}\n"
--- 57,67 ----
def start_new_downloader
row = $dbh.select_one("select * from queue where `status`='PENDING' order by `priority` desc limit 1")
+ row = $dbh.select_one("select * from queue where `status`='STOPPED' order by `priority` desc limit 1") if not row and $config.fetch('resume_downloads', false)
return false if row == nil
@current_dlers += 1
id, group, type, value, subdir, prio = row.values_at(0, 1, 2, 3, 4, 5)
+ debug(green("New downloader starting queue #{id}"))
log "found #{value} for group #{group}\n"
Index: ngetcache.rb
===================================================================
RCS file: /cvsroot/ngetsuite/ngetsuite/ngetsuite/ngetcache.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ngetcache.rb 4 Feb 2004 05:56:50 -0000 1.5
--- ngetcache.rb 4 Feb 2004 07:13:05 -0000 1.6
***************
*** 18,21 ****
--- 18,22 ----
CacheArticle = Struct.new('CacheArticle', 'serverid', 'articlenum', 'bytes', 'lines')
+ # TODO ajouter une option pour ne parser que les nouveaux articles ? (server.index > lasttime.server.high)
def initialize(groupname, path='.', limit=nil, filecallback=nil)
@servers = Array.new
|
