Project

General

Profile

« Previous | Next » 

Revision 3d7bbe55

Added by Marc Dequènes almost 14 years ago

  • ID 3d7bbe55cb6110cbe884ce7c45db045849a2be38

[evol] improved Order classes a lot (closes #101)

View differences:

lib/cyborghood/mail_order.rb
require 'cyborghood/order'
module CyborgHood
class MailOrder < Order
def self.parse(user, message)
class MailOrderParser < OrderParser
def parse(message)
logger.debug "Parsing Mail"
# analyse mail parts
order_txt = nil
shared_parameters = nil
if message.multipart?
if message.parts[0].content_type == "text/plain"
order_txt = message.parts[0].body
shared_parameters = {}
i = -1
message.parts.each do |part|
i += 1
next if i == 0
next if i == 0
shared_parameters[i] = SharedParameter.new(part.body, part.content_type)
filename = part.header['content-disposition'].params['filename'] || part.header['content-type'].params['name']
@shared_parameters[i] = CommandParameter.new(part.body, part.content_type)
shared_parameters[filename] = ParameterReference.new(i) if filename
filename = part.header['content-disposition'].params['filename'] || part.header['content-type'].params['name']
@shared_parameters[filename] = CommandParameterRef.new(i) if filename
end
end
else
order_txt = message.body if message.content_type == "text/plain"
shared_parameters = {}
end
return new(:error => _("Mail does not contain a proper text part for commands."), :user => user) if order_txt.nil?
return Order.new(:error => _("Mail does not contain a proper text part for commands."), :user => @user) if order_txt.nil?
# find command lines
command_lines = order_txt.split("\n")
# remove message signature
signature_pos = command_lines.index("-- ")
command_lines.slice!(signature_pos..-1) if signature_pos
super(user, command_lines, shared_parameters) do |word, errors, used_refs|
# generic parsing
super(command_lines) do |word, errors|
if word =~ /^@([a-zA-Z0-9._-]+)$/
ref = $1
param = ParameterReference.new(ref)
d_ref, d_param = dereference_param(shared_parameters, param)
ref = ref.is_numeric? ? ref.to_i : ref
d_ref, d_param = deref_param(ref)
if d_ref.nil?
errors << _("Attachment '%{ref}' not found.", :ref => ref)
d_param = nil
else
used_refs << d_ref
@used_refs << d_ref
end
d_param
else
word
CommandParameter.new(word, 'text/plain')
end
end
end

Also available in: Unified diff