diff --git a/.DINAR/build-date.txt b/.DINAR/build-date.txt new file mode 100644 index 000000000..d818938fa --- /dev/null +++ b/.DINAR/build-date.txt @@ -0,0 +1 @@ +March 11, 2020 -- 19:31 diff --git a/.DINAR/config.yaml b/.DINAR/config.yaml index 24e4c0f3a..36d06cf94 100644 --- a/.DINAR/config.yaml +++ b/.DINAR/config.yaml @@ -9,3 +9,5 @@ addons: server_wide_modules: - web + - ir_attachment_url + - ir_config_parameter_multi_company diff --git a/.github/workflows/DINAR-pr.yml b/.github/workflows/DINAR-pr.yml index e0a365677..d595c2a43 100644 --- a/.github/workflows/DINAR-pr.yml +++ b/.github/workflows/DINAR-pr.yml @@ -144,6 +144,7 @@ jobs: - name: Configure docker run: | bash DINAR/workflow-files/configure-docker.sh ${{ secrets.DINAR_TOKEN || secrets.GITHUB_TOKEN }} + echo "::set-env name=PR_FILES::../../REPO" - name: Install python tools run: | pip install plumbum PyGithub pyyaml @@ -158,6 +159,7 @@ jobs: ODOO_BASE_MODULES=$(docker inspect \ --format '{{ index .Config.Labels "dinar.odoo.modules"}}' \ dinar_odoo_1) + echo "ODOO_BASE_MODULES=$ODOO_BASE_MODULES" # sets environment variables that available in next steps via $ {{ env.PR_... }} notation cd REPO @@ -178,14 +180,18 @@ jobs: run: | # TODO https://github.com/itpp-labs/DINAR/issues/42 exit 1 + - name: Prepare Artifact Folder + run: | + mkdir new-deps/ + # create dummy file to be sure that Artifact will be uploaded + echo ok > new-deps/.empty - name: Prepare DINAR with additional dependencies if: env.PR_MODULES_DEPS != '' || env.PR_DEPS != '' run: | # Save artifacts for local run and for integrations Tests bash DINAR/workflow-files/save-docker-layers.sh new-deps/ - echo $MODULES > new-deps/modules.txt + echo "${{ env.PR_MODULES_DEPS }}" > new-deps/modules.txt - name: Save DINAR with dependencies - if: env.PR_MODULES_DEPS != '' || env.PR_DEPS != '' uses: actions/upload-artifact@v1 with: name: new-deps @@ -227,12 +233,14 @@ jobs: name: new-deps path: new-deps/ - name: Check artifact - if: failure() run: | - echo "::set-env name=ARTIFACT::failure" + if [ ! -f new-deps/modules.txt ]; then + echo "::set-env name=ARTIFACT::empty" + fi - name: Configure Docker run: | bash DINAR/workflow-files/configure-docker.sh ${{ secrets.DINAR_TOKEN || secrets.GITHUB_TOKEN }} + echo "::set-env name=PR_FILES::../../REPO" - name: Analyze PR run: | # sets environment variables that available in next steps via $ {{ env.PR_... }} notation @@ -245,7 +253,7 @@ jobs: docker-compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml pull docker-compose -p DINAR -f DINAR/workflow-files/docker-compose-DINAR-pr.yml up --no-start - name: Apply new-deps artifact - if: env.ARTIFACT != 'failure' + if: env.ARTIFACT != 'empty' run: | bash DINAR/workflow-files/load-docker-layers.sh new-deps/ diff --git a/.github/workflows/DINAR.yml b/.github/workflows/DINAR.yml index c18943a0d..089d610a2 100644 --- a/.github/workflows/DINAR.yml +++ b/.github/workflows/DINAR.yml @@ -63,7 +63,6 @@ jobs: password: ${{ env.REGISTRY_PASSWORD }} buildargs: ODOO_VERSION,AGGREGATE,PIP_INSTALL_ODOO,CLEAN,COMPILE,LOCAL_CUSTOM_DIR workdir: REPO/.DINAR/ - cache: ${{ github.event_name != 'schedule' }} - name: Install python tools run: | pip install plumbum pyyaml diff --git a/.github/workflows/repo2store.yml b/.github/workflows/repo2store.yml index ea918a922..39116651c 100644 --- a/.github/workflows/repo2store.yml +++ b/.github/workflows/repo2store.yml @@ -6,7 +6,9 @@ on: jobs: repo2store: runs-on: ubuntu-latest - if: "! endsWith(github.repository, '-store')" + if: + "! endsWith(github.repository, '-store') && startsWith(github.repository, + 'itpp-labs/')" steps: - name: Checkout REPO uses: actions/checkout@v2-beta diff --git a/hr_public_holidays_ics_import/__manifest__.py b/hr_public_holidays_ics_import/__manifest__.py index e2521c9d5..80bf0d2d0 100644 --- a/hr_public_holidays_ics_import/__manifest__.py +++ b/hr_public_holidays_ics_import/__manifest__.py @@ -7,7 +7,7 @@ "vesion": "11.0.1.0.0", "author": "IT-Projects LLC, Ildar Nasyrov", "website": "https://it-projects.info", - "license": "AGPL-3", + "license": "Other OSI approved licence", # MIT "price": 9.00, "currency": "EUR", "depends": ["hr_public_holidays"], diff --git a/ir_attachment_force_storage/__manifest__.py b/ir_attachment_force_storage/__manifest__.py index d4dfedea3..6f0f9b807 100644 --- a/ir_attachment_force_storage/__manifest__.py +++ b/ir_attachment_force_storage/__manifest__.py @@ -2,7 +2,7 @@ "name": "Force move attachments to DB storage", "version": "11.0.1.0.0", "author": "IT-Projects LLC, Ivan Yelizariev", - "license": "AGPL-3", + "license": "Other OSI approved licence", # MIT "category": "Tools", "website": "https://yelizariev.github.io", "depends": ["attachment_large_object"], diff --git a/ir_attachment_google_drive/README.rst b/ir_attachment_google_drive/README.rst new file mode 100644 index 000000000..5ccb2c999 --- /dev/null +++ b/ir_attachment_google_drive/README.rst @@ -0,0 +1,51 @@ +.. image:: https://img.shields.io/badge/license-MIT-blue.svg + :target: https://opensource.org/licenses/MIT + :alt: License: MIT + +================================= + Google Drive Attachment Storage +================================= + +TODO description intro + +TODO detailed description + +Credits +======= + +Contributors +------------ +* `Eugene Molotov `__: + + * :one::zero: init version of the module + +Sponsors +-------- +* `IT-Projects LLC `__ + +Maintainers +----------- +* `IT-Projects LLC `__ + + To get a guaranteed support + you are kindly requested to purchase the module + at `odoo apps store `__. + + Thank you for understanding! + + `IT-Projects Team `__ + +Further information +=================== + +Demo: http://runbot.it-projects.info/demo/misc-addons/11.0 + +HTML Description: https://apps.odoo.com/apps/modules/11.0/ir_attachment_google_drive/ + +Usage instructions: ``_ + +Changelog: ``_ + +Notifications on updates: `via Atom `_, `by Email `_ + +Tested on Odoo 11.0 a827d3015c6994bc3c779f9ba5cd270d8bdd8edd diff --git a/ir_attachment_google_drive/__init__.py b/ir_attachment_google_drive/__init__.py new file mode 100644 index 000000000..1d99e04b6 --- /dev/null +++ b/ir_attachment_google_drive/__init__.py @@ -0,0 +1,3 @@ +# License MIT (https://opensource.org/licenses/MIT). + +from . import models diff --git a/ir_attachment_google_drive/__manifest__.py b/ir_attachment_google_drive/__manifest__.py new file mode 100644 index 000000000..5a61de218 --- /dev/null +++ b/ir_attachment_google_drive/__manifest__.py @@ -0,0 +1,39 @@ +# Copyright 2020 Eugene Molotov +# License MIT (https://opensource.org/licenses/MIT). + +{ + "name": """Google Drive Attachment Storage""", + "summary": """TODO description intro""", + "category": "Extra Tools", + # "live_test_url": "http://apps.it-projects.info/shop/product/DEMO-URL?version=12.0", + "images": [], + "version": "11.0.1.0.0", + "application": False, + "author": "IT-Projects LLC, Eugene Molotov", + "support": "apps@it-projects.info", + "website": "https://apps.odoo.com/apps/modules/11.0/ir_attachment_google_drive/", + "license": "Other OSI approved licence", # MIT + # "price": 9.00, + # "currency": "EUR", + "depends": ["base", "google_drive"], + "external_dependencies": {"python": [], "bin": []}, + "data": ["views/res_config_settings_views.xml"], + "demo": [], + "qweb": [], + "post_load": None, + "pre_init_hook": None, + "post_init_hook": None, + "uninstall_hook": None, + "auto_install": False, + "installable": True, + # "demo_title": "Google Drive Attachment Storage", + # "demo_addons": [ + # ], + # "demo_addons_hidden": [ + # ], + # "demo_url": "DEMO-URL", + # "demo_summary": "TODO description intro", + # "demo_images": [ + # "images/MAIN_IMAGE", + # ] +} diff --git a/ir_attachment_google_drive/doc/changelog.rst b/ir_attachment_google_drive/doc/changelog.rst new file mode 100644 index 000000000..5583eb326 --- /dev/null +++ b/ir_attachment_google_drive/doc/changelog.rst @@ -0,0 +1,4 @@ +`1.0.0` +------- + +- **Init version** diff --git a/ir_attachment_google_drive/doc/index.rst b/ir_attachment_google_drive/doc/index.rst new file mode 100644 index 000000000..d3870a75f --- /dev/null +++ b/ir_attachment_google_drive/doc/index.rst @@ -0,0 +1,35 @@ +================================= + Google Drive Attachment Storage +================================= + +Installation +============ +{Instruction about things to do before actual installation} + +* {OPTIONAL }`Activate longpolling `__ +* {Additional notes if any} +* `Install `__ this module in a usual way + +Configuration +============= + +{Instruction how to configure the module before start to use it} + +* `Log in as SUPERUSER `__ +* `Activate Developer Mode `__ +* Open menu ``[[ {Menu} ]] >> {Submenu} >> {Subsubmenu}`` +* Click ``[{Button Name}]`` + +Usage +===== + +{Instruction for daily usage. It should describe how to check that module works. What shall user do and what would user get.} + +* Open menu ``[[ {Menu} ]]>> {Submenu} >> {Subsubmenu}`` +* Click ``[{Button Name}]`` +* RESULT: {what user gets, how the modules changes default behaviour} + +Uninstallation +============== + +{Optional section for uninstallation notes. Delete it if you don't have notes for uninstallation.} diff --git a/ir_attachment_google_drive/models/__init__.py b/ir_attachment_google_drive/models/__init__.py new file mode 100644 index 000000000..fcf9596c4 --- /dev/null +++ b/ir_attachment_google_drive/models/__init__.py @@ -0,0 +1,4 @@ +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html) + +from . import ir_attachment +from . import res_config_settings diff --git a/ir_attachment_google_drive/models/ir_attachment.py b/ir_attachment_google_drive/models/ir_attachment.py new file mode 100644 index 000000000..46a64ce2d --- /dev/null +++ b/ir_attachment_google_drive/models/ir_attachment.py @@ -0,0 +1,173 @@ +# Copyright 2020 Eugene Molotov +# License MIT (https://opensource.org/licenses/MIT). + +import base64 +import json +import logging + +import requests +from urllib3.fields import RequestField +from urllib3.filepost import choose_boundary, encode_multipart_formdata + +from odoo import api, models +from odoo.tools import human_size +from odoo.tools.safe_eval import safe_eval + +from odoo.addons.google_account.models.google_service import TIMEOUT + +_logger = logging.getLogger(__name__) +_logger.setLevel(logging.DEBUG) + +PREFIX = "google_drive://" + + +# https://stackoverflow.com/a/47682897 +def encode_multipart_related(fields, boundary=None): + if boundary is None: + boundary = choose_boundary() + + body, _ = encode_multipart_formdata(fields, boundary) + content_type = str("multipart/related; boundary=%s" % boundary) + + return body, content_type + + +def encode_media_related(metadata, media, media_content_type): + rf1 = RequestField( + name="placeholder", + data=json.dumps(metadata), + headers={"Content-Type": "application/json; charset=UTF-8"}, + ) + rf2 = RequestField( + name="placeholder2", data=media, headers={"Content-Type": media_content_type}, + ) + return encode_multipart_related([rf1, rf2]) + + +class IrAttachment(models.Model): + + _inherit = "ir.attachment" + + def _get_google_drive_auth_header(self): + access_token = self.env.context.get("google_drive_access_token") + if not access_token: + access_token = self.env["google.drive.config"].get_access_token() + return {"Authorization": "Bearer " + access_token} + + # это нагло скопировано с ir_attachment_url + @api.multi + def _filter_protected_attachments(self): + return self.filtered( + lambda r: r.res_model not in ["ir.ui.view", "ir.ui.menu"] + or not r.name.startswith("/web/content/") + or not r.name.startswith("/web/static/") + ) + + def _inverse_datas(self): + condition = ( + self.env["ir.config_parameter"] + .sudo() + .get_param("google_drive.attachment_condition") + ) + + if condition: + condition = safe_eval(condition, mode="eval") + our_records = self.sudo().search([("id", "in", self.ids)] + condition) + else: + our_records = self + + our_records = our_records._filter_protected_attachments() + + if our_records: + # make sure, you can use google drive + # otherwise - use default behaviour + try: + google_drive_access_token = self.env[ + "google.drive.config" + ].get_access_token() + except Exception: + _logger.exception( + "Google Drive is not configured properly. Keeping attachments as usual" + ) + return super(IrAttachment, self)._inverse_datas() + + self = self.with_context( + google_drive_access_token=google_drive_access_token + ) + + for attach in our_records: + bin_value = base64.b64decode(attach.datas) + fname = self._file_write_google_drive(bin_value, attach.datas_fname) + vals = { + "file_size": len(bin_value), + "checksum": self._compute_checksum(bin_value), + "index_content": self._index( + bin_value, attach.datas_fname, attach.mimetype + ), + "store_fname": fname, + "db_datas": False, + "type": "binary", + "datas_fname": attach.datas_fname, + } + super(IrAttachment, attach.sudo()).write(vals) + + return super(IrAttachment, self - our_records)._inverse_datas() + + def _file_read(self, fname, bin_size=False): + if not fname.startswith(PREFIX): + return super(IrAttachment, self)._file_read(fname, bin_size) + + file_id = fname[len(PREFIX) :] + _logger.debug("reading file with id {}".format(file_id)) + + if bin_size: + request_url = "https://www.googleapis.com/drive/v2/files/{}".format(file_id) + else: + request_url = "https://www.googleapis.com/drive/v2/files/{}?alt=media".format( + file_id + ) + + r = requests.get( + request_url, headers=self._get_google_drive_auth_header(), timeout=TIMEOUT + ) + r.raise_for_status() + + if bin_size: + return human_size(int(r.json()["fileSize"])) + else: + return base64.b64encode(r.content) + + def _file_write_google_drive(self, bin_value, original_filename): + metadata = {} + if original_filename: + metadata["title"] = original_filename + + data, content_type = encode_media_related( + metadata, bin_value, "application/octet-stream" + ) + + headers = self._get_google_drive_auth_header() + headers["Content-Type"] = content_type + + r = requests.post( + "https://www.googleapis.com/upload/drive/v2/files?uploadType=multipart", + headers=headers, + data=data, + ) + r.raise_for_status() + file_id = r.json()["id"] + _logger.debug("uploaded file with id {}".format(file_id)) + return PREFIX + file_id + + def _file_delete(self, fname): + if not fname.startswith(PREFIX): + return super(IrAttachment, self)._file_delete(fname) + + file_id = fname[len(PREFIX) :] + + r = requests.delete( + "https://www.googleapis.com/drive/v2/files/{}".format(file_id), + headers=self._get_google_drive_auth_header(), + timeout=TIMEOUT, + ) + r.raise_for_status() diff --git a/ir_attachment_google_drive/models/res_config_settings.py b/ir_attachment_google_drive/models/res_config_settings.py new file mode 100644 index 000000000..028e69dcf --- /dev/null +++ b/ir_attachment_google_drive/models/res_config_settings.py @@ -0,0 +1,37 @@ +# Copyright 2020 Eugene Molotov +# License MIT (https://opensource.org/licenses/MIT). + +from odoo import api, fields, models + + +class ResConfigSettings(models.TransientModel): + + _inherit = "res.config.settings" + + google_drive_attachment_condition = fields.Char( + string="Google Drive Condition", + help="""Specify valid odoo search domain here, + e.g. [('res_model', 'in', ['product.image'])] -- store data of product.image only. + Empty condition means all models""", + config_parameter="google_drive.attachment_condition", + ) + + @api.model + def get_values(self): + res = super(ResConfigSettings, self).get_values() + icp = self.env["ir.config_parameter"].sudo() + + res.update( + google_drive_attachment_condition=icp.get_param( + "google_drive.attachment_condition", "" + ), + ) + return res + + def set_values(self): + super(ResConfigSettings, self).set_values() + icp = self.env["ir.config_parameter"].sudo() + icp.set_param( + "google_drive.attachment_condition", + self.google_drive_attachment_condition or "", + ) diff --git a/ir_attachment_google_drive/static/description/icon.png b/ir_attachment_google_drive/static/description/icon.png new file mode 100644 index 000000000..b43a0a135 Binary files /dev/null and b/ir_attachment_google_drive/static/description/icon.png differ diff --git a/ir_attachment_google_drive/views/res_config_settings_views.xml b/ir_attachment_google_drive/views/res_config_settings_views.xml new file mode 100644 index 000000000..4e02463bb --- /dev/null +++ b/ir_attachment_google_drive/views/res_config_settings_views.xml @@ -0,0 +1,18 @@ + + + + + res.config.settings.view.form.inherit.google.drive + res.config.settings + + + +
+
+ + + + diff --git a/ir_attachment_s3/__manifest__.py b/ir_attachment_s3/__manifest__.py index d85ace5eb..355e5072b 100644 --- a/ir_attachment_s3/__manifest__.py +++ b/ir_attachment_s3/__manifest__.py @@ -7,7 +7,7 @@ "application": False, "author": "IT-Projects LLC, Ildar Nasyrov", "website": "https://it-projects.info", - "license": "AGPL-3", + "license": "Other OSI approved licence", # MIT "price": 200.00, "currency": "EUR", "depends": ["base_setup", "ir_attachment_url"], diff --git a/ir_attachment_url/__manifest__.py b/ir_attachment_url/__manifest__.py index 1a4b91a02..6ce7905d9 100644 --- a/ir_attachment_url/__manifest__.py +++ b/ir_attachment_url/__manifest__.py @@ -7,7 +7,7 @@ "application": False, "author": "IT-Projects LLC, Ildar Nasyrov", "website": "https://it-projects.info", - "license": "AGPL-3", + "license": "Other OSI approved licence", # MIT "price": 30.00, "currency": "EUR", "depends": ["web"], diff --git a/project_task_subtask/__manifest__.py b/project_task_subtask/__manifest__.py index b32344084..88e0ff20d 100644 --- a/project_task_subtask/__manifest__.py +++ b/project_task_subtask/__manifest__.py @@ -14,7 +14,7 @@ "author": "IT-Projects LLC, Manaev Rafael", "support": "apps@itpp.dev", "website": "https://it-projects.info", - "license": "GPL-3", + "license": "Other OSI approved licence", # MIT "price": 69.00, "currency": "EUR", "depends": ["base", "project"], diff --git a/reminder_crm_next_action_time/__manifest__.py b/reminder_crm_next_action_time/__manifest__.py index 7e5f28f15..9af1a1c01 100644 --- a/reminder_crm_next_action_time/__manifest__.py +++ b/reminder_crm_next_action_time/__manifest__.py @@ -8,7 +8,7 @@ "author": "IT-Projects LLC, Dinar Gabbasov", "support": "apps@itpp.dev", "website": "https://twitter.com/gabbasov_dinar", - "license": "GPL-3", + "license": "Other OSI approved licence", # MIT "price": 21.00, "currency": "EUR", "depends": ["reminder_base", "crm"], diff --git a/theme_kit/__manifest__.py b/theme_kit/__manifest__.py index df9192139..70353abae 100644 --- a/theme_kit/__manifest__.py +++ b/theme_kit/__manifest__.py @@ -11,7 +11,7 @@ "application": False, "author": "IT-Projects LLC, Ivan Yelizariev", "website": "https://it-projects.info", - "license": "GPL-3", + "license": "Other OSI approved licence", # MIT "price": 50.00, "currency": "EUR", "depends": ["web_debranding", "web_login_background", "web_widget_color"],