Changeset 12223 for main

Timestamp:

14 Dec 2014, 08:49:01 (10 years ago)

Author:

Henrik Bettermann

Message:

We need the file managing base components also in documents.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

• browser/fileviewlets.py (added)
• customers/fileviewlets.py (modified) (2 diffs)
• customers/utils.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/fileviewlets.py

@@ -31 +31 @@
     default_fileupload_template)
 
+from waeup.ikoba.browser.fileviewlets import (
+    FileDisplay, FileUpload, Image)
+
 from waeup.ikoba.customers.interfaces import (
     ICustomer, ICustomersUtils)
@@ -43 +46 @@
     PDFDocumentSlipPage,)
 
-grok.context(IIkobaObject)  # Make IIkobaObject the default context
 grok.templatedir('browser_templates')
-
-ALLOWED_FILE_EXTENSIONS = ('jpg', 'png', 'pdf', 'tif', 'fpm')
-
-
-def handle_file_delete(context, view, download_name):
-    """Handle deletion of customer file.
-
-    """
-    store = getUtility(IExtFileStore)
-    store.deleteFileByContext(context, attr=download_name)
-    context.writeLogMessage(view, 'deleted: %s' % download_name)
-    view.flash(_('${a} deleted.', mapping={'a': download_name}))
-    return
-
-
-def handle_file_upload(upload, context, view, max_size, download_name=None):
-    """Handle upload of customer file.
-
-    Returns `True` in case of success or `False`.
-
-    Please note that file pointer passed in (`upload`) most probably
-    points to end of file when leaving this function.
-    """
-    # Check some file requirements first
-    size = file_size(upload)
-    if size > max_size:
-        view.flash(_('Uploaded file is too big.'), type="danger")
-        return False
-    upload.seek(0)  # file pointer moved when determining size
-    dummy,ext = os.path.splitext(upload.filename)
-    # fpm files are expected to be fingerprint minutiae, file
-    # format is not yet checked
-    if ext == '.fpm':
-        file_format = 'fpm'
-    else:
-        file_format = get_fileformat(None, upload.read(512))
-        upload.seek(0)  # same here
-    if file_format is None:
-        view.flash(_('Could not determine file type.'), type="danger")
-        return False
-    basename, expected_ext = os.path.splitext(download_name)
-    if expected_ext:
-        if '.' + file_format != expected_ext:
-            view.flash(_('${a} file extension expected.',
-                mapping={'a': expected_ext[1:]}), type="danger")
-            return False
-    else:
-        if not file_format in ALLOWED_FILE_EXTENSIONS:
-            view.flash(
-                _('Only the following extensions are allowed: ${a}',
-                mapping={'a': ', '.join(ALLOWED_FILE_EXTENSIONS)}),
-                type="danger")
-            return False
-        download_name += '.' + file_format
-    store = getUtility(IExtFileStore)
-    file_id = IFileStoreNameChooser(context).chooseName(attr=download_name)
-    store.createFile(file_id, upload)
-    context.writeLogMessage(view, 'uploaded: %s (%s)' % (
-        download_name,upload.filename))
-    view.flash(_('File ${a} uploaded.', mapping={'a': download_name}))
-    return True
-
-
-class FileManager(grok.ViewletManager):
-    """Viewlet manager for uploading files, preferably scanned images.
-    """
-    grok.name('files')
-
-
-class FileDisplay(grok.Viewlet):
-    """Base file display viewlet.
-    """
-    grok.baseclass()
-    grok.viewletmanager(FileManager)
-    template = default_filedisplay_template
-    grok.order(1)
-    label = _(u'File')
-    title = _(u'Scan')
-    download_name = u'filename.jpg'
-
-    @property
-    def file_exists(self):
-        image = getUtility(IExtFileStore).getFileByContext(
-            self.context, attr=self.download_name)
-        if image:
-            return True
-        else:
-            return False
-
-
-class FileUpload(FileDisplay):
-    """Base upload viewlet.
-    """
-    grok.baseclass()
-    grok.viewletmanager(FileManager)
-    template = default_fileupload_template
-    tab_redirect = '#tab2-top'
-    mus = 1024 * 150
-    upload_button =_('Upload selected file')
-    delete_button = _('Delete')
-
-    @property
-    def show_viewlet(self):
-        customers_utils = getUtility(ICustomersUtils)
-        if self.__name__ in customers_utils.SKIP_UPLOAD_VIEWLETS:
-            return False
-        return True
-
-    @property
-    def input_name(self):
-        return "%s" % self.__name__
-
-    def update(self):
-        self.max_upload_size = string_from_bytes(self.mus)
-        delete_button = self.request.form.get(
-            'delete_%s' % self.input_name, None)
-        upload_button = self.request.form.get(
-            'upload_%s' % self.input_name, None)
-        if delete_button:
-            handle_file_delete(
-                context=self.context, view=self.view,
-                download_name=self.download_name)
-            self.view.redirect(
-                self.view.url(
-                    self.context, self.view.__name__) + self.tab_redirect)
-            return
-        if upload_button:
-            upload = self.request.form.get(self.input_name, None)
-            if upload:
-                # We got a fresh upload
-                handle_file_upload(upload,
-                    self.context, self.view, self.mus, self.download_name)
-                self.view.redirect(
-                    self.view.url(
-                        self.context, self.view.__name__) + self.tab_redirect)
-            else:
-                self.view.flash(_('No local file selected.'), type="danger")
-                self.view.redirect(
-                    self.view.url(
-                        self.context, self.view.__name__) + self.tab_redirect)
-        return
-
-
-class Image(grok.View):
-    """Renders images for customers.
-    """
-    grok.baseclass()
-    grok.name('none.jpg')
-    download_name = u'none.jpg'
-
-    def render(self):
-        # A filename chooser turns a context into a filename suitable
-        # for file storage.
-        image = getUtility(IExtFileStore).getFileByContext(
-            self.context, attr=self.download_name)
-        if image is None:
-            # show placeholder image
-            self.response.setHeader('Content-Type', 'image/jpeg')
-            return open(DEFAULT_IMAGE_PATH, 'rb').read()
-        dummy,ext = os.path.splitext(image.name)
-        if ext == '.jpg':
-            self.response.setHeader('Content-Type', 'image/jpeg')
-        elif ext == '.fpm':
-            self.response.setHeader('Content-Type', 'application/binary')
-        elif ext == '.png':
-            self.response.setHeader('Content-Type', 'image/png')
-        elif ext == '.pdf':
-            self.response.setHeader('Content-Type', 'application/pdf')
-        elif ext == '.tif':
-            self.response.setHeader('Content-Type', 'image/tiff')
-        return image
 
 # File viewlets for customer base page

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/utils.py

@@ -228 +228 @@
     """
     # XXX: fix circular import problem
-    from waeup.ikoba.customers.fileviewlets import FileManager
+    from waeup.ikoba.browser.fileviewlets import FileManager
     from waeup.ikoba.browser import DEFAULT_IMAGE_PATH
     style = getSampleStyleSheet()
@@ -297 +297 @@
     CONMANAGE_CONTRACT_STATES = (CREATED,)
 
-    SKIP_UPLOAD_VIEWLETS = ()
-
     TRANSLATED_CUSTOMER_STATES = {
         CREATED: _('created'),