diff options
| -rw-r--r-- | lib/puke/core.rb | 14 | ||||
| -rw-r--r-- | lib/puke/server.rb | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/puke/core.rb b/lib/puke/core.rb index 4cbb0d5..23fb429 100644 --- a/lib/puke/core.rb +++ b/lib/puke/core.rb @@ -43,12 +43,13 @@ module Puke @gdbm.fetch("t#{tid}").split("\0") end - def mid?(mid) - @gdbm["m#{mid}"]&.split("\0")&.first + def tid_for(mid) + Puke.metadata(mid)&.fetch(:tid) end def metadata(mid) - tid, subject, date = @gdbm["m#{mid}"].split("\0") + data = @gdbm["m#{mid}"] or return + tid, subject, date = data.split("\0") { mid: mid, tid: tid.to_i, subject: subject, date: Time.rfc2822(date) } end @@ -64,10 +65,9 @@ module Puke # A mutex is used here in case two threads try to store the same message CreateMutex.synchronize { # File.exist?(fpath) is needed here because of the mangling... - if Puke.mid?(mid) or File.exist?(fpath) - existing = Puke.metadata(mid) - if (!tid || tid == existing[:tid]) && subject == existing[:subject] && - date == existing[:date] + if existing = Puke.metadata(mid) or File.exist?(fpath) + if existing && (!tid || tid == existing[:tid]) && + subject == existing[:subject] && date == existing[:date] raise "duplicate message" else # TODO: Oops, how to deal with this case? diff --git a/lib/puke/server.rb b/lib/puke/server.rb index 5149ffa..719b19d 100644 --- a/lib/puke/server.rb +++ b/lib/puke/server.rb @@ -52,7 +52,7 @@ EOF def mid(req, res) /\A\/(?<mid>.+@.+?)(?:\/(?<unya>\w+)\.mbox)?\z/ =~ req.path_info and - tid = Puke.mid?(mid) or (res.status = 404 and return) + tid = Puke.tid_for(mid) or (res.status = 404 and return) # NB: Puke::ConcatenatedIO is not really an IO object and # 'res.body.is_a?(IO)' returns false, leading the non-existent 'bytesize' # method to be called by WEBrick, unless chunked response is enabled. |