lib/rrimm/config.rb in rrimm-0.9.0 vs lib/rrimm/config.rb in rrimm-0.11.0
- old
+ new
@@ -20,37 +20,44 @@
def get_cache
@cache
end
- def show(ios)
+ def show(ios, category=nil)
ios.write "Cache: #{@cache.name}\n"
ios.write " path: #{@cache.path}\n" unless @cache.path.eql? @cache.name
ios.write "Default formatter: #{default_formatter}\n" if default_formatter
ios.write "Feeds:\n"
- @feeds.values.group_by { |f| f.category }.map do |cat, feeds|
+ @feeds.values.
+ group_by { |f| f.category }.
+ select { |cat, feeds| category.nil? || cat == category }.
+ map do |cat, feeds|
ios.write "#{cat || "unamed category"}:\n"
feeds.each do |feed|
fqdn = [feed.name, feed.uri].uniq
ios.write "- #{fqdn.join ': '}\n"
end
end
end
- def status(ios, old_timestamp, very_old_timestamp, display_old_only)
- @feeds.values.map { |f| [ Time.at(get_cache.read(f)), f] }.sort_by { |el| el.first }.each do |el|
- date, f = el
- case date.to_i
- when 0..very_old_timestamp
- ios.write "#{date} #{f.name}\n".red
- when very_old_timestamp..old_timestamp
- ios.write "#{date} #{f.name}\n".yellow
- else
- ios.write "#{date} #{f.name}\n".green unless display_old_only
+ def status(ios, old_timestamp, very_old_timestamp, display_old_only, category=nil)
+ @feeds.values.
+ select { |f| category.nil? || f.category == category }.
+ map { |f| [ Time.at(get_cache.read(f)), f] }.
+ sort_by { |el| el.first }.
+ each do |el|
+ date, f = el
+ case date.to_i
+ when 0..very_old_timestamp
+ ios.write "#{date} #{f.name}\n".red
+ when very_old_timestamp..old_timestamp
+ ios.write "#{date} #{f.name}\n".yellow
+ else
+ ios.write "#{date} #{f.name}\n".green unless display_old_only
+ end
end
- end
end
def evaluate_feed_definition(feed_name, &block)
#this allow to redefine feeds if necessary
existing_feed = @feeds[feed_name]