0002-workflows-change-attachment-view-to-use-the-factored.patch

Frédéric Péters, 20 août 2015 11:56

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

Subject: [PATCH 2/4] workflows: change attachment view to use the factored
 file code path (#8031)

 tests/test_form_pages.py |  2 ++
 wcs/wf/attachment.py     | 54 +++++++++++++++++++-----------------------------
 wcs/workflows.py         |  3 +++
 3 files changed, 26 insertions(+), 33 deletions(-)

tests/test_form_pages.py
1033	1033
1034	1034	resp = resp.follow() # back to form page
1035	1035	resp = resp.click('test.txt')
	1036	assert resp.location.endswith('/test.txt')
	1037	resp = resp.follow()
1036	1038	assert resp.content_type == 'text/plain'
1037	1039	assert resp.body == 'foobar'

     # along with this program; if not, see <http://www.gnu.org/licenses/>.
     from quixote import get_response
     from quixote.util import FileStream
     from quixote import get_response, redirect
     from wcs.workflows import *
     from qommon.errors import *
     from wcs.forms.common import FormStatusPage
     from wcs.forms.common import FormStatusPage, FileDirectory
     def lookup_wf_attachment(self, filename):
         # supports for URLs such as /$formdata/$id/files/attachment/test.txt
         if self.reference.split('-')[0] != 'attachment':
             return
         for evo in self.formdata.evolution:
             if evo.parts:
                 for p in evo.parts:
                     if not isinstance(p, AttachmentEvolutionPart):
                         continue
                     if p.base_filename == filename:
                         return p
     def form_attachment(self):
         self.check_receiver()
-...
         except (KeyError, ValueError):
             raise TraversalError()
         found = False
         for evo in self.filled.evolution:
             if evo.parts:
                 for p in evo.parts:
                     if not isinstance(p, AttachmentEvolutionPart):
                         continue
                     if os.path.basename(p.filename) == fn:
                         found = True
                         break
                 if found:
                     break
         if not found:
             raise TraversalError()
         try:
             fd = open(p.filename, 'rb')
         except:
             raise TraversalError()
         size = os.path.getsize(p.filename)
         response = get_response()
         if p.content_type:
             response.set_content_type(p.content_type)
         else:
             response.set_content_type('application/octet-stream')
         if p.charset:
             response.set_charset(p.charset)
         if p.base_filename:
             if p.content_type and p.content_type.startswith('image/'):
                 response.set_header(
                     'content-disposition', 'inline; filename="%s"' % p.base_filename)
             else:
                 response.set_header(
                     'content-disposition', 'attachment; filename="%s"' % p.base_filename)
                         return redirect(self.filled.get_url() + 'files/attachment/' + p.base_filename)
         return FileStream(fd, size)
         raise TraversalError()
     class AddAttachmentWorkflowStatusItem(WorkflowStatusItem):
-...
         def init(cls):
             FormStatusPage._q_extra_exports.append('attachment')
             FormStatusPage.attachment = form_attachment
             if not 'lookup_wf_attachment' in FileDirectory._lookup_methods:
                 FileDirectory._lookup_methods.append('lookup_wf_attachment')
                 FileDirectory.lookup_wf_attachment = lookup_wf_attachment
         init = classmethod(init)
         def render_as_line(self):

                     upload.charset)
         from_upload = classmethod(from_upload)
         def get_file_pointer(self):
             return open(self.filename)
         def __getstate__(self):
             odict = self.__dict__.copy()
             if not odict.has_key('fp'):
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0002-workflows-change-attachment-view-to-use-the-factored.patch