From fb3834b433eb5a446d28f696e1f60354b93377fd Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Fri, 27 Mar 2020 00:34:42 +0100 Subject: [PATCH] [REM]Hy base removal (for external python package) --- hy_base/__init__.py | 19 --------- hy_base/__manifest__.py | 31 -------------- hy_base/odoo.hy | 95 ----------------------------------------- hy_base/xml.hy | 47 -------------------- 4 files changed, 192 deletions(-) delete mode 100644 hy_base/__init__.py delete mode 100644 hy_base/__manifest__.py delete mode 100644 hy_base/odoo.hy delete mode 100644 hy_base/xml.hy diff --git a/hy_base/__init__.py b/hy_base/__init__.py deleted file mode 100644 index f19445b..0000000 --- a/hy_base/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2019 Fabien Bourgeois -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -import hy -from . import odoo diff --git a/hy_base/__manifest__.py b/hy_base/__manifest__.py deleted file mode 100644 index 8d83ade..0000000 --- a/hy_base/__manifest__.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2019 Fabien Bourgeois -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -{ - 'name': 'HY base module and macros', - 'summary': 'Hylang base module and macros', - 'description': """ Hylang base module and macros """, - 'version': '10.0.0.1.0', - 'category': 'HY', - 'author': 'Fabien Bourgeois', - 'license': 'AGPL-3', - 'application': False, - 'installable': True, - 'depends': ['base'], - 'data': [], - "external_dependencies": {'python' : ['hy']} -} diff --git a/hy_base/odoo.hy b/hy_base/odoo.hy deleted file mode 100644 index d439439..0000000 --- a/hy_base/odoo.hy +++ /dev/null @@ -1,95 +0,0 @@ -;; -*- coding: utf-8 -*- -;; -;; Copyright 2019 Fabien Bourgeois -;; -;; This program is free software: you can redistribute it and/or modify -;; it under the terms of the GNU Affero General Public License as -;; published by the Free Software Foundation, either version 3 of the -;; License, or (at your option) any later version. -;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU Affero General Public License for more details. -;; -;; You should have received a copy of the GNU Affero General Public License -;; along with this program. If not, see . - -" Odoo XML macros " - -(import [odoo.addons.hy_base.xml [*]]) - -(defmacro if-python2 [python2-form python3-form] - "If running on python2, execute python2-form, else, execute python3-form" - (import sys) - (if (< (get sys.version_info 0) 3) - python2-form - python3-form)) - -(defn ox-odoo [&rest args] (xmlroot (xmln "odoo" {} #*args))) -(defn ox-data [&rest args] (xmln "data" {} #*args)) -(defn ox-record [&rest args] (xmln "record" #*args)) -(defn ox-form [&rest args] (xmln "form" #*args)) -(defn ox-tree [&rest args] (xmln "tree" #*args)) -(defn ox-search [&rest args] (xmln "search" #*args)) -(defn ox-act-window [&rest args] (xmln "act_window" #*args)) -(defn ox-group [&rest args] (xmln "group" #*args)) -(defn ox-header [&rest args] (xmln "header" #*args)) -(defn ox-footer [&rest args] (xmln "footer" #*args)) -(defn ox-button [&rest args] (xmln "button" #*args)) -(defn ox-p [&rest args] (xmln "p" #*args)) -(defn ox-field [&rest args] (xmln "field" #*args)) - -(defn ox-field-name [name] (ox-field {"name" "name"} [name])) -(defn ox-field-model [model] (ox-field {"name" "model"} [model])) -(defn ox-field-inherit [xmlid] (ox-field {"name" "inherit_id" "ref" xmlid} [])) -(defn ox-field-arch [&rest args] (ox-field {"name" "arch" "type" "xml"} #*args)) - - -(defn ox-view [xmlid children] (ox-record {"id" xmlid "model" "ir.ui.view"} children)) -(defn ox-view-def [xmlid name model arch] - "View and first fields simplification with record xmlid, name, targeted model" - (ox-view xmlid - [(ox-field-name name) - (ox-field-model model) - (ox-field-arch arch)])) -(defn ox-view-inherit [name model inherit arch] - "Inherited View simplification with name of the record, xmlid for model and - inherited view" - (setv module (get (.split __name__ ".") 2) - inherited (get (.split inherit ".") 1) - xmlid f"{inherited}_inherit_{module}") - (ox-view xmlid - [(ox-field-name name) - (ox-field-model model) - (ox-field-inherit inherit) - (ox-field-arch arch)])) - -(defn ox-actions-server-code [xmlid name modelref code] - "Server actions of type code" - (ox-record {"id" xmlid "model" "ir.actions.server"} - [(ox-field-name name) - (ox-field {"name" "model_id" "ref" modelref} []) - (ox-field {"name" "state"} ["code"]) - (ox-field {"name" "code"} [code])])) - -(defn ox-client-action-multi [xmlid name model action] - "Client action multi (ir.values), with own xmlid, name, targeted model and - action" - (setv action f"'ir.actions.server,%d'%{action}") - (ox-record {"id" xmlid "model" "ir.values"} - [(ox-field-name name) - (ox-field {"name" "key2" "eval" "'client_action_multi'"} []) - (ox-field {"name" "model" "eval" (+ "'" model "'")} []) - (ox-field {"name" "value" "eval" action})])) - -(defmacro/g! xml-write [filename tree] - "Write XML file according to filename and given tree" - `(do - (import [os [path]]) - (if-python2 - (setv ~g!output-xml (.tostring ET ~tree)) - (setv ~g!output-xml (.decode (.tostring ET ~tree) "utf-8"))) - (setv ~g!output-path (.dirname path (.abspath path __file__)) - ~g!fpath (+ ~g!output-path "/" ~filename)) - (with [f (open ~g!fpath "w")] (.write f ~g!output-xml)))) diff --git a/hy_base/xml.hy b/hy_base/xml.hy deleted file mode 100644 index 98cff1b..0000000 --- a/hy_base/xml.hy +++ /dev/null @@ -1,47 +0,0 @@ -;; -*- coding: utf-8 -*- -;; -;; Copyright 2019 Fabien Bourgeois -;; -;; This program is free software: you can redistribute it and/or modify -;; it under the terms of the GNU Affero General Public License as -;; published by the Free Software Foundation, either version 3 of the -;; License, or (at your option) any later version. -;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU Affero General Public License for more details. -;; -;; You should have received a copy of the GNU Affero General Public License -;; along with this program. If not, see . - -" XML helpers and macros " - -(import [xml.etree.ElementTree :as ET]) - -(defn xmlroot [tree] - "Special process for root XML Node" - (setv rootel (.Element ET (get tree "tag") (get tree "attrs")) - children (get tree "children")) - (if children (xmlchild rootel children)) - (return rootel)) - -(defn xmlchild [parent children] - "Handling of children (ie non root) XML Nodes with/o text and subchildren - (recursive)" - (for [child children] - (if (string? child) - (setv (. parent text) child) - (do - (setv attrs (dfor [k v] (.items (get child "attrs")) [(str k) (str v)])) - (setv new_parent (.SubElement ET parent (get child "tag") attrs)) - (setv subchildren (get child "children")) - (if subchildren (xmlchild new_parent subchildren)))))) - -(defn xmln [tag &optional attrs children] - "XMLNode with optional attributes or children, defaults according to second - argument type or empty dict and list" - (if (and attrs (not children)) - (if (instance? list attrs) - (do (setv children attrs) (setv attrs {})))) - {"tag" tag "attrs" (or attrs {}) "children" (or children [])})