0002-formdata-ease-iteration-of-evolutions-parts-33186.patch

Benjamin Dauvergne, 09 novembre 2019 17:51

Voir les différences: en ligne côte à côte

Subject: [PATCH 2/3] formdata: ease iteration of evolutions parts (#33186)

 wcs/formdata.py      |  5 +++++
 wcs/formdef.py       |  7 +++----
 wcs/wf/attachment.py | 16 +++++++---------
 wcs/workflows.py     | 41 ++++++++++++++++-------------------------
 4 files changed, 31 insertions(+), 38 deletions(-)

                 field.feed_session(self.data.get(field.id),
                         self.data.get('%s_display' % field.id))
         def iter_evolution_parts(self):
             for evo in self.evolution or []:
                 for part in evo.parts or []:
                     yield part
         def __getattr__(self, attr):
             try:
                 return self.__dict__[attr]

                     for field_data in (formdata.data or {}).values() + (formdata.workflow_data or {}).values():
                         if is_upload(field_data):
                             yield field_data.get_filename()
                     for evolution in (formdata.evolution or []):
                         for part in (evolution.parts or []):
                             if is_attachment(part):
                                 yield part.filename
                     for part in formdata.iter_evolution_parts():
                         if is_attachment(part):
                             yield part.filename
             for user in publisher.user_class.select():
                 for field_data in (user.form_data or {}).values():
                     if is_upload(field_data):

         else:
             file_reference = None
         for evo in self.formdata.evolution:
             if evo.parts:
                 for p in evo.parts:
                     if not isinstance(p, AttachmentEvolutionPart):
                         continue
                     if file_reference and os.path.basename(p.filename) != file_reference:
                         continue
                     if p.base_filename == filename:
                         return p
         for p in self.formdata.iter_evolution_parts():
             if not isinstance(p, AttachmentEvolutionPart):
                 continue
             if file_reference and os.path.basename(p.filename) != file_reference:
                 continue
             if p.base_filename == filename:
                 return p
     def form_attachment(self):

     class NamedAttachmentsSubstitutionProxy(object):
         def __init__(self, formdata, varname):
         def __init__(self, formdata, parts):
             self.formdata = formdata
             self.varname = varname
         def get_attachments(self):
             attachments = []
             for evo in self.formdata.evolution or []:
                 for part in evo.parts or []:
                     if not isinstance(part, AttachmentEvolutionPart):
                         continue
                     if part.varname != self.varname:
                         continue
                     attachments.append(part)
             attachments.reverse()
             return attachments
             self.parts = parts[:]
             self.parts.reverse()
         def __len__(self):
             return len(self.get_attachments())
             return len(self.parts)
         def __getattr__(self, name):
             return getattr(self[0], name)
         def __getitem__(self, i):
             attachment = self.get_attachments()[i]
             return AttachmentSubstitutionProxy(self.formdata, attachment)
             return AttachmentSubstitutionProxy(self.formdata, self.parts[i])
     class AttachmentsSubstitutionProxy(object):
-...
             self.formdata = formdata
         def __getattr__(self, name):
             for evo in self.formdata.evolution or []:
                 for part in evo.parts or []:
                     if getattr(part, 'varname', None) == name:
                         return NamedAttachmentsSubstitutionProxy(self.formdata, name)
             def has_varname_attachment(part):
                 return isinstance(part, AttachmentEvolutionPart) and getattr(part, 'varname', None) == name
             parts = [part for part in self.formdata.iter_evolution_parts()
                      if has_varname_attachment(part)]
             if parts:
                 return NamedAttachmentsSubstitutionProxy(self.formdata, parts)
             raise AttributeError(name)
-...
                     get_publisher().substitutions.feed(formdata)
                     seen_triggers = []
                     for evolution in formdata.evolution:
                         for part in evolution.parts or []:
                             if isinstance(part, WorkflowGlobalActionTimeoutTriggerMarker):
                                 seen_triggers.append(part.timeout_id)
                     for part in formdata.iter_evolution_parts():
                         if not isinstance(part, WorkflowGlobalActionTimeoutTriggerMarker):
                             continue
                         seen_triggers.append(part.timeout_id)
                     for action, trigger in triggers:
                         if trigger.id in seen_triggers:
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0002-formdata-ease-iteration-of-evolutions-parts-33186.patch