formatting, code optimized
This commit is contained in:
Frederik Jaeckel
parent
dc6412cb4f
commit
ed04075bdb
5 changed files with 83 additions and 71 deletions
|
|
@ -6,6 +6,7 @@
|
|||
from trytond.pool import Pool
|
||||
from .line import Line
|
||||
|
||||
|
||||
def register():
|
||||
Pool.register(
|
||||
Line,
|
||||
|
|
|
|||
41
line.py
41
line.py
|
|
@ -3,13 +3,13 @@
|
|||
# The COPYRIGHT file at the top level of this repository contains the
|
||||
# full copyright notices and license terms.
|
||||
|
||||
import mimetypes, magic
|
||||
import mimetypes
|
||||
import magic
|
||||
from io import BytesIO
|
||||
from PIL import Image, UnidentifiedImageError
|
||||
from trytond.model import fields
|
||||
from trytond.pool import Pool, PoolMeta
|
||||
from trytond.pool import PoolMeta
|
||||
from trytond.config import config
|
||||
from trytond.transaction import Transaction
|
||||
from trytond.exceptions import UserError
|
||||
from trytond.i18n import gettext
|
||||
from trytond.pyson import Eval, Bool
|
||||
|
|
@ -24,7 +24,7 @@ try :
|
|||
image_limit = 100
|
||||
if image_limit > 10000:
|
||||
image_limit = 10000
|
||||
except :
|
||||
except Exception:
|
||||
image_limit = 2000
|
||||
|
||||
|
||||
|
|
@ -37,10 +37,11 @@ DEPENDS2.extend(DEPENDS)
|
|||
class Line(metaclass=PoolMeta):
|
||||
__name__ = 'cashbook.line'
|
||||
|
||||
media = fields.Binary(string='Image of PDF', filename='media_name',
|
||||
file_id='media_id', store_prefix=store_prefix,
|
||||
states=STATES2, depends=DEPENDS2)
|
||||
media_name = fields.Char(string='File name',
|
||||
media = fields.Binary(
|
||||
string='Image of PDF', filename='media_name', file_id='media_id',
|
||||
store_prefix=store_prefix, states=STATES2, depends=DEPENDS2)
|
||||
media_name = fields.Char(
|
||||
string='File name',
|
||||
states={
|
||||
'required': Bool(Eval('media')),
|
||||
'readonly': STATES2['readonly'],
|
||||
|
|
@ -48,11 +49,12 @@ class Line(metaclass=PoolMeta):
|
|||
media_id = fields.Char(string='File ID', readonly=True)
|
||||
media_mime = fields.Char(string='MIME', readonly=True)
|
||||
media_size = fields.Integer(string='File size', readonly=True)
|
||||
media_image = fields.Function(fields.Binary(string='Image', readonly=True,
|
||||
media_image = fields.Function(fields.Binary(
|
||||
string='Image', readonly=True,
|
||||
states={
|
||||
'invisible': ~Eval('media_mime', '').in_(['image/png', 'image/jpg', 'image/jpeg']),
|
||||
}, depends=['media_mime']),
|
||||
'on_change_with_media_image')
|
||||
'invisible': ~Eval('media_mime', '').in_([
|
||||
'image/png', 'image/jpg', 'image/jpeg']),
|
||||
}, depends=['media_mime']), 'on_change_with_media_image')
|
||||
|
||||
@fields.depends('media', 'media_mime')
|
||||
def on_change_with_media_image(self, name=True):
|
||||
|
|
@ -119,12 +121,14 @@ class Line(metaclass=PoolMeta):
|
|||
else:
|
||||
values['media_mime'] = cls._identify_file(values['media'][:1024])
|
||||
|
||||
# if its a image, resize it to fit in (image_limit x image_limit) pixel
|
||||
# if its a image, resize it to fit
|
||||
# in (image_limit x image_limit) pixel
|
||||
if values['media_mime'].startswith('image'):
|
||||
new_image = cls.resize_image_file(values['media'])
|
||||
if new_image is not None:
|
||||
values['media'] = new_image
|
||||
values['media_mime'] = cls._identify_file(values['media'][:1024])
|
||||
values['media_mime'] = cls._identify_file(
|
||||
values['media'][:1024])
|
||||
|
||||
values['media_size'] = len(values['media'])
|
||||
file_ext = mimetypes.guess_extension(values['media_mime'])
|
||||
|
|
@ -147,15 +151,14 @@ class Line(metaclass=PoolMeta):
|
|||
if line.media_size > 1024*1024*5:
|
||||
raise UserError(gettext(
|
||||
'cashbook_media.msg_file_too_big',
|
||||
recname = line.rec_name,
|
||||
))
|
||||
if not line.media_mime in ['application/pdf',
|
||||
recname=line.rec_name))
|
||||
if line.media_mime not in [
|
||||
'application/pdf',
|
||||
'image/png', 'image/jpg', 'image/jpeg']:
|
||||
raise UserError(gettext(
|
||||
'cashbook_media.msg_file_invalid_mime',
|
||||
recname=line.rec_name,
|
||||
fmime = line.media_mime,
|
||||
))
|
||||
fmime=line.media_mime))
|
||||
|
||||
@classmethod
|
||||
def create(cls, vlist):
|
||||
|
|
|
|||
28
setup.py
28
setup.py
|
|
@ -2,7 +2,7 @@
|
|||
"""
|
||||
|
||||
# Always prefer setuptools over distutils
|
||||
from setuptools import setup, find_packages
|
||||
from setuptools import setup
|
||||
# To use a consistent encoding
|
||||
from codecs import open
|
||||
from os import path
|
||||
|
|
@ -51,19 +51,26 @@ for dep in info.get('depends', []):
|
|||
prefix = modversion[dep]['prefix']
|
||||
|
||||
if len(modversion[dep]['max']) > 0:
|
||||
requires.append('%s_%s >= %s, <= %s' %
|
||||
(prefix, dep, modversion[dep]['min'], modversion[dep]['max']))
|
||||
requires.append(
|
||||
'%s_%s >= %s, <= %s' %
|
||||
(prefix, dep,
|
||||
modversion[dep]['min'],
|
||||
modversion[dep]['max']))
|
||||
else:
|
||||
requires.append('%s_%s >= %s' %
|
||||
requires.append(
|
||||
'%s_%s >= %s' %
|
||||
(prefix, dep, modversion[dep]['min']))
|
||||
else:
|
||||
requires.append('%s_%s >= %s.%s, < %s.%s' %
|
||||
('trytond', dep, major_version, minor_version,
|
||||
requires.append(
|
||||
'%s_%s >= %s.%s, < %s.%s' % (
|
||||
'trytond', dep, major_version, minor_version,
|
||||
major_version, minor_version + 1))
|
||||
requires.append('trytond >= %s.%s, < %s.%s' %
|
||||
(major_version, minor_version, major_version, minor_version + 1))
|
||||
requires.append(
|
||||
'trytond >= %s.%s, < %s.%s' % (
|
||||
major_version, minor_version, major_version, minor_version + 1))
|
||||
|
||||
setup(name='%s_%s' % (PREFIX, MODULE),
|
||||
setup(
|
||||
name='%s_%s' % (PREFIX, MODULE),
|
||||
version=info.get('version', '0.0.1'),
|
||||
description='Tryton module to add a file-field to cashbook.',
|
||||
long_description=long_description,
|
||||
|
|
@ -97,7 +104,8 @@ setup(name='%s_%s' % (PREFIX, MODULE),
|
|||
'trytond.modules.%s' % MODULE,
|
||||
],
|
||||
package_data={
|
||||
'trytond.modules.%s' % MODULE: (info.get('xml', [])
|
||||
'trytond.modules.%s' % MODULE: (
|
||||
info.get('xml', [])
|
||||
+ ['tryton.cfg', 'locale/*.po', 'tests/*.py',
|
||||
'view/*.xml', 'versiondep.txt', 'README.rst']),
|
||||
},
|
||||
|
|
|
|||
|
|
@ -4,21 +4,14 @@
|
|||
import trytond.tests.test_tryton
|
||||
import unittest
|
||||
|
||||
from trytond.modules.cashbook_media.tests.test_line import LineTestCase
|
||||
from .test_line import LineTestCase
|
||||
|
||||
|
||||
__all__ = ['suite']
|
||||
|
||||
|
||||
class CashbookTestCase(\
|
||||
LineTestCase,
|
||||
):
|
||||
'Test cashbook module'
|
||||
module = 'cashbook_media'
|
||||
|
||||
# end CashbookTestCase
|
||||
|
||||
def suite():
|
||||
suite = trytond.tests.test_tryton.suite()
|
||||
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(CashbookTestCase))
|
||||
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
|
||||
LineTestCase))
|
||||
return suite
|
||||
|
|
|
|||
|
|
@ -5,9 +5,8 @@
|
|||
|
||||
from io import BytesIO
|
||||
from PIL import Image
|
||||
from trytond.tests.test_tryton import ModuleTestCase, with_transaction
|
||||
from trytond.tests.test_tryton import with_transaction
|
||||
from trytond.pool import Pool
|
||||
from trytond.transaction import Transaction
|
||||
from trytond.exceptions import UserError
|
||||
from trytond.modules.cashbook.tests import CashbookTestCase
|
||||
from datetime import date
|
||||
|
|
@ -126,8 +125,11 @@ class LineTestCase(CashbookTestCase):
|
|||
self.assertEqual(book.state, 'open')
|
||||
|
||||
# add invalid file
|
||||
self.assertRaisesRegex(UserError,
|
||||
"The file type 'text/plain' of the record '05/02/2022|Rev|1.00 usd|Text 2 [Cat1]' is not allowed. (allowed: PNG, JPG, PDF)",
|
||||
self.assertRaisesRegex(
|
||||
UserError,
|
||||
"The file type 'text/plain' of the record " +
|
||||
"'05/02/2022|Rev|1.00 usd|Text 2 [Cat1]' is not allowed. " +
|
||||
"(allowed: PNG, JPG, PDF)",
|
||||
Book.write,
|
||||
*[
|
||||
[book],
|
||||
|
|
@ -146,8 +148,11 @@ class LineTestCase(CashbookTestCase):
|
|||
])
|
||||
|
||||
# replace image at line-1 by invalid file
|
||||
self.assertRaisesRegex(UserError,
|
||||
"The file type 'text/plain' of the record '05/02/2022|Rev|1.00 usd|Text 2 [Cat1]' is not allowed. (allowed: PNG, JPG, PDF)",
|
||||
self.assertRaisesRegex(
|
||||
UserError,
|
||||
"The file type 'text/plain' of the record " +
|
||||
"'05/02/2022|Rev|1.00 usd|Text 2 [Cat1]' is not allowed. " +
|
||||
"(allowed: PNG, JPG, PDF)",
|
||||
Lines.write,
|
||||
*[
|
||||
[book.lines[0]],
|
||||
|
|
@ -163,7 +168,6 @@ class LineTestCase(CashbookTestCase):
|
|||
"""
|
||||
pool = Pool()
|
||||
Book = pool.get('cashbook.book')
|
||||
Lines = pool.get('cashbook.line')
|
||||
|
||||
types = self.prep_type()
|
||||
category = self.prep_category(cattype='in')
|
||||
|
|
@ -226,3 +230,6 @@ class LineTestCase(CashbookTestCase):
|
|||
self.assertEqual(img2.size, (2000, 837))
|
||||
|
||||
# end LineTestCase
|
||||
|
||||
|
||||
del CashbookTestCase
|
||||
|
|
|
|||
Loading…
Reference in a new issue