ward/ripnews
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

print -> puts

Browse source
This commit is contained in:
Ward Wouts 2008-02-04 21:46:37 +00:00
parent b0d94b8067
commit 98bf631374
1 changed files with 75 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

150
trunk/ripnews/news/article.rb
View file

@ -161,7 +161,7 @@ def initialize(nntpservers, groupname, newsrc="~/.newsrc")
@connections[server]["newsrc"] = News::Newsrc.new("#{newsrc}.#{server}")
set_skip_ids(server, @connections[server]["newsrc"].marked_articles(@group))
rescue SocketError, Errno::EINVAL, EOFError, Errno::ETIMEDOUT
print "Connection to #{server} failed: #{$!}\n"
puts "Connection to #{server} failed: #{$!}"
@connections[server]["nntp"].quit
del_server(server)
end
@ -198,12 +198,12 @@ def reconnect(server)
retry
end
end
print "Succesfully reconnected to #{server}\n"
puts "Succesfully reconnected to #{server}"
end
def memusage
print "memprof:\n"
print "global:\n"
puts "memprof:"
puts "global:"
# for i in global_variables
# print "#{i}\n"
# end
@ -240,7 +240,7 @@ def add(id, messid, from, subject, server)
end
def del_server(server)
print "Removing server #{server} from list\n"
puts "Removing server #{server} from list"
@connections.delete(server)
@serverlist.delete(server)
end
@ -253,7 +253,7 @@ def get_articles(cachedir=false)
begin
first, last = get_group_info(server)
rescue PermError
print "Error: #{$!}\n"
puts "Error: #{$!}"
del_server(server)
next
end
@ -262,7 +262,7 @@ def get_articles(cachedir=false)
@connections[server]["first"] = first ? first.to_i : 0
@connections[server]["last"] = last ? last.to_i : 0
if Debuglevel > 0
print " Server: #{server} First: #{first} Last: #{last}\n"
puts " Server: #{server} First: #{first} Last: #{last}"
end
# clean up old newsrc entries
if @connections[server]["first"] > 0
@ -270,7 +270,7 @@ def get_articles(cachedir=false)
@connections[server]["newsrc"].save
end
else
print " First article has higher number than last article on server #{server}.\n"
puts " First article has higher number than last article on server #{server}."
del_server(server)
end
end
@ -294,18 +294,18 @@ def get_articles(cachedir=false)
end
for server in @connections.keys
print " reading articles from server: #{server}\n"
puts " reading articles from server: #{server}"
range = Set::IntSpan.new("#{@connections[server]["first"]}-#{@connections[server]["last"]}")
rangelist = rechunk_runlist(range.diff(@connections[server]["skip_ids"]).run_list)
print "rangelist: #{rangelist}\n" if Debuglevel > 2
print "rangelist: #{rangelist.class.to_s}\n" if Debuglevel > 2
print "rangelist elements: #{range.diff(@connections[server]["skip_ids"]).elements}\n" if Debuglevel > 2
puts "rangelist: #{rangelist}" if Debuglevel > 2
puts "rangelist: #{rangelist.class.to_s}" if Debuglevel > 2
puts "rangelist elements: #{range.diff(@connections[server]["skip_ids"]).elements}" if Debuglevel > 2
begin
unless rangelist == nil or rangelist =~ /^$/
for i in rangelist.split(',')
print "i: #{i}\n" if Debuglevel > 2
puts "i: #{i}" if Debuglevel > 2
begin
# resp, xover_lines = get_xover(server, i)
resp, subj_lines = get_xhdr(server, i, "subject")
@ -327,21 +327,21 @@ def get_articles(cachedir=false)
subj_lines.collect{|x|
art[x[0]] = {} unless art.has_key?(x[0])
art[x[0]]["subject"] = x[1]
print "art id: #{x[0]} subj: #{x[1]}\n" if Debuglevel > 2
puts "art id: #{x[0]} subj: #{x[1]}" if Debuglevel > 2
}
messid_lines.collect{|x|
art[x[0]] = {} unless art.has_key?(x[0])
art[x[0]]["messid"] = x[1]
print "art id: #{x[0]} messid: #{x[1]}\n" if Debuglevel > 2
puts "art id: #{x[0]} messid: #{x[1]}" if Debuglevel > 2
}
from_lines.collect{|x|
art[x[0]] = {} unless art.has_key?(x[0])
art[x[0]]["from"] = x[1]
print "art id: #{x[0]} from: #{x[1]}\n" if Debuglevel > 2
puts "art id: #{x[0]} from: #{x[1]}" if Debuglevel > 2
}
for id in art.keys
if art[id].has_key?("subject") and art[id].has_key?("messid") and art[id].has_key?("from")
print "adding: #{art[id]["messid"]}, #{id}, #{server}, #{art[id]["from"]}, #{art[id]["subject"]}\n" if Debuglevel > 2
puts "adding: #{art[id]["messid"]}, #{id}, #{server}, #{art[id]["from"]}, #{art[id]["subject"]}" if Debuglevel > 2
# @newids[server][id.to_i] = true
# dit wellicht alleen doen indien preselector hem uitkiest
# en anders een leuk regeltje aan de cache toevoegen,
@ -409,11 +409,11 @@ def get_xhdr(server, range, header)
puts "getting headers: #{header}, #{range}" if Debuglevel > 1
resp, lines = @connections[server]["nntp"].xhdr(header, range)
if resp.to_i == 500
print "xhdr not implemented\n"
print "Error: #{$!}\n"
puts "xhdr not implemented"
puts "Error: #{$!}"
end
unless resp.to_i >= 200 and resp.to_i < 300
print "got response #{resp} while reading group #{@group} from #{server}\n"
puts "got response #{resp} while reading group #{@group} from #{server}"
raise TempError
end
rescue Net::NNTPReplyError
@ -423,7 +423,7 @@ def get_xhdr(server, range, header)
get_group_info(server)
retry
else
print "Won't handle this... yet :(\n"
puts "Won't handle this... yet :("
end
rescue Errno::EPIPE, Errno::ECONNRESET, EOFError
printerr(server)
@ -434,7 +434,7 @@ def get_xhdr(server, range, header)
end
return resp, lines
rescue TimeoutError
print "Time out, reconnecting to server (get_xhdr)\n"
puts "Time out, reconnecting to server (get_xhdr)"
timedout += 1
raise PermError, "Too many timeouts! (get_xhdr)" if timedout > 1
reconnect(server)
@ -455,14 +455,14 @@ def get_xover(server, range)
timeout(180) do
begin
p Time.now if Debuglevel > 1
print "getting headers: #{range}\n" if Debuglevel > 1
puts "getting headers: #{range}" if Debuglevel > 1
resp, lines = @connections[server]["nntp"].xover(start, ed)
if resp.to_i == 500
print "xover not implemented\n"
print "Error: #{$!}\n"
puts "xover not implemented"
puts "Error: #{$!}"
end
unless resp.to_i >= 200 and resp.to_i < 300
print "got response #{resp} while reading group #{@group} from #{server}\n"
puts "got response #{resp} while reading group #{@group} from #{server}"
raise TempError
end
rescue Net::NNTPReplyError
@ -472,7 +472,7 @@ def get_xover(server, range)
get_group_info(server)
retry
else
print "Won't handle this... yet :(\n"
puts "Won't handle this... yet :("
end
rescue Errno::EPIPE, Errno::ECONNRESET, EOFError
printerr(server)
@ -483,7 +483,7 @@ def get_xover(server, range)
end
return resp, lines
rescue TimeoutError
print "Time out, reconnecting to server (get_xover)\n"
puts "Time out, reconnecting to server (get_xover)"
timedout += 1
raise PermError, "Too many timeouts! (get_xover)" if timedout > 1
reconnect(server)
@ -532,7 +532,7 @@ def get_body(server, message)
end
return resp, id, messid, list
rescue TimeoutError, Errno::ETIMEDOUT
print "Time out, reconnecting to server (get_body)\n"
puts "Time out, reconnecting to server (get_body)"
timedout += 1
raise PermError, "Too many timeouts! (get_body)" if timedout > 1
reconnect(server)
@ -549,13 +549,13 @@ def get_group_body(subj)
return false if @groups[subj]["messageinfo"] == nil
for i in (0...@groups[subj]["messageinfo"].length)
unless @gotten.has_key?(@groups[subj]["messageinfo"][i][:messid])
print "getting article: #{i}\n" if Debuglevel > 1
print "getting article: #{subj}\n" if Debuglevel > 1
print "full subject: #{@groups[subj]["messageinfo"][i][:subject]}\n" if Debuglevel > 0
print "message id: #{@groups[subj]["messageinfo"][i][:messid]}\n" if Debuglevel > 1
print "id: #{@groups[subj]["messageinfo"][i][:id]}\n" if Debuglevel > 1
print "from: #{@groups[subj]["messageinfo"][i][:from]}\n" if Debuglevel > 1
print "server: #{@groups[subj]["messageinfo"][i][:server]}\n" if Debuglevel > 0
puts "getting article: #{i}" if Debuglevel > 1
puts "getting article: #{subj}" if Debuglevel > 1
puts "full subject: #{@groups[subj]["messageinfo"][i][:subject]}" if Debuglevel > 0
puts "message id: #{@groups[subj]["messageinfo"][i][:messid]}" if Debuglevel > 1
puts "id: #{@groups[subj]["messageinfo"][i][:id]}" if Debuglevel > 1
puts "from: #{@groups[subj]["messageinfo"][i][:from]}" if Debuglevel > 1
puts "server: #{@groups[subj]["messageinfo"][i][:server]}" if Debuglevel > 0
resp = false
while resp == false
if @serverlist.include?(@groups[subj]["messageinfo"][i][:server])
@ -565,13 +565,13 @@ def get_group_body(subj)
end
if resp == false
if Debuglevel > 1
print "mess-id i: #{@groups[subj]["messageinfo"][i][:messid]}\n"
puts "mess-id i: #{@groups[subj]["messageinfo"][i][:messid]}"
# XXX dit moet netter kunnen
print "mess-id i+1: #{@groups[subj]["messageinfo"][i+1][:messid]}\n" if @groups[subj]["messageinfo"][i+1] != nil
puts "mess-id i+1: #{@groups[subj]["messageinfo"][i+1][:messid]}" if @groups[subj]["messageinfo"][i+1] != nil
end
if (i+1 < @groups[subj]["messageinfo"].length) and
(@groups[subj]["messageinfo"][i][:messid] == @groups[subj]["messageinfo"][i+1][:messid])
print " Trying next server...\n"
puts " Trying next server..."
i += 1
else
raise TempError, " Message-id not on another server"
@ -595,22 +595,22 @@ def get_group_body_first(subj)
end
p "komt wel door lame check heen"
while @gotten.has_key?(@groups[subj]["messageinfo"][0][:messid]) == false
print "getting article: #{subj}\n" if Debuglevel > 0
print "full subject: #{@groups[subj]['messageinfo'][0][:subject]}\n" if Debuglevel > 0
print "message id: #{@groups[subj]['messageinfo'][i][:messid]}\n" if Debuglevel > 1
print "id: #{@groups[subj]['messageinfo'][i][:id]}\n" if Debuglevel > 1
print "from: #{@groups[subj]['messageinfo'][i][:from]}\n" if Debuglevel > 1
print "server: #{@groups[subj]['messageinfo'][0][:server]}\n" if Debuglevel > 0
puts "getting article: #{subj}" if Debuglevel > 0
puts "full subject: #{@groups[subj]['messageinfo'][0][:subject]}" if Debuglevel > 0
puts "message id: #{@groups[subj]['messageinfo'][i][:messid]}" if Debuglevel > 1
puts "id: #{@groups[subj]['messageinfo'][i][:id]}" if Debuglevel > 1
puts "from: #{@groups[subj]['messageinfo'][i][:from]}" if Debuglevel > 1
puts "server: #{@groups[subj]['messageinfo'][0][:server]}" if Debuglevel > 0
resp = false
while resp == false
resp, id, messid, list = get_body(@groups[subj]["messageinfo"][i][:server], @groups[subj]["messageinfo"][i][:messid])
if resp == false
print "mess-id i: #{@groups[subj]['messageinfo'][i][:messid]}\n"
puts "mess-id i: #{@groups[subj]['messageinfo'][i][:messid]}"
# XXX dit moet netter kunnen
print "mess-id i+1: #{@groups[subj]['messageinfo'][i+1][:messid]}\n" if @groups[subj]["messageinfo"][i+1] != nil
puts "mess-id i+1: #{@groups[subj]['messageinfo'][i+1][:messid]}" if @groups[subj]["messageinfo"][i+1] != nil
if (i+1 < @groups[subj]["messageinfo"].length) and
(@groups[subj]["messageinfo"][i][:messid] == @groups[subj]["messageinfo"][i+1][:messid])
print "Trying next server...\n"
puts "Trying next server..."
i += 1
else
raise TempError, "Message-id not on another server"
@ -627,23 +627,23 @@ def get_group_body_rest(subj, file=nil)
result = []
for i in (1...@groups[subj]["messageinfo"].length)
unless @gotten.has_key?(@groups[subj]["messageinfo"][i][:messid])
print "getting article: #{i}\n" if Debuglevel > 1
print "getting article: #{subj}\n" if Debuglevel > 1
print "full subject: #{@groups[subj]['messageinfo'][i][:subject]}\n" if Debuglevel > 0
print "message id: #{@groups[subj]['messageinfo'][i][:messid]}\n" if Debuglevel > 1
print "id: #{@groups[subj]['messageinfo'][i][:id]}\n" if Debuglevel > 1
print "server: #{@groups[subj]['messageinfo'][i][:server]}\n" if Debuglevel > 0
puts "getting article: #{i}" if Debuglevel > 1
puts "getting article: #{subj}" if Debuglevel > 1
puts "full subject: #{@groups[subj]['messageinfo'][i][:subject]}" if Debuglevel > 0
puts "message id: #{@groups[subj]['messageinfo'][i][:messid]}" if Debuglevel > 1
puts "id: #{@groups[subj]['messageinfo'][i][:id]}" if Debuglevel > 1
puts "server: #{@groups[subj]['messageinfo'][i][:server]}" if Debuglevel > 0
resp = false
while resp == false
resp, id, messid, list = get_body(@groups[subj]["messageinfo"][i][:server], @groups[subj]["messageinfo"][i][:messid])
if resp == false
print "mess-id i: #{@groups[subj]["messageinfo"][i][:messid]}\n"
puts "mess-id i: #{@groups[subj]["messageinfo"][i][:messid]}"
# print "mess-id i+1: #{@groups[subj]["messageinfo"][i+1][:messid]}\n"
# XXX dit moet netter kunnen
print "mess-id i+1: #{@groups[subj]["messageinfo"][i+1][:messid]}\n" if @groups[subj]["messageinfo"][i+1] != nil
puts "mess-id i+1: #{@groups[subj]["messageinfo"][i+1][:messid]}" if @groups[subj]["messageinfo"][i+1] != nil
if (i+1 < @groups[subj]["messageinfo"].length) and
(@groups[subj]["messageinfo"][i][:messid] == @groups[subj]["messageinfo"][i+1][:messid])
print "Trying next server...\n"
puts "Trying next server..."
i += 1
else
raise TempError, "Message-id not on another server"
@ -737,7 +737,7 @@ end
def group_subjects
@groups = {}
for i in (0...@messageinfo.length)
print "group subjects: #{i} #{@messageinfo[i][:subject]}\n" if Debuglevel > 3
puts "group subjects: #{i} #{@messageinfo[i][:subject]}" if Debuglevel > 3
# misschien is het wel belangrijk dat er voorkeuren in deze
# match zitten... geen idee
if @messageinfo[i][:subject] =~ /(.*)\((\d+)\/(\d+)\)(.*)/ || @messageinfo[i][:subject] =~ /(.*)\[(\d+)\/(\d+)\](.*)/
@ -799,7 +799,7 @@ end
def cache_check(cachedir)
if ! FileTest.exists?(cachedir)
print "Cachedir '#{cachedir}' doesn't exists, performance will suffer\n"
puts "Cachedir '#{cachedir}' doesn't exists, performance will suffer"
end
end
@ -835,9 +835,9 @@ puts " #{Time.now} Reading cache for #{server}"
end
}
if ( File.move("#{filename}.#{server}.new", "#{filename}.#{server}") )
print " #{Time.now} Cache scrubbed for #{server}\n"
puts " #{Time.now} Cache scrubbed for #{server}"
else
print "Couldn't scrub #{server} cache\n"
puts "Couldn't scrub #{server} cache"
end
end
end
@ -850,7 +850,7 @@ def cache_save(cachedir, server)
#p Time.now
filename = "#{cachedir}/#{@group}.ripnewscache"
if FileTest.directory?( cachedir )
file = File.new( "#{filename}.#{server}", "a+" ) or print "couldn't open cachefile for writing\n"
file = File.new( "#{filename}.#{server}", "a+" ) or puts "couldn't open cachefile for writing"
# print "Updating cache...\n"
@cache_buf[server].sort!
file.print @cache_buf[server]
@ -912,10 +912,10 @@ def group_subject_sort(subj)
sort_arr = []
#p "pre sort length: #{@groups[subj]['messageinfo'].length}"
for i in (0...@groups[subj]["messageinfo"].length)
print "subj sort #{@groups[subj]['messageinfo'][i][:subject]}\n" if Debuglevel > 2
print "subj sort #{@groups[subj]['messageinfo'][i][:messid]}\n" if Debuglevel > 2
print "subj sort #{@groups[subj]['messageinfo'][i][:id]}\n" if Debuglevel > 2
print "subj sort #{@groups[subj]['messageinfo'][i][:server]}\n" if Debuglevel > 2
puts "subj sort #{@groups[subj]['messageinfo'][i][:subject]}" if Debuglevel > 2
puts "subj sort #{@groups[subj]['messageinfo'][i][:messid]}" if Debuglevel > 2
puts "subj sort #{@groups[subj]['messageinfo'][i][:id]}" if Debuglevel > 2
puts "subj sort #{@groups[subj]['messageinfo'][i][:server]}" if Debuglevel > 2
sort_arr.push(
@groups[subj]["messageinfo"][i].dup
) if serverhash[@groups[subj]["messageinfo"][i][:server]] != nil
@ -926,11 +926,11 @@ def group_subject_sort(subj)
sort_arr.sort!{|a,b|
r = ward_sort(a[:subject], b[:subject])
if serverhash[a[:server]] == nil or serverhash[b[:server]] == nil
print "serverhash[a[:server]]: #{serverhash[a[:server]]}\n"
print "serverhash[b[:server]]: #{serverhash[b[:server]]}\n"
print "a[:server]: #{a[:server]}\n"
print "b[:server]: #{a[:server]}\n"
print "strange things going on here...\n"
puts "serverhash[a[:server]]: #{serverhash[a[:server]]}"
puts "serverhash[b[:server]]: #{serverhash[b[:server]]}"
puts "a[:server]: #{a[:server]}"
puts "b[:server]: #{a[:server]}"
puts "strange things going on here..."
end
if r == 0
r = serverhash[a[:server]] <=> serverhash[b[:server]]
@ -948,8 +948,8 @@ def group_subject_sort(subj)
else
@groups[subj]["messageinfo"] = [ i ]
end
print "subject sort: #{i[:subject]}\n" if Debuglevel > 2
print "server: #{i[:server]}\n" if Debuglevel > 2
puts "subject sort: #{i[:subject]}" if Debuglevel > 2
puts "server: #{i[:server]}" if Debuglevel > 2
}
#if ! @groups[subj]['messageinfo'].nil?
# p "post sort length: #{@groups[subj]['messageinfo'].length}"
@ -1003,8 +1003,8 @@ def rechunk_runlist(runlist)
end
def printerr(server)
print "Caught #{$!.class} reading from server #{server} (#{caller[0]})\n"
print "Error: #{$!}\n"
puts "Caught #{$!.class} reading from server #{server} (#{caller[0]})"
puts "Error: #{$!}"
end
def disconnect