From a24e7c7e69c33347bc4a8f2dddd545bbe2bf8374 Mon Sep 17 00:00:00 2001 From: Andrea Date: Fri, 10 Feb 2017 12:43:03 +0100 Subject: [PATCH 1/6] [10.0][ADD] base_directory_file_download --- base_directory_file_download/README.rst | 78 +++++++++++++++ base_directory_file_download/__init__.py | 4 + base_directory_file_download/__manifest__.py | 22 +++++ .../models/__init__.py | 5 + .../models/ir_filesystem_directory.py | 96 +++++++++++++++++++ .../models/ir_filesystem_file.py | 57 +++++++++++ .../security/groups.xml | 6 ++ .../security/ir.model.access.csv | 2 + .../tests/__init__.py | 4 + .../tests/test_directory_files_download.py | 74 ++++++++++++++ .../views/ir_filesystem_directory.xml | 75 +++++++++++++++ 11 files changed, 423 insertions(+) create mode 100644 base_directory_file_download/README.rst create mode 100644 base_directory_file_download/__init__.py create mode 100644 base_directory_file_download/__manifest__.py create mode 100644 base_directory_file_download/models/__init__.py create mode 100644 base_directory_file_download/models/ir_filesystem_directory.py create mode 100644 base_directory_file_download/models/ir_filesystem_file.py create mode 100644 base_directory_file_download/security/groups.xml create mode 100644 base_directory_file_download/security/ir.model.access.csv create mode 100644 base_directory_file_download/tests/__init__.py create mode 100644 base_directory_file_download/tests/test_directory_files_download.py create mode 100644 base_directory_file_download/views/ir_filesystem_directory.xml diff --git a/base_directory_file_download/README.rst b/base_directory_file_download/README.rst new file mode 100644 index 000000000..bcf1941c8 --- /dev/null +++ b/base_directory_file_download/README.rst @@ -0,0 +1,78 @@ +.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png + :target: https://www.gnu.org/licenses/agpl + :alt: License: AGPL-3 + +======================== +Directory Files Download +======================== + +View and download the files contained in a directory on the server. + +This functionality can have impacts on the security of your system, +since it allows to download the content of a directory. +Be careful when choosing the directory! + +Notice that, for security reasons, files like symbolic links +and up-level references are ignored. + + +Configuration +============= + +To configure this module, you need to: + +#. Set the group "Download files of directory" for the users who need this functionality. + + +Usage +===== + +To use this module, you need to: + +#. Go to Settings -> Downloads -> Directory Content +#. Create a record specifying Name and Directory of the server +#. Save; a list of files contained in the selected directory is displayed +#. Download the file you need +#. In case the content of the directory is modified, refresh the list by clicking the button on the top-right of the form + + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/149/10.0 + + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smash it by providing detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Andrea Stirpe + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/base_directory_file_download/__init__.py b/base_directory_file_download/__init__.py new file mode 100644 index 000000000..b44d76594 --- /dev/null +++ b/base_directory_file_download/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import models diff --git a/base_directory_file_download/__manifest__.py b/base_directory_file_download/__manifest__.py new file mode 100644 index 000000000..03679b426 --- /dev/null +++ b/base_directory_file_download/__manifest__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2017-2018 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + 'name': 'Directory Files Download', + 'summary': 'Download all files of a directory on server', + 'author': 'Onestein, Odoo Community Association (OCA)', + 'website': 'http://www.onestein.eu', + 'category': 'Tools', + 'version': '10.0.1.0.0', + 'license': 'AGPL-3', + 'depends': [ + 'base_setup', + ], + 'data': [ + 'security/groups.xml', + 'security/ir.model.access.csv', + 'views/ir_filesystem_directory.xml', + ], + 'installable': True, +} diff --git a/base_directory_file_download/models/__init__.py b/base_directory_file_download/models/__init__.py new file mode 100644 index 000000000..c88871f05 --- /dev/null +++ b/base_directory_file_download/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import ir_filesystem_directory +from . import ir_filesystem_file diff --git a/base_directory_file_download/models/ir_filesystem_directory.py b/base_directory_file_download/models/ir_filesystem_directory.py new file mode 100644 index 000000000..908e8a0cd --- /dev/null +++ b/base_directory_file_download/models/ir_filesystem_directory.py @@ -0,0 +1,96 @@ +# -*- coding: utf-8 -*- +# Copyright 2017-2018 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +import logging + +from os import listdir +from os.path import isfile, join, exists, normpath, realpath +from odoo import api, fields, models, _ +from odoo.exceptions import UserError + +_logger = logging.getLogger(__name__) + + +class IrFilesystemDirectory(models.Model): + _name = 'ir.filesystem.directory' + _description = 'Filesystem Directory' + + name = fields.Char(required=True, copy=False) + directory = fields.Char() + file_ids = fields.One2many( + 'ir.filesystem.file', + compute='_compute_file_ids', + string='Files' + ) + file_count = fields.Integer( + compute='_compute_file_count', + string="# Files" + ) + + @api.multi + def get_dir(self): + self.ensure_one() + directory = self.directory or '' + # adds slash character at the end if missing + return join(directory, '') + + @api.multi + def _compute_file_ids(self): + File = self.env['ir.filesystem.file'] + for directory in self: + directory.file_ids = None + if directory.get_dir(): + for file_name in directory._get_directory_files(): + directory.file_ids += File.create({ + 'name': file_name, + 'filename': file_name, + 'stored_filename': file_name, + 'directory_id': directory.id, + }) + + @api.onchange('directory') + def onchange_directory(self): + if self.directory and not exists(self.directory): + raise UserError(_('Directory does not exist')) + + @api.multi + def _compute_file_count(self): + for directory in self: + directory.file_count = len(directory.file_ids) + + @api.multi + def _get_directory_files(self): + + def get_files(directory, files): + for file_name in listdir(directory): + full_path = join(directory, file_name) + + # Symbolic links and up-level references are not considered + norm_path = normpath(realpath(full_path)) + if norm_path in full_path: + if isfile(full_path) and file_name[0] != '.': + files.append(file_name) + + self.ensure_one() + files = [] + if self.get_dir() and exists(self.get_dir()): + try: + get_files(self.get_dir(), files) + except (IOError, OSError): + _logger.info( + "_get_directory_files reading %s", + self.get_dir(), + exc_info=True + ) + return files + + @api.multi + def reload(self): + self.onchange_directory() + + @api.multi + def copy(self, default=None): + self.ensure_one() + default = dict(default or {}, name=_("%s (copy)") % self.name) + return super(IrFilesystemDirectory, self).copy(default=default) diff --git a/base_directory_file_download/models/ir_filesystem_file.py b/base_directory_file_download/models/ir_filesystem_file.py new file mode 100644 index 000000000..3c6d09d02 --- /dev/null +++ b/base_directory_file_download/models/ir_filesystem_file.py @@ -0,0 +1,57 @@ +# -*- coding: utf-8 -*- +# Copyright 2017-2018 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +import logging +import os + +from odoo import api, fields, models, _ +from odoo.exceptions import UserError +from odoo.tools import human_size + +_logger = logging.getLogger(__name__) + + +class IrFilesystemDirectoryLine(models.TransientModel): + _name = 'ir.filesystem.file' + + name = fields.Char(required=True) + filename = fields.Char() + file_content = fields.Binary(compute='_compute_file') + stored_filename = fields.Char() + directory_id = fields.Many2one( + 'ir.filesystem.directory', + string='Directory' + ) + + @api.multi + def _file_read(self, fname, bin_size=False): + + def file_not_found(fname): + raise UserError(_( + '''Error while reading file %s. + Maybe it was removed or permission is changed. + Please refresh the list.''' % fname)) + + self.ensure_one() + r = '' + directory = self.directory_id.get_dir() + full_path = directory + fname + if not (directory and os.path.isfile(full_path)): + file_not_found(fname) + try: + if bin_size: + r = human_size(os.path.getsize(full_path)) + else: + r = open(full_path, 'rb').read().encode('base64') + except (IOError, OSError): + _logger.info("_read_file reading %s", fname, exc_info=True) + return r + + @api.depends('stored_filename') + def _compute_file(self): + bin_size = self._context.get('bin_size') + for line in self: + if line.stored_filename: + content = line._file_read(line.stored_filename, bin_size) + line.file_content = content diff --git a/base_directory_file_download/security/groups.xml b/base_directory_file_download/security/groups.xml new file mode 100644 index 000000000..dd0b42604 --- /dev/null +++ b/base_directory_file_download/security/groups.xml @@ -0,0 +1,6 @@ + + + + Download files of directory + + diff --git a/base_directory_file_download/security/ir.model.access.csv b/base_directory_file_download/security/ir.model.access.csv new file mode 100644 index 000000000..ce3e8281f --- /dev/null +++ b/base_directory_file_download/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_ir_filesystem_directory,ir_filesystem_directory,model_ir_filesystem_directory,group_filesystem_directory,1,1,1,1 diff --git a/base_directory_file_download/tests/__init__.py b/base_directory_file_download/tests/__init__.py new file mode 100644 index 000000000..1375a4413 --- /dev/null +++ b/base_directory_file_download/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import test_directory_files_download diff --git a/base_directory_file_download/tests/test_directory_files_download.py b/base_directory_file_download/tests/test_directory_files_download.py new file mode 100644 index 000000000..8d15867a3 --- /dev/null +++ b/base_directory_file_download/tests/test_directory_files_download.py @@ -0,0 +1,74 @@ +# -*- coding: utf-8 -*- +# Copyright 2017-2018 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +import os +from tempfile import gettempdir + +from odoo.tests import common +from odoo.exceptions import UserError + + +class TestBaseDirectoryFilesDownload(common.TransactionCase): + + def test_01_create(self): + test_dir = self.env['ir.filesystem.directory'].create({ + 'name': 'Test Directory 1', + 'directory': gettempdir() + }) + + # test method get_dir() + full_dir = test_dir.get_dir() + self.assertEqual(full_dir[-1], '/') + + # test computed field file_ids + self.assertGreaterEqual(len(test_dir.file_ids), 0) + + # test count list of directory + self.assertEqual(len(test_dir.file_ids), test_dir.file_count) + + # test reload list of directory + test_dir.reload() + self.assertEqual(len(test_dir.file_ids), test_dir.file_count) + + # test content of files + for file in test_dir.file_ids: + filename = file.stored_filename + directory = test_dir.get_dir() + with open(os.path.join(directory, filename), 'rb') as f: + content = f.read().encode('base64') + self.assertEqual(file.file_content, content) + + # test onchange directory (to not existing) + test_dir.directory = '/txxx' + with self.assertRaises(UserError): + test_dir.onchange_directory() + self.assertEqual(len(test_dir.file_ids), 0) + with self.assertRaises(UserError): + test_dir.reload() + self.assertEqual(len(test_dir.file_ids), 0) + + def test_02_copy(self): + test_dir = self.env['ir.filesystem.directory'].create({ + 'name': 'Test Orig', + 'directory': gettempdir() + }) + + # test copy + dir_copy = test_dir.copy() + self.assertEqual(dir_copy.name, 'Test Orig (copy)') + self.assertEqual(len(dir_copy.file_ids), test_dir.file_count) + self.assertEqual(dir_copy.file_count, test_dir.file_count) + + def test_03_not_existing_directory(self): + test_dir = self.env['ir.filesystem.directory'].create({ + 'name': 'Test Not Existing Directory', + 'directory': '/tpd' + }) + self.assertEqual(len(test_dir.file_ids), 0) + self.assertEqual(len(test_dir.file_ids), test_dir.file_count) + + # test onchange directory (to existing) + test_dir.directory = gettempdir() + self.assertGreaterEqual(len(test_dir.file_ids), 0) + self.assertEqual(len(test_dir.file_ids), test_dir.file_count) diff --git a/base_directory_file_download/views/ir_filesystem_directory.xml b/base_directory_file_download/views/ir_filesystem_directory.xml new file mode 100644 index 000000000..b1b2d42ac --- /dev/null +++ b/base_directory_file_download/views/ir_filesystem_directory.xml @@ -0,0 +1,75 @@ + + + + + ir.filesystem.directory + +
+ +
+ +
+

+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + ir.filesystem.directory + + + + + + + + + + Directory Content + ir.filesystem.directory + form + tree,form + + + + + + + From fdd5a0c2b36567861c5d155614bd72b4554ec556 Mon Sep 17 00:00:00 2001 From: Andrea Date: Wed, 22 May 2019 09:16:14 +0200 Subject: [PATCH 2/6] Add readme fragments + code review --- base_directory_file_download/__manifest__.py | 4 ++-- .../models/ir_filesystem_directory.py | 6 +++--- base_directory_file_download/models/ir_filesystem_file.py | 4 ++-- base_directory_file_download/readme/CONFIGURE.rst | 3 +++ base_directory_file_download/readme/CONTRIBUTORS.rst | 1 + base_directory_file_download/readme/DESCRIPTION.rst | 8 ++++++++ base_directory_file_download/readme/USAGE.rst | 7 +++++++ .../tests/test_directory_files_download.py | 2 +- .../views/ir_filesystem_directory.xml | 2 +- 9 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 base_directory_file_download/readme/CONFIGURE.rst create mode 100644 base_directory_file_download/readme/CONTRIBUTORS.rst create mode 100644 base_directory_file_download/readme/DESCRIPTION.rst create mode 100644 base_directory_file_download/readme/USAGE.rst diff --git a/base_directory_file_download/__manifest__.py b/base_directory_file_download/__manifest__.py index 03679b426..52bd1f347 100644 --- a/base_directory_file_download/__manifest__.py +++ b/base_directory_file_download/__manifest__.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -# Copyright 2017-2018 Onestein () +# Copyright 2017-2018 Onestein () # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { 'name': 'Directory Files Download', 'summary': 'Download all files of a directory on server', 'author': 'Onestein, Odoo Community Association (OCA)', - 'website': 'http://www.onestein.eu', + 'website': 'https://github.com/OCA/server-tools', 'category': 'Tools', 'version': '10.0.1.0.0', 'license': 'AGPL-3', diff --git a/base_directory_file_download/models/ir_filesystem_directory.py b/base_directory_file_download/models/ir_filesystem_directory.py index 908e8a0cd..ddd615a67 100644 --- a/base_directory_file_download/models/ir_filesystem_directory.py +++ b/base_directory_file_download/models/ir_filesystem_directory.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2017-2018 Onestein () +# Copyright 2017-2018 Onestein () # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). import logging @@ -21,11 +21,11 @@ class IrFilesystemDirectory(models.Model): file_ids = fields.One2many( 'ir.filesystem.file', compute='_compute_file_ids', - string='Files' + string='Files', ) file_count = fields.Integer( compute='_compute_file_count', - string="# Files" + string="# Files", ) @api.multi diff --git a/base_directory_file_download/models/ir_filesystem_file.py b/base_directory_file_download/models/ir_filesystem_file.py index 3c6d09d02..bd875e21a 100644 --- a/base_directory_file_download/models/ir_filesystem_file.py +++ b/base_directory_file_download/models/ir_filesystem_file.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2017-2018 Onestein () +# Copyright 2017-2018 Onestein () # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). import logging @@ -21,7 +21,7 @@ class IrFilesystemDirectoryLine(models.TransientModel): stored_filename = fields.Char() directory_id = fields.Many2one( 'ir.filesystem.directory', - string='Directory' + string='Directory', ) @api.multi diff --git a/base_directory_file_download/readme/CONFIGURE.rst b/base_directory_file_download/readme/CONFIGURE.rst new file mode 100644 index 000000000..80d5c0dcb --- /dev/null +++ b/base_directory_file_download/readme/CONFIGURE.rst @@ -0,0 +1,3 @@ +To configure this module, you need to: + +#. Set the group "Download files of directory" for the users who need this functionality. diff --git a/base_directory_file_download/readme/CONTRIBUTORS.rst b/base_directory_file_download/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..4518218c8 --- /dev/null +++ b/base_directory_file_download/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Andrea Stirpe diff --git a/base_directory_file_download/readme/DESCRIPTION.rst b/base_directory_file_download/readme/DESCRIPTION.rst new file mode 100644 index 000000000..f350f09ba --- /dev/null +++ b/base_directory_file_download/readme/DESCRIPTION.rst @@ -0,0 +1,8 @@ +View and download the files contained in a directory on the server. + +This functionality can have impacts on the security of your system, +since it allows to download the content of a directory. +Be careful when choosing the directory! + +Notice that, for security reasons, files like symbolic links +and up-level references are ignored. diff --git a/base_directory_file_download/readme/USAGE.rst b/base_directory_file_download/readme/USAGE.rst new file mode 100644 index 000000000..f15fdbc4c --- /dev/null +++ b/base_directory_file_download/readme/USAGE.rst @@ -0,0 +1,7 @@ +To use this module, you need to: + +#. Go to Settings -> Downloads -> Directory Content +#. Create a record specifying Name and Directory of the server +#. Save; a list of files contained in the selected directory is displayed +#. Download the file you need +#. In case the content of the directory is modified, refresh the list by clicking the button on the top-right of the form diff --git a/base_directory_file_download/tests/test_directory_files_download.py b/base_directory_file_download/tests/test_directory_files_download.py index 8d15867a3..7105c5a44 100644 --- a/base_directory_file_download/tests/test_directory_files_download.py +++ b/base_directory_file_download/tests/test_directory_files_download.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2017-2018 Onestein () +# Copyright 2017-2018 Onestein () # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). import os diff --git a/base_directory_file_download/views/ir_filesystem_directory.xml b/base_directory_file_download/views/ir_filesystem_directory.xml index b1b2d42ac..ae3990feb 100644 --- a/base_directory_file_download/views/ir_filesystem_directory.xml +++ b/base_directory_file_download/views/ir_filesystem_directory.xml @@ -49,7 +49,7 @@ ir.filesystem.directory - + From 4624f89b8f1a2a1acaf1e224f480a7c62aaf523e Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 28 May 2019 13:58:44 +0000 Subject: [PATCH 3/6] [UPD] README.rst --- base_directory_file_download/README.rst | 68 ++- .../static/description/index.html | 444 ++++++++++++++++++ 2 files changed, 488 insertions(+), 24 deletions(-) create mode 100644 base_directory_file_download/static/description/index.html diff --git a/base_directory_file_download/README.rst b/base_directory_file_download/README.rst index bcf1941c8..23290292d 100644 --- a/base_directory_file_download/README.rst +++ b/base_directory_file_download/README.rst @@ -1,11 +1,30 @@ -.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png - :target: https://www.gnu.org/licenses/agpl - :alt: License: AGPL-3 - ======================== Directory Files Download ======================== +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github + :target: https://github.com/OCA/server-tools/tree/10.0/base_directory_file_download + :alt: OCA/server-tools +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/server-tools-10-0/server-tools-10-0-base_directory_file_download + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/149/10.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + View and download the files contained in a directory on the server. This functionality can have impacts on the security of your system, @@ -15,6 +34,10 @@ Be careful when choosing the directory! Notice that, for security reasons, files like symbolic links and up-level references are ignored. +**Table of contents** + +.. contents:: + :local: Configuration ============= @@ -23,7 +46,6 @@ To configure this module, you need to: #. Set the group "Download files of directory" for the users who need this functionality. - Usage ===== @@ -35,44 +57,42 @@ To use this module, you need to: #. Download the file you need #. In case the content of the directory is modified, refresh the list by clicking the button on the top-right of the form - -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/149/10.0 - - Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smash it by providing detailed and welcomed feedback. +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* Onestein Contributors ------------- +~~~~~~~~~~~~ * Andrea Stirpe -Maintainer ----------- +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit https://odoo-community.org. +This module is part of the `OCA/server-tools `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/base_directory_file_download/static/description/index.html b/base_directory_file_download/static/description/index.html new file mode 100644 index 000000000..f0d68ce5a --- /dev/null +++ b/base_directory_file_download/static/description/index.html @@ -0,0 +1,444 @@ + + + + + + +Directory Files Download + + + +
+

Directory Files Download

+ + +

Beta License: AGPL-3 OCA/server-tools Translate me on Weblate Try me on Runbot

+

View and download the files contained in a directory on the server.

+

This functionality can have impacts on the security of your system, +since it allows to download the content of a directory. +Be careful when choosing the directory!

+

Notice that, for security reasons, files like symbolic links +and up-level references are ignored.

+

Table of contents

+ +
+

Configuration

+

To configure this module, you need to:

+
    +
  1. Set the group “Download files of directory” for the users who need this functionality.
    2. +
+
+
+

Usage

+

To use this module, you need to:

+
    +
  1. Go to Settings -> Downloads -> Directory Content
    2. +
  2. Create a record specifying Name and Directory of the server
    3. +
  3. Save; a list of files contained in the selected directory is displayed
    4. +
  4. Download the file you need
    5. +
  5. In case the content of the directory is modified, refresh the list by clicking the button on the top-right of the form
    6. +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Onestein
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/server-tools project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + From f8d110dd21940c2435a5a171958bd52c0c10221c Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 28 May 2019 13:58:44 +0000 Subject: [PATCH 4/6] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 base_directory_file_download/static/description/icon.png diff --git a/base_directory_file_download/static/description/icon.png b/base_directory_file_download/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 400b0cd8f2233cccf27d989b06f323573834480e Mon Sep 17 00:00:00 2001 From: Andrea Date: Tue, 28 May 2019 16:11:08 +0200 Subject: [PATCH 5/6] [11.0][MIG] base_directory_file_download --- base_directory_file_download/README.rst | 10 +++++----- base_directory_file_download/__init__.py | 1 - base_directory_file_download/__manifest__.py | 5 ++--- base_directory_file_download/models/__init__.py | 1 - .../models/ir_filesystem_directory.py | 3 +-- .../models/ir_filesystem_file.py | 8 ++++---- base_directory_file_download/tests/__init__.py | 1 - .../tests/test_directory_files_download.py | 6 +++--- 8 files changed, 15 insertions(+), 20 deletions(-) diff --git a/base_directory_file_download/README.rst b/base_directory_file_download/README.rst index 23290292d..2e81f4a4f 100644 --- a/base_directory_file_download/README.rst +++ b/base_directory_file_download/README.rst @@ -14,13 +14,13 @@ Directory Files Download :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github - :target: https://github.com/OCA/server-tools/tree/10.0/base_directory_file_download + :target: https://github.com/OCA/server-tools/tree/11.0/base_directory_file_download :alt: OCA/server-tools .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/server-tools-10-0/server-tools-10-0-base_directory_file_download + :target: https://translation.odoo-community.org/projects/server-tools-11-0/server-tools-11-0-base_directory_file_download :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/149/10.0 + :target: https://runbot.odoo-community.org/runbot/149/11.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -63,7 +63,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -93,6 +93,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/server-tools `_ project on GitHub. +This module is part of the `OCA/server-tools `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/base_directory_file_download/__init__.py b/base_directory_file_download/__init__.py index b44d76594..31660d6a9 100644 --- a/base_directory_file_download/__init__.py +++ b/base_directory_file_download/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import models diff --git a/base_directory_file_download/__manifest__.py b/base_directory_file_download/__manifest__.py index 52bd1f347..043eadc36 100644 --- a/base_directory_file_download/__manifest__.py +++ b/base_directory_file_download/__manifest__.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# Copyright 2017-2018 Onestein () +# Copyright 2017-2019 Onestein () # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { @@ -8,7 +7,7 @@ 'author': 'Onestein, Odoo Community Association (OCA)', 'website': 'https://github.com/OCA/server-tools', 'category': 'Tools', - 'version': '10.0.1.0.0', + 'version': '11.0.1.0.0', 'license': 'AGPL-3', 'depends': [ 'base_setup', diff --git a/base_directory_file_download/models/__init__.py b/base_directory_file_download/models/__init__.py index c88871f05..38cb57ad8 100644 --- a/base_directory_file_download/models/__init__.py +++ b/base_directory_file_download/models/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import ir_filesystem_directory diff --git a/base_directory_file_download/models/ir_filesystem_directory.py b/base_directory_file_download/models/ir_filesystem_directory.py index ddd615a67..4084cce58 100644 --- a/base_directory_file_download/models/ir_filesystem_directory.py +++ b/base_directory_file_download/models/ir_filesystem_directory.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# Copyright 2017-2018 Onestein () +# Copyright 2017-2019 Onestein () # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). import logging diff --git a/base_directory_file_download/models/ir_filesystem_file.py b/base_directory_file_download/models/ir_filesystem_file.py index bd875e21a..501d1d23e 100644 --- a/base_directory_file_download/models/ir_filesystem_file.py +++ b/base_directory_file_download/models/ir_filesystem_file.py @@ -1,7 +1,7 @@ -# -*- coding: utf-8 -*- -# Copyright 2017-2018 Onestein () +# Copyright 2017-2019 Onestein () # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +import base64 import logging import os @@ -43,14 +43,14 @@ class IrFilesystemDirectoryLine(models.TransientModel): if bin_size: r = human_size(os.path.getsize(full_path)) else: - r = open(full_path, 'rb').read().encode('base64') + r = base64.b64encode(open(full_path, 'rb').read()) except (IOError, OSError): _logger.info("_read_file reading %s", fname, exc_info=True) return r @api.depends('stored_filename') def _compute_file(self): - bin_size = self._context.get('bin_size') + bin_size = self.env.context.get('bin_size') for line in self: if line.stored_filename: content = line._file_read(line.stored_filename, bin_size) diff --git a/base_directory_file_download/tests/__init__.py b/base_directory_file_download/tests/__init__.py index 1375a4413..b940b19c3 100644 --- a/base_directory_file_download/tests/__init__.py +++ b/base_directory_file_download/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import test_directory_files_download diff --git a/base_directory_file_download/tests/test_directory_files_download.py b/base_directory_file_download/tests/test_directory_files_download.py index 7105c5a44..001392ef0 100644 --- a/base_directory_file_download/tests/test_directory_files_download.py +++ b/base_directory_file_download/tests/test_directory_files_download.py @@ -1,7 +1,7 @@ -# -*- coding: utf-8 -*- -# Copyright 2017-2018 Onestein () +# Copyright 2017-2019 Onestein () # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +import base64 import os from tempfile import gettempdir @@ -36,7 +36,7 @@ class TestBaseDirectoryFilesDownload(common.TransactionCase): filename = file.stored_filename directory = test_dir.get_dir() with open(os.path.join(directory, filename), 'rb') as f: - content = f.read().encode('base64') + content = base64.b64encode(f.read()) self.assertEqual(file.file_content, content) # test onchange directory (to not existing) From ad328a132ebf5ecca43ab9865b4012a23e51c56d Mon Sep 17 00:00:00 2001 From: Andrea Date: Thu, 12 Sep 2019 13:05:16 +0200 Subject: [PATCH 6/6] Add filtering capabilities --- .../models/ir_filesystem_directory.py | 17 ++++++++++------- .../models/ir_filesystem_file.py | 1 + .../views/ir_filesystem_directory.xml | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/base_directory_file_download/models/ir_filesystem_directory.py b/base_directory_file_download/models/ir_filesystem_directory.py index 4084cce58..cc8bcf75c 100644 --- a/base_directory_file_download/models/ir_filesystem_directory.py +++ b/base_directory_file_download/models/ir_filesystem_directory.py @@ -3,8 +3,9 @@ import logging -from os import listdir -from os.path import isfile, join, exists, normpath, realpath +from glob import glob +from os.path import basename, isfile, join, exists, normpath, realpath + from odoo import api, fields, models, _ from odoo.exceptions import UserError @@ -26,6 +27,7 @@ class IrFilesystemDirectory(models.Model): compute='_compute_file_count', string="# Files", ) + files_filter = fields.Char() @api.multi def get_dir(self): @@ -61,10 +63,11 @@ class IrFilesystemDirectory(models.Model): @api.multi def _get_directory_files(self): - def get_files(directory, files): - for file_name in listdir(directory): - full_path = join(directory, file_name) - + def get_files(directory, files_filter): + glob_path = join(directory, files_filter) + content = glob(glob_path) + for full_path in content: + file_name = basename(full_path) # Symbolic links and up-level references are not considered norm_path = normpath(realpath(full_path)) if norm_path in full_path: @@ -75,7 +78,7 @@ class IrFilesystemDirectory(models.Model): files = [] if self.get_dir() and exists(self.get_dir()): try: - get_files(self.get_dir(), files) + get_files(self.get_dir(), self.files_filter or '*') except (IOError, OSError): _logger.info( "_get_directory_files reading %s", diff --git a/base_directory_file_download/models/ir_filesystem_file.py b/base_directory_file_download/models/ir_filesystem_file.py index 501d1d23e..e31d30c80 100644 --- a/base_directory_file_download/models/ir_filesystem_file.py +++ b/base_directory_file_download/models/ir_filesystem_file.py @@ -14,6 +14,7 @@ _logger = logging.getLogger(__name__) class IrFilesystemDirectoryLine(models.TransientModel): _name = 'ir.filesystem.file' + _description = 'File in filesystem' name = fields.Char(required=True) filename = fields.Char() diff --git a/base_directory_file_download/views/ir_filesystem_directory.xml b/base_directory_file_download/views/ir_filesystem_directory.xml index ae3990feb..3b58983bb 100644 --- a/base_directory_file_download/views/ir_filesystem_directory.xml +++ b/base_directory_file_download/views/ir_filesystem_directory.xml @@ -18,6 +18,7 @@ +