X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fquotes.rb;h=6851b65f2f2c0ff83b463482d5450a300ad2f728;hb=42045b5df29519cb4307ac433c6fd0d4ba5f157b;hp=4695fa100472e30bf83e0bbd9879350bb133ab9f;hpb=bca160cbbf64aeb56fb6729f2ea4d77e5821a31c;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/data/rbot/plugins/quotes.rb b/data/rbot/plugins/quotes.rb index 4695fa10..6851b65f 100644 --- a/data/rbot/plugins/quotes.rb +++ b/data/rbot/plugins/quotes.rb @@ -1,11 +1,12 @@ # GB: Ok, we *really* need to switch to db for this plugin too -Quote = Struct.new("Quote", :num, :date, :source, :quote) unless defined?(Quote) +Quote = Struct.new("Quote", :num, :date, :source, :quote) class QuotePlugin < Plugin def initialize super @lists = Hash.new + @changed = Hash.new Dir["#{@bot.botclass}/quotes/*"].each {|f| next if File.directory?(f) channel = File.basename(f) @@ -16,22 +17,24 @@ class QuotePlugin < Plugin @lists[channel][num] = Quote.new(num, $2, $3, $4) end } + @changed[channel] = false } end def save Dir.mkdir("#{@bot.botclass}/quotes") if(!FileTest.directory?("#{@bot.botclass}/quotes")) - Dir.mkdir("#{@bot.botclass}/quotes/new") if(!FileTest.directory?("#{@bot.botclass}/quotes/new")) @lists.each {|channel, quotes| begin - debug "Writing new quotefile for channel #{channel} ..." - File.open("#{@bot.botclass}/quotes/new/#{channel}", "w") {|file| - quotes.compact.each {|q| - file.puts "#{q.num} | #{q.date} | #{q.source} | #{q.quote}" + if @changed[channel] + debug "Writing new quotefile for channel #{channel} ..." + Utils.safe_save("#{@bot.botclass}/quotes/#{channel}") {|file| + quotes.compact.each {|q| + file.puts "#{q.num} | #{q.date} | #{q.source} | #{q.quote}" + } } - } - debug "Officializing quotefile for channel #{channel} ..." - File.rename("#{@bot.botclass}/quotes/new/#{channel}", - "#{@bot.botclass}/quotes/#{channel}") + @changed[channel] = false + else + debug "Not writing quotefile for channel #{channel} (unchanged)" + end rescue => e error "failed to write quotefile for channel #{channel}!\n#{$!}" error "#{e.class}: #{e}" @@ -39,10 +42,15 @@ class QuotePlugin < Plugin end } end + def cleanup + @lists.clear + @changed.clear + end def addquote(source, channel, quote) @lists[channel] = Array.new if(!@lists.has_key?(channel)) num = @lists[channel].length - @lists[channel][num] = Quote.new(num, Time.new, source, quote) + @lists[channel][num] = Quote.new(num, Time.new, source.fullform, quote) + @changed[channel] = true return num end def getquote(source, channel, num=nil) @@ -64,6 +72,7 @@ class QuotePlugin < Plugin if(@lists[channel][num]) @lists[channel][num] = nil @lists[channel].pop if num == @lists[channel].length - 1 + @changed[channel] = true return true end return false @@ -238,12 +247,12 @@ class QuotePlugin < Plugin case command when (/^addquote\s+(.+)/) if(@bot.auth.allow?("addquote", m.source, m.replyto)) - num = addquote(m.source, m.target, $1) + num = addquote(m.source, m.target.to_s, $1) m.reply "added the quote (##{num})" end when (/^getquote$/) if(@bot.auth.allow?("getquote", m.source, m.replyto)) - quote, total = getquote(m.source, m.target) + quote, total = getquote(m.source, m.target.to_s) if(quote) m.reply "[#{quote.num}] #{quote.quote}" else @@ -253,7 +262,7 @@ class QuotePlugin < Plugin when (/^getquote\s+(\d+)$/) num = $1.to_i if(@bot.auth.allow?("getquote", m.source, m.replyto)) - quote, total = getquote(m.source, m.target, num) + quote, total = getquote(m.source, m.target.to_s, num) if(quote) m.reply "[#{quote.num}] #{quote.quote}" else @@ -263,7 +272,7 @@ class QuotePlugin < Plugin when (/^whenquote\s+(\d+)$/) num = $1.to_i if(@bot.auth.allow?("getquote", m.source, m.replyto)) - quote, total = getquote(m.source, m.target, num) + quote, total = getquote(m.source, m.target.to_s, num) if(quote) m.reply "quote #{quote.num} added on #{quote.date}" else @@ -273,7 +282,7 @@ class QuotePlugin < Plugin when (/^whoquote\s+(\d+)$/) num = $1.to_i if(@bot.auth.allow?("getquote", m.source, m.replyto)) - quote, total = getquote(m.source, m.target, num) + quote, total = getquote(m.source, m.target.to_s, num) if(quote) m.reply "quote #{quote.num} added by #{quote.source}" else @@ -282,7 +291,7 @@ class QuotePlugin < Plugin end when (/^topicquote$/) if(@bot.auth.allow?("topicquote", m.source, m.replyto)) - quote, total = getquote(m.source, m.target) + quote, total = getquote(m.source, m.target.to_s) if(quote) @bot.topic m.target, "[#{quote.num}] #{quote.quote}" else @@ -292,7 +301,7 @@ class QuotePlugin < Plugin when (/^topicquote\s+(\d+)$/) num = $1.to_i if(@bot.auth.allow?("topicquote", m.source, m.replyto)) - quote, total = getquote(m.source, m.target, num) + quote, total = getquote(m.source, m.target.to_s, num) if(quote) @bot.topic m.target, "[#{quote.num}] #{quote.quote}" else @@ -302,7 +311,7 @@ class QuotePlugin < Plugin when (/^delquote\s+(\d+)$/) num = $1.to_i if(@bot.auth.allow?("delquote", m.source, m.replyto)) - if(delquote(m.target, num)) + if(delquote(m.target.to_s, num)) m.okay else m.reply "quote not found!" @@ -311,7 +320,7 @@ class QuotePlugin < Plugin when (/^searchquote\s+(.*)$/) reg = $1 if(@bot.auth.allow?("getquote", m.source, m.replyto)) - quote, total = searchquote(m.source, m.target, reg) + quote, total = searchquote(m.source, m.target.to_s, reg) if(quote) m.reply "[#{quote.num}] #{quote.quote}" else @@ -321,7 +330,7 @@ class QuotePlugin < Plugin when (/^countquote(?:\s+(.*))?$/) reg = $1 if(@bot.auth.allow?("getquote", m.source, m.replyto)) - total = countquote(m.source, m.target, reg) + total = countquote(m.source, m.target.to_s, reg) if(reg && reg.length > 0) m.reply "#{total} quotes match: #{reg}" else