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

ver-ruby-en

Browse source
This commit is contained in:
Ward Wouts 2008-02-06 13:11:57 +00:00
parent 122770bf2c
commit 2747b95b18
2 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -211,14 +211,14 @@ def memusage
# for i in local_variables
# print "#{i}\n"
# end
for i in self.instance_variables
self.instance_variables.each{|i|
puts i
print "X: "
begin
puts self.instance_eval(i).size
rescue NoMethodError
end
end
}
end
def set_preselect_pattern(regexp)
@ -249,7 +249,7 @@ def get_articles(cachedir=false)
if cachedir != false
cache_check(cachedir)
end
for server in @connections.keys
@connections.keys.each{|server|
begin
first, last = get_group_info(server)
rescue PermError
@ -273,12 +273,12 @@ def get_articles(cachedir=false)
puts " First article has higher number than last article on server #{server}."
del_server(server)
end
end
}
cache_read(cachedir)
# spul dat echt te oud is gaat nooit gevuld worden, dus doe ook geen poging het op te halen
# wil wel wat ophalen aangezien logging aantoont dat er wel oudere articles gedownload worden
for server in @connections.keys
@connections.keys.each{|server|
if @connections[server]["skip_ids"].max && @connections[server]["skip_ids"].max < @connections[server]["last"]
articles = @connections[server]["last"] - @connections[server]["first"]
if articles > 10000
@ -291,9 +291,9 @@ def get_articles(cachedir=false)
# p "filling #{@connections[server]["skip_ids"].min}-#{fillerend}"
end
end
end
}
for server in @connections.keys
@connections.keys.each{|server|
puts " reading articles from server: #{server}"
range = Set::IntSpan.new("#{@connections[server]["first"]}-#{@connections[server]["last"]}")
@ -304,7 +304,7 @@ def get_articles(cachedir=false)
puts "rangelist elements: #{range.diff(@connections[server]["skip_ids"]).elements}" if Debuglevel > 2
begin
unless rangelist == nil or rangelist =~ /^$/
for i in rangelist.split(',')
rangelist.split(',').each{|i|
puts "i: #{i}" if Debuglevel > 2
begin
# resp, xover_lines = get_xover(server, i)
@ -339,7 +339,7 @@ def get_articles(cachedir=false)
art[x[0]]["from"] = x[1]
puts "art id: #{x[0]} from: #{x[1]}" if Debuglevel > 2
}
for id in art.keys
art.keys.each{|id|
if art[id].has_key?("subject") and art[id].has_key?("messid") and art[id].has_key?("from")
puts "adding: #{art[id]["messid"]}, #{id}, #{server}, #{art[id]["from"]}, #{art[id]["subject"]}" if Debuglevel > 2
# @newids[server][id.to_i] = true
@ -351,15 +351,15 @@ def get_articles(cachedir=false)
end
cache_add(cachedir, id, art[id]["messid"], art[id]["from"], art[id]["subject"], server)
end
end
end
}
}
end
rescue PermError
del_server(server)
next
end
cache_save(cachedir, server)
end
}
GC.start
end
@ -547,7 +547,7 @@ def get_group_body(subj)
group_subject_sort(subj)
# puts @groups[subj].to_yaml
return false if @groups[subj]["messageinfo"] == nil
for i in (0...@groups[subj]["messageinfo"].length)
(0...@groups[subj]["messageinfo"].length).each{|i|
unless @gotten.has_key?(@groups[subj]["messageinfo"][i][:messid])
puts "getting article: #{i}" if Debuglevel > 1
puts "getting article: #{subj}" if Debuglevel > 1
@ -581,7 +581,7 @@ def get_group_body(subj)
@gotten[ @groups[subj]["messageinfo"][i][:messid] ] = true
result = list
end
end
}
return result
end
@ -625,7 +625,7 @@ end
def get_group_body_rest(subj, file=nil)
#p "get_group_body_rest"
result = []
for i in (1...@groups[subj]["messageinfo"].length)
(1...@groups[subj]["messageinfo"].length).each{|i|
unless @gotten.has_key?(@groups[subj]["messageinfo"][i][:messid])
puts "getting article: #{i}" if Debuglevel > 1
puts "getting article: #{subj}" if Debuglevel > 1
@ -657,7 +657,7 @@ def get_group_body_rest(subj, file=nil)
result.concat(list)
end
end
end
}
return result
end
@ -736,7 +736,7 @@ end
def group_subjects
@groups = {}
for i in (0...@messageinfo.length)
(0...@messageinfo.length).each{|i|
puts "group subjects: #{i} #{@messageinfo[i][:subject]}" if Debuglevel > 3
# misschien is het wel belangrijk dat er voorkeuren in deze
# match zitten... geen idee
@ -757,7 +757,7 @@ def group_subjects
@groups[j]["total"] = total
@groups[j]["messageinfo"] = [ (@messageinfo[i]) ]
end
end
}
@grouped = true
end
@ -771,19 +771,19 @@ def set_skip_ids(server, ids)
end
def group_update_newsrc(subject)
for i in (0...@groups[subject]["messageinfo"].length)
(0...@groups[subject]["messageinfo"].length).each{|i|
if @connections[@groups[subject]["messageinfo"][i][:server]]
@connections[@groups[subject]["messageinfo"][i][:server]]["newsrc"].mark(@group, @groups[subject]["messageinfo"][i][:id])
#p @group
#p @groups[subject]["messageinfo"][i][:id]
end
end
}
end
def save_newsrc()
for server in @connections.keys
@connections.keys.each{|server|
@connections[server]["newsrc"].save
end
}
end
def cache_add(cachedir, id, messid, from, subject, server)
@ -808,7 +808,7 @@ puts "#{Time.now} Reading & scrubbing caches"
filename = "#{cachedir}/#{@group}.ripnewscache"
excludes = {}
regexp = Regexp.new('^([^\|]*)\|([^\|]*)\|([^\|]*)\|(.*)')
for server in @connections.keys
@connections.keys.each{|server|
first = @connections[server]["first"]
last = @connections[server]["last"]
#cache_scrub(cachedir, server)
@ -840,7 +840,7 @@ puts " #{Time.now} Reading cache for #{server}"
puts "Couldn't scrub #{server} cache"
end
end
end
}
puts "#{Time.now} Caches read"
#memusage
end
@ -889,13 +889,13 @@ end
# a base64 decoder...
def decode64(str)
string = ''
for line in str.split("\n")
str.split("\n").each{|line|
line.delete!('^A-Za-z0-9+') # remove non-base64 chars
line.tr!('A-Za-z0-9+', ' -_') # convert to uuencoded format
len = ["#{32 + line.length * 3 / 4}"].pack("c")
# compute length byte
string += "#{len}#{line}".unpack("u") # uudecode and concatenate
end
}
return string
end
@ -905,13 +905,13 @@ def group_subject_sort(subj)
# XXX Waarom gebruik ik hier eigenlijk sort_arr ipv in place sorting?
#print "Sorting articles\n"
serverhash = {}
for i in (0...@serverlist.length)
(0...@serverlist.length).each{|i|
serverhash[@serverlist[i]] = i
end
}
total = @groups[subj]["total"]
sort_arr = []
#p "pre sort length: #{@groups[subj]['messageinfo'].length}"
for i in (0...@groups[subj]["messageinfo"].length)
(0...@groups[subj]["messageinfo"].length).each{|i|
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
@ -919,7 +919,7 @@ def group_subject_sort(subj)
sort_arr.push(
@groups[subj]["messageinfo"][i].dup
) if serverhash[@groups[subj]["messageinfo"][i][:server]] != nil
end
}
#p "sort_arr length pre sort: #{sort_arr.length}"
if sort_arr.length != 0
@ -1008,12 +1008,12 @@ def printerr(server)
end
def disconnect
for server in @connections.keys
@connections.keys.each{|server|
begin
@connections[server]["nntp"].quit
rescue Errno::EPIPE, Errno::ECONNRESET, EOFError, IOError
end
end
}
end
def quit

24
trunk/ripnews/news/newsrc.rb
View file

@ -51,9 +51,9 @@ def import_rc(lines)
@newsrc["group"] = {}
@newsrc["list"] = []
linenumber = 1
for line in lines
lines.each{|line|
parse(line)
end
}
end
def parse(line)
@ -102,9 +102,9 @@ def save_as(file)
exit
end
@newsrc["file"] = file
for group in @newsrc["list"]
@newsrc["list"].each{|group|
newsrc.print format(group)
end
}
newsrc.close
end
@ -136,13 +136,13 @@ def save_group_as(file, group)
newsrc.rewind
# write read stuff & replace group
for line in lines
lines.each{|line|
if line =~ /^#{group}(:|!)/
newsrc.print line
else
newsrc.print format(group)
end
end
}
newsrc.flock(File::LOCK_UN) # what's the right order here?
newsrc.close
@ -226,20 +226,20 @@ end
def alpha (group)
name = group["name"]
for i in (0...@newsrc["list"].length)
(0...@newsrc["list"].length).each{|i|
if ((name <=> @newsrc["list"][i]["name"]) == -1)
upper = @newsrc["list"].slice!(i..@newsrc["list"].length)
@newsrc["list"].push(group)
@newsrc["list"].push(upper)
return;
end
end
}
@newsrc["list"].push(group)
end
def before(group, before)
name = group["name"]
for i in (0...@newsrc["list"].length)
(0...@newsrc["list"].length).each{|i|
if (@newsrc["list"][i]["name"] == before.to_s)
upper = @newsrc["list"].slice!(i..@newsrc["list"].length)
@newsrc["list"].push(group)
@ -247,7 +247,7 @@ def before(group, before)
return;
end
end
}
@newsrc["list"].push(group)
end
@ -255,14 +255,14 @@ end
def after(group, after)
name = group["name"]
for i in (0...@newsrc["list"].length)
(0...@newsrc["list"].length).each{|i|
if (@newsrc["list"][i]["name"] == after.to_s)
upper = @newsrc["list"].slice!((i+1)..@newsrc["list"].length)
@newsrc["list"].push(group)
@newsrc["list"].push(upper)
return;
end
end
}
@newsrc["list"].push(group)
end