author | Denis Laxalde <denis.laxalde@logilab.fr> |
Fri, 20 Sep 2013 15:42:04 +0200 | |
branch | stable |
changeset 9263 | 42cc70a1b6ac |
parent 9231 | d2edd8ac5f33 |
child 9258 | 4e79f587c6ab |
permissions | -rw-r--r-- |
9201
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
1 |
# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved. |
5421
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
2 |
# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
3 |
# |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
4 |
# This file is part of CubicWeb. |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
5 |
# |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
6 |
# CubicWeb is free software: you can redistribute it and/or modify it under the |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
7 |
# terms of the GNU Lesser General Public License as published by the Free |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
8 |
# Software Foundation, either version 2.1 of the License, or (at your option) |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
9 |
# any later version. |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
10 |
# |
5424
8ecbcbff9777
replace logilab-common by CubicWeb in disclaimer
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5421
diff
changeset
|
11 |
# CubicWeb is distributed in the hope that it will be useful, but WITHOUT |
5421
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
13 |
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
14 |
# details. |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
15 |
# |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
16 |
# You should have received a copy of the GNU Lesser General Public License along |
8167de96c523
proper licensing information (LGPL-2.1). Hope I get it right this time.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5375
diff
changeset
|
17 |
# with CubicWeb. If not, see <http://www.gnu.org/licenses/>. |
5556
9ab2b4c74baf
[entity] introduce a new 'adapters' registry
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5545
diff
changeset
|
18 |
"""additional cubicweb-ctl commands and command handlers for cubicweb and |
9ab2b4c74baf
[entity] introduce a new 'adapters' registry
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5545
diff
changeset
|
19 |
cubicweb's cubes development |
9ab2b4c74baf
[entity] introduce a new 'adapters' registry
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5545
diff
changeset
|
20 |
""" |
0 | 21 |
|
22 |
__docformat__ = "restructuredtext en" |
|
23 |
||
4718
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
24 |
# *ctl module should limit the number of import to be imported as quickly as |
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
25 |
# possible (for cubicweb-ctl reactivity, necessary for instance for usable bash |
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
26 |
# completion). So import locally in command helpers. |
0 | 27 |
import sys |
1016
26387b836099
use datetime instead of mx.DateTime
sylvain.thenault@logilab.fr
parents:
396
diff
changeset
|
28 |
from datetime import datetime |
6749
48f468f33704
[config, i18n] Create default translation mechanism for all supported languages.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
6356
diff
changeset
|
29 |
from os import mkdir, chdir, path as osp |
2551
91f579b7a1e1
[F bw compat] warn if entities.pot exists but consider it anyway
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2534
diff
changeset
|
30 |
from warnings import warn |
0 | 31 |
|
32 |
from logilab.common import STD_BLACKLIST |
|
4428
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
33 |
|
3978
2c95e3033f64
finish yesterday work on rql constraints:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3858
diff
changeset
|
34 |
from cubicweb.__pkginfo__ import version as cubicwebversion |
8247
65b0d2587fb5
[cubicweb-ctl] i18ncube return 2 (failed command) on failure (closes #2192336)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7990
diff
changeset
|
35 |
from cubicweb import CW_SOFTWARE_ROOT as BASEDIR, BadCommandUsage, ExecutionError |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5775
diff
changeset
|
36 |
from cubicweb.cwctl import CWCTL |
6749
48f468f33704
[config, i18n] Create default translation mechanism for all supported languages.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
6356
diff
changeset
|
37 |
from cubicweb.cwconfig import CubicWebNoAppConfiguration |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
38 |
from cubicweb.toolsutils import (SKEL_EXCLUDE, Command, copy_skeleton, |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
39 |
underline_title) |
0 | 40 |
from cubicweb.web.webconfig import WebConfiguration |
41 |
from cubicweb.server.serverconfig import ServerConfiguration |
|
42 |
||
2790
968108e16066
move underline_title to toolsutils
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2773
diff
changeset
|
43 |
|
4479
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
44 |
class DevConfiguration(ServerConfiguration, WebConfiguration): |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
45 |
"""dummy config to get full library schema and appobjects for |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
46 |
a cube or for cubicweb (without a home) |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
47 |
""" |
0 | 48 |
creating = True |
4479
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
49 |
cleanup_interface_sobjects = False |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
50 |
|
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
51 |
cubicweb_appobject_path = (ServerConfiguration.cubicweb_appobject_path |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
52 |
| WebConfiguration.cubicweb_appobject_path) |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
53 |
cube_appobject_path = (ServerConfiguration.cube_appobject_path |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
54 |
| WebConfiguration.cube_appobject_path) |
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
55 |
|
4428
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
56 |
def __init__(self, *cubes): |
4479
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
57 |
super(DevConfiguration, self).__init__(cubes and cubes[0] or None) |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
58 |
if cubes: |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
59 |
self._cubes = self.reorder_cubes( |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
60 |
self.expand_cubes(cubes, with_recommends=True)) |
5534
b75aa6ce0c04
[i18ncube] we must load site_cubicweb file before calling set_schema, else we may miss some options or other initialization stuff necessary to appobject loading
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5456
diff
changeset
|
61 |
self.load_site_cubicweb() |
4479
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
62 |
else: |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
63 |
self._cubes = () |
1451 | 64 |
|
0 | 65 |
@property |
66 |
def apphome(self): |
|
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
67 |
return None |
6749
48f468f33704
[config, i18n] Create default translation mechanism for all supported languages.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
6356
diff
changeset
|
68 |
|
48f468f33704
[config, i18n] Create default translation mechanism for all supported languages.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
6356
diff
changeset
|
69 |
def available_languages(self): |
48f468f33704
[config, i18n] Create default translation mechanism for all supported languages.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
6356
diff
changeset
|
70 |
return self.cw_languages() |
48f468f33704
[config, i18n] Create default translation mechanism for all supported languages.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
6356
diff
changeset
|
71 |
|
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
72 |
def main_config_file(self): |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
73 |
return None |
5442
3ed8afbbdf70
[webconfig] refactor/cleanup debug mode management on startup: simply use config.debugmode instead of debug argument everywhere...
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5426
diff
changeset
|
74 |
def init_log(self): |
0 | 75 |
pass |
76 |
def load_configuration(self): |
|
77 |
pass |
|
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
78 |
def default_log_file(self): |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
79 |
return None |
0 | 80 |
|
81 |
||
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
82 |
def cleanup_sys_modules(config): |
0 | 83 |
# cleanup sys.modules, required when we're updating multiple cubes |
84 |
for name, mod in sys.modules.items(): |
|
85 |
if mod is None: |
|
86 |
# duh ? logilab.common.os for instance |
|
87 |
del sys.modules[name] |
|
88 |
continue |
|
89 |
if not hasattr(mod, '__file__'): |
|
90 |
continue |
|
7752
df91baa5b837
[devctl] do not crash in the (rare, odd) case where mod.__file__ is None (closes #1908664)
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
7745
diff
changeset
|
91 |
if mod.__file__ is None: |
df91baa5b837
[devctl] do not crash in the (rare, odd) case where mod.__file__ is None (closes #1908664)
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
7745
diff
changeset
|
92 |
# odd/rare but real |
df91baa5b837
[devctl] do not crash in the (rare, odd) case where mod.__file__ is None (closes #1908664)
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
7745
diff
changeset
|
93 |
continue |
8537
e30d0a7f0087
[config] turn internal configuration methods building appobjects search path into normal method rather than class method
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
8454
diff
changeset
|
94 |
for path in config.appobjects_path(): |
0 | 95 |
if mod.__file__.startswith(path): |
96 |
del sys.modules[name] |
|
97 |
break |
|
1451 | 98 |
|
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
99 |
def generate_schema_pot(w, cubedir=None): |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
100 |
"""generate a pot file with schema specific i18n messages |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
101 |
|
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
102 |
notice that relation definitions description and static vocabulary |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
103 |
should be marked using '_' and extracted using xgettext |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
104 |
""" |
8190
2a3c1b787688
[vreg] move base registry implementation to logilab.common. Closes #1916014
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7990
diff
changeset
|
105 |
from cubicweb.cwvreg import CWRegistryStore |
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
106 |
if cubedir: |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
107 |
cube = osp.split(cubedir)[-1] |
4479
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
108 |
config = DevConfiguration(cube) |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
109 |
depcubes = list(config._cubes) |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
110 |
depcubes.remove(cube) |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
111 |
libconfig = DevConfiguration(*depcubes) |
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
112 |
else: |
4479
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
113 |
config = DevConfiguration() |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
114 |
cube = libconfig = None |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
115 |
cleanup_sys_modules(config) |
1665 | 116 |
schema = config.load_schema(remove_unused_rtypes=False) |
8190
2a3c1b787688
[vreg] move base registry implementation to logilab.common. Closes #1916014
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7990
diff
changeset
|
117 |
vreg = CWRegistryStore(config) |
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
118 |
# set_schema triggers objects registrations |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
119 |
vreg.set_schema(schema) |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
120 |
w(DEFAULT_POT_HEAD) |
4722
9c13d5db03d9
pylint suggested refactorings
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4719
diff
changeset
|
121 |
_generate_schema_pot(w, vreg, schema, libconfig=libconfig) |
1451 | 122 |
|
123 |
||
4718
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
124 |
def _generate_schema_pot(w, vreg, schema, libconfig=None): |
4021
280c910c8710
move i18n / migration modules from cw.common to cw
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3998
diff
changeset
|
125 |
from cubicweb.i18n import add_msg |
6481
103774c8c215
[schema categorization] new NO_I18NCONTEXT set usable to somewhat control c-c i18n
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6460
diff
changeset
|
126 |
from cubicweb.schema import NO_I18NCONTEXT, CONSTRAINTS |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
127 |
w('# schema pot file, generated on %s\n' |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
128 |
% datetime.now().strftime('%Y-%m-%d %H:%M:%S')) |
0 | 129 |
w('# \n') |
130 |
w('# singular and plural forms for each entity type\n') |
|
131 |
w('\n') |
|
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
132 |
vregdone = set() |
9154
e713c47a993d
[devctl] properly generate i18n messsages for cubes that uses uicfg instances (closes #2811282)
David Douard <david.douard@logilab.fr>
parents:
8866
diff
changeset
|
133 |
afss = vreg['uicfg']['autoform_section'] |
9201
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
134 |
aiams = vreg['uicfg']['actionbox_appearsin_addmenu'] |
1470
fbdf66a08fbb
don't add to cube i18n catalog msg id for components redefined from cw or from a depending cube
sylvain.thenault@logilab.fr
parents:
1451
diff
changeset
|
135 |
if libconfig is not None: |
9201
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
136 |
# processing a cube, libconfig being a config with all its dependencies |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
137 |
# (cubicweb incl.) |
8666
1dd655788ece
make ui configurations selectable (closes #2406609)
Florent Cayré <florent.cayre@logilab.fr>
parents:
8665
diff
changeset
|
138 |
from cubicweb.cwvreg import CWRegistryStore |
1665 | 139 |
libschema = libconfig.load_schema(remove_unused_rtypes=False) |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
140 |
cleanup_sys_modules(libconfig) |
8190
2a3c1b787688
[vreg] move base registry implementation to logilab.common. Closes #1916014
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7990
diff
changeset
|
141 |
libvreg = CWRegistryStore(libconfig) |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
142 |
libvreg.set_schema(libschema) # trigger objects registration |
9154
e713c47a993d
[devctl] properly generate i18n messsages for cubes that uses uicfg instances (closes #2811282)
David Douard <david.douard@logilab.fr>
parents:
8866
diff
changeset
|
143 |
libafss = libvreg['uicfg']['autoform_section'] |
9201
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
144 |
libaiams = libvreg['uicfg']['actionbox_appearsin_addmenu'] |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
145 |
# prefill vregdone set |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
146 |
list(_iter_vreg_objids(libvreg, vregdone)) |
9201
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
147 |
|
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
148 |
def is_in_lib(rtags, eschema, rschema, role, tschema, predicate=bool): |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
149 |
return any(predicate(rtag.etype_get(eschema, rschema, role, tschema)) |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
150 |
for rtag in rtags) |
0 | 151 |
else: |
9201
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
152 |
# processing cubicweb itself |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
153 |
libschema = {} |
3978
2c95e3033f64
finish yesterday work on rql constraints:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3858
diff
changeset
|
154 |
for cstrtype in CONSTRAINTS: |
2c95e3033f64
finish yesterday work on rql constraints:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3858
diff
changeset
|
155 |
add_msg(w, cstrtype) |
9231
d2edd8ac5f33
[c-c i18ncubicweb] fix crash, closes #3096647
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9203
diff
changeset
|
156 |
libafss = libaiams = None |
d2edd8ac5f33
[c-c i18ncubicweb] fix crash, closes #3096647
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9203
diff
changeset
|
157 |
is_in_lib = lambda *args: False |
0 | 158 |
done = set() |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
159 |
for eschema in sorted(schema.entities()): |
7745
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
160 |
if eschema.type in libschema: |
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
161 |
done.add(eschema.description) |
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
162 |
for eschema in sorted(schema.entities()): |
0 | 163 |
etype = eschema.type |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
164 |
if etype not in libschema: |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
165 |
add_msg(w, etype) |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
166 |
add_msg(w, '%s_plural' % etype) |
3689
deb13e88e037
follow yams 0.25 api changes to improve performance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3638
diff
changeset
|
167 |
if not eschema.final: |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
168 |
add_msg(w, 'This %s' % etype) |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
169 |
add_msg(w, 'New %s' % etype) |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
170 |
if eschema.description and not eschema.description in done: |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
171 |
done.add(eschema.description) |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
172 |
add_msg(w, eschema.description) |
3689
deb13e88e037
follow yams 0.25 api changes to improve performance
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3638
diff
changeset
|
173 |
if eschema.final: |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
174 |
continue |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
175 |
for rschema, targetschemas, role in eschema.relation_definitions(True): |
4399
bc8d7ac70347
skip final relations at this point
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4380
diff
changeset
|
176 |
if rschema.final: |
bc8d7ac70347
skip final relations at this point
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4380
diff
changeset
|
177 |
continue |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
178 |
for tschema in targetschemas: |
9154
e713c47a993d
[devctl] properly generate i18n messsages for cubes that uses uicfg instances (closes #2811282)
David Douard <david.douard@logilab.fr>
parents:
8866
diff
changeset
|
179 |
|
9201
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
180 |
for afs in afss: |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
181 |
fsections = afs.etype_get(eschema, rschema, role, tschema) |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
182 |
if 'main_inlined' in fsections and not \ |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
183 |
is_in_lib(libafss, eschema, rschema, role, tschema, |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
184 |
lambda x: 'main_inlined' in x): |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
185 |
add_msg(w, 'add a %s' % tschema, |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
186 |
'inlined:%s.%s.%s' % (etype, rschema, role)) |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
187 |
add_msg(w, str(tschema), |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
188 |
'inlined:%s.%s.%s' % (etype, rschema, role)) |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
189 |
break |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
190 |
|
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
191 |
for aiam in aiams: |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
192 |
if aiam.etype_get(eschema, rschema, role, tschema) and not \ |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
193 |
is_in_lib(libaiams, eschema, rschema, role, tschema): |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
194 |
if role == 'subject': |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
195 |
label = 'add %s %s %s %s' % (eschema, rschema, |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
196 |
tschema, role) |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
197 |
label2 = "creating %s (%s %%(linkto)s %s %s)" % ( |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
198 |
tschema, eschema, rschema, tschema) |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
199 |
else: |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
200 |
label = 'add %s %s %s %s' % (tschema, rschema, |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
201 |
eschema, role) |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
202 |
label2 = "creating %s (%s %s %s %%(linkto)s)" % ( |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
203 |
tschema, tschema, rschema, eschema) |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
204 |
add_msg(w, label) |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
205 |
add_msg(w, label2) |
b0f6e8c14e7f
[i18ncube] fix crash due to duplicated messages in generated schema.pot
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
9157
diff
changeset
|
206 |
break |
3858
ba96e4607e67
add XX reminder
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
207 |
# XXX also generate "creating ...' messages for actions in the |
ba96e4607e67
add XX reminder
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
208 |
# addrelated submenu |
0 | 209 |
w('# subject and object forms for each relation type\n') |
4467
0e73d299730a
fix long-waiting symetric typo: should be spelled symmetric. Add auto database migration on schema deserialization
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4439
diff
changeset
|
210 |
w('# (no object form for final or symmetric relation types)\n') |
0 | 211 |
w('\n') |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
212 |
for rschema in sorted(schema.relations()): |
7745
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
213 |
if rschema.type in libschema: |
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
214 |
done.add(rschema.type) |
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
215 |
done.add(rschema.description) |
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
216 |
for rschema in sorted(schema.relations()): |
0 | 217 |
rtype = rschema.type |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
218 |
if rtype not in libschema: |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
219 |
# bw compat, necessary until all translation of relation are done |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
220 |
# properly... |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
221 |
add_msg(w, rtype) |
7745
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
222 |
done.add(rtype) |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
223 |
if rschema.description and rschema.description not in done: |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
224 |
add_msg(w, rschema.description) |
7745
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
225 |
done.add(rschema.description) |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
226 |
librschema = None |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
227 |
else: |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
228 |
librschema = libschema.rschema(rtype) |
3281
bea1bde00fbc
[i18n] do not add context information for metadata relations
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
3280
diff
changeset
|
229 |
# add context information only for non-metadata rtypes |
6481
103774c8c215
[schema categorization] new NO_I18NCONTEXT set usable to somewhat control c-c i18n
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6460
diff
changeset
|
230 |
if rschema not in NO_I18NCONTEXT: |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
231 |
libsubjects = librschema and librschema.subjects() or () |
3281
bea1bde00fbc
[i18n] do not add context information for metadata relations
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
3280
diff
changeset
|
232 |
for subjschema in rschema.subjects(): |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
233 |
if not subjschema in libsubjects: |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
234 |
add_msg(w, rtype, subjschema.type) |
7745
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
235 |
if not (rschema.final or rschema.symmetric): |
6481
103774c8c215
[schema categorization] new NO_I18NCONTEXT set usable to somewhat control c-c i18n
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6460
diff
changeset
|
236 |
if rschema not in NO_I18NCONTEXT: |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
237 |
libobjects = librschema and librschema.objects() or () |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
238 |
for objschema in rschema.objects(): |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
239 |
if not objschema in libobjects: |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
240 |
add_msg(w, '%s_object' % rtype, objschema.type) |
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
241 |
if rtype not in libschema: |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
242 |
# bw compat, necessary until all translation of relation are |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
243 |
# done properly... |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
244 |
add_msg(w, '%s_object' % rtype) |
7745
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
245 |
for rdef in rschema.rdefs.itervalues(): |
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
246 |
if not rdef.description or rdef.description in done: |
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
247 |
continue |
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
248 |
if (librschema is None or |
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
249 |
(rdef.subject, rdef.object) not in librschema.rdefs or |
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
250 |
librschema.rdefs[(rdef.subject, rdef.object)].description != rdef.description): |
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
251 |
add_msg(w, rdef.description) |
1013c31bfbee
[.po generation] closes #1902315: c i18ncube doesn't consider relation definition description
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6750
diff
changeset
|
252 |
done.add(rdef.description) |
3285
fa3dc35b564f
fix .po generation: ensure we get all msgids when building a cube catalog
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3281
diff
changeset
|
253 |
for objid in _iter_vreg_objids(vreg, vregdone): |
1470
fbdf66a08fbb
don't add to cube i18n catalog msg id for components redefined from cw or from a depending cube
sylvain.thenault@logilab.fr
parents:
1451
diff
changeset
|
254 |
add_msg(w, '%s_description' % objid) |
fbdf66a08fbb
don't add to cube i18n catalog msg id for components redefined from cw or from a depending cube
sylvain.thenault@logilab.fr
parents:
1451
diff
changeset
|
255 |
add_msg(w, objid) |
fbdf66a08fbb
don't add to cube i18n catalog msg id for components redefined from cw or from a depending cube
sylvain.thenault@logilab.fr
parents:
1451
diff
changeset
|
256 |
|
3293 | 257 |
|
4722
9c13d5db03d9
pylint suggested refactorings
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4719
diff
changeset
|
258 |
def _iter_vreg_objids(vreg, done): |
0 | 259 |
for reg, objdict in vreg.items(): |
6443
a5bed0cd3956
[i18n cube] skip bw compat registries boxes and contentnavigation
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6356
diff
changeset
|
260 |
if reg in ('boxes', 'contentnavigation'): |
a5bed0cd3956
[i18n cube] skip bw compat registries boxes and contentnavigation
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6356
diff
changeset
|
261 |
continue |
8696
0bb18407c053
[toward py3k] rewrite dict.keys() and dict.values() (part of #2711624)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8695
diff
changeset
|
262 |
for objects in objdict.itervalues(): |
0 | 263 |
for obj in objects: |
3677
acdba524bb8f
fix i18ncube
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3674
diff
changeset
|
264 |
objid = '%s_%s' % (reg, obj.__regid__) |
0 | 265 |
if objid in done: |
1470
fbdf66a08fbb
don't add to cube i18n catalog msg id for components redefined from cw or from a depending cube
sylvain.thenault@logilab.fr
parents:
1451
diff
changeset
|
266 |
break |
7990
a673d1d9a738
[diet]Â drop pre 3.6 API compatibility (but attempt to keep data cmopatibility). Closes #2017916
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
7752
diff
changeset
|
267 |
pdefs = getattr(obj, 'cw_property_defs', {}) |
3677
acdba524bb8f
fix i18ncube
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3674
diff
changeset
|
268 |
if pdefs: |
1470
fbdf66a08fbb
don't add to cube i18n catalog msg id for components redefined from cw or from a depending cube
sylvain.thenault@logilab.fr
parents:
1451
diff
changeset
|
269 |
yield objid |
0 | 270 |
done.add(objid) |
1470
fbdf66a08fbb
don't add to cube i18n catalog msg id for components redefined from cw or from a depending cube
sylvain.thenault@logilab.fr
parents:
1451
diff
changeset
|
271 |
break |
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
272 |
|
1451 | 273 |
|
0 | 274 |
DEFAULT_POT_HEAD = r'''msgid "" |
275 |
msgstr "" |
|
276 |
"Project-Id-Version: cubicweb %s\n" |
|
277 |
"PO-Revision-Date: 2008-03-28 18:14+0100\n" |
|
278 |
"Last-Translator: Logilab Team <contact@logilab.fr>\n" |
|
279 |
"Language-Team: fr <contact@logilab.fr>\n" |
|
280 |
"MIME-Version: 1.0\n" |
|
281 |
"Content-Type: text/plain; charset=UTF-8\n" |
|
282 |
"Content-Transfer-Encoding: 8bit\n" |
|
283 |
"Generated-By: cubicweb-devtools\n" |
|
284 |
"Plural-Forms: nplurals=2; plural=(n > 1);\n" |
|
285 |
||
286 |
''' % cubicwebversion |
|
287 |
||
288 |
||
289 |
class UpdateCubicWebCatalogCommand(Command): |
|
290 |
"""Update i18n catalogs for cubicweb library. |
|
1451 | 291 |
|
0 | 292 |
It will regenerate cubicweb/i18n/xx.po files. You'll have then to edit those |
293 |
files to add translations of newly added messages. |
|
294 |
""" |
|
1898
39b37f90a8a4
[cw-ctl] rename i18n commands (see #342889)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
1850
diff
changeset
|
295 |
name = 'i18ncubicweb' |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
296 |
min_args = max_args = 0 |
0 | 297 |
|
298 |
def run(self, args): |
|
299 |
"""run the command with its specific arguments""" |
|
300 |
import shutil |
|
2446
440cb4ea7e5c
[refactor] #342855: replace uses of (deprecated) mktemp
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
301 |
import tempfile |
0 | 302 |
import yams |
303 |
from logilab.common.fileutils import ensure_fs_mode |
|
58
c7c22b210372
only try to internationalize our own js files
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
57
diff
changeset
|
304 |
from logilab.common.shellutils import globfind, find, rm |
4718
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
305 |
from logilab.common.modutils import get_module_files |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
306 |
from cubicweb.i18n import extract_from_tal, execute2 |
8257
d54fc706d623
[test] create temporary directory with meaningfull prefix
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
8247
diff
changeset
|
307 |
tempdir = tempfile.mkdtemp(prefix='cw-') |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
308 |
cwi18ndir = WebConfiguration.i18n_lib_dir() |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
309 |
print '-> extract messages:', |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
310 |
print 'schema', |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
311 |
schemapot = osp.join(tempdir, 'schema.pot') |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
312 |
potfiles = [schemapot] |
0 | 313 |
potfiles.append(schemapot) |
314 |
# explicit close necessary else the file may not be yet flushed when |
|
315 |
# we'll using it below |
|
316 |
schemapotstream = file(schemapot, 'w') |
|
317 |
generate_schema_pot(schemapotstream.write, cubedir=None) |
|
318 |
schemapotstream.close() |
|
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
319 |
print 'TAL', |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
320 |
tali18nfile = osp.join(tempdir, 'tali18n.py') |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
321 |
extract_from_tal(find(osp.join(BASEDIR, 'web'), ('.py', '.pt')), |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
322 |
tali18nfile) |
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
323 |
print '-> generate .pot files.' |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
324 |
pyfiles = get_module_files(BASEDIR) |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
325 |
pyfiles += globfind(osp.join(BASEDIR, 'misc', 'migration'), '*.py') |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
326 |
schemafiles = globfind(osp.join(BASEDIR, 'schemas'), '*.py') |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
327 |
jsfiles = globfind(osp.join(BASEDIR, 'web'), 'cub*.js') |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
328 |
for id, files, lang in [('pycubicweb', pyfiles, None), |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
329 |
('schemadescr', schemafiles, None), |
0 | 330 |
('yams', get_module_files(yams.__path__[0]), None), |
331 |
('tal', [tali18nfile], None), |
|
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
332 |
('js', jsfiles, 'java'), |
0 | 333 |
]: |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
334 |
potfile = osp.join(tempdir, '%s.pot' % id) |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
335 |
cmd = ['xgettext', '--no-location', '--omit-header', '-k_'] |
0 | 336 |
if lang is not None: |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
337 |
cmd.extend(['-L', lang]) |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
338 |
cmd.extend(['-o', potfile]) |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
339 |
cmd.extend(files) |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
340 |
execute2(cmd) |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
341 |
if osp.exists(potfile): |
1502 | 342 |
potfiles.append(potfile) |
343 |
else: |
|
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
344 |
print '-> WARNING: %s file was not generated' % potfile |
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
345 |
print '-> merging %i .pot files' % len(potfiles) |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
346 |
cubicwebpot = osp.join(tempdir, 'cubicweb.pot') |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
347 |
cmd = ['msgcat', '-o', cubicwebpot] + potfiles |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
348 |
execute2(cmd) |
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
349 |
print '-> merging main pot file with existing translations.' |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
350 |
chdir(cwi18ndir) |
0 | 351 |
toedit = [] |
6749
48f468f33704
[config, i18n] Create default translation mechanism for all supported languages.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
6356
diff
changeset
|
352 |
for lang in CubicWebNoAppConfiguration.cw_languages(): |
0 | 353 |
target = '%s.po' % lang |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
354 |
cmd = ['msgmerge', '-N', '--sort-output', '-o', |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
355 |
target+'new', target, cubicwebpot] |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
356 |
execute2(cmd) |
0 | 357 |
ensure_fs_mode(target) |
358 |
shutil.move('%snew' % target, target) |
|
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
359 |
toedit.append(osp.abspath(target)) |
0 | 360 |
# cleanup |
60
dc90556488d8
oops, bad changeset review, revert debug changes
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
58
diff
changeset
|
361 |
rm(tempdir) |
0 | 362 |
# instructions pour la suite |
2396
8bfb99d7bbcc
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2395
diff
changeset
|
363 |
print '-> regenerated CubicWeb\'s .po catalogs.' |
8bfb99d7bbcc
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2395
diff
changeset
|
364 |
print '\nYou can now edit the following files:' |
0 | 365 |
print '* ' + '\n* '.join(toedit) |
2396
8bfb99d7bbcc
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2395
diff
changeset
|
366 |
print 'when you are done, run "cubicweb-ctl i18ncube yourcube".' |
0 | 367 |
|
368 |
||
6444
cc091175d3da
[c-c i18ncube] proper command class name
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6443
diff
changeset
|
369 |
class UpdateCubeCatalogCommand(Command): |
0 | 370 |
"""Update i18n catalogs for cubes. If no cube is specified, update |
371 |
catalogs of all registered cubes. |
|
372 |
""" |
|
1898
39b37f90a8a4
[cw-ctl] rename i18n commands (see #342889)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
1850
diff
changeset
|
373 |
name = 'i18ncube' |
0 | 374 |
arguments = '[<cube>...]' |
1451 | 375 |
|
0 | 376 |
def run(self, args): |
377 |
"""run the command with its specific arguments""" |
|
378 |
if args: |
|
4479
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
379 |
cubes = [DevConfiguration.cube_dir(cube) for cube in args] |
0 | 380 |
else: |
4479
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
381 |
cubes = [DevConfiguration.cube_dir(cube) |
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
382 |
for cube in DevConfiguration.available_cubes()] |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
383 |
cubes = [cubepath for cubepath in cubes |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
384 |
if osp.exists(osp.join(cubepath, 'i18n'))] |
8247
65b0d2587fb5
[cubicweb-ctl] i18ncube return 2 (failed command) on failure (closes #2192336)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7990
diff
changeset
|
385 |
if not update_cubes_catalogs(cubes): |
65b0d2587fb5
[cubicweb-ctl] i18ncube return 2 (failed command) on failure (closes #2192336)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7990
diff
changeset
|
386 |
raise ExecutionError("update cubes i18n catalog failed") |
0 | 387 |
|
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
388 |
|
0 | 389 |
def update_cubes_catalogs(cubes): |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
390 |
from subprocess import CalledProcessError |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
391 |
for cubedir in cubes: |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
392 |
if not osp.isdir(cubedir): |
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
393 |
print '-> ignoring %s that is not a directory.' % cubedir |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
394 |
continue |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
395 |
try: |
5537
2889091bd1bf
[i18ncube] do not crash if cube has nothing to translate
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5534
diff
changeset
|
396 |
toedit = update_cube_catalogs(cubedir) |
8695
358d8bed9626
[toward-py3k] rewrite to "except AnException as exc:" (part of #2711624)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8666
diff
changeset
|
397 |
except CalledProcessError as exc: |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
398 |
print '\n*** error while updating catalogs for cube', cubedir |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
399 |
print 'cmd:\n%s' % exc.cmd |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
400 |
print 'stdout:\n%s\nstderr:\n%s' % exc.data |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
401 |
except Exception: |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
402 |
import traceback |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
403 |
traceback.print_exc() |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
404 |
print '*** error while updating catalogs for cube', cubedir |
8247
65b0d2587fb5
[cubicweb-ctl] i18ncube return 2 (failed command) on failure (closes #2192336)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7990
diff
changeset
|
405 |
return False |
2527
e60db6312aa0
per cube message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2458
diff
changeset
|
406 |
else: |
e60db6312aa0
per cube message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2458
diff
changeset
|
407 |
# instructions pour la suite |
5537
2889091bd1bf
[i18ncube] do not crash if cube has nothing to translate
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5534
diff
changeset
|
408 |
if toedit: |
2889091bd1bf
[i18ncube] do not crash if cube has nothing to translate
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5534
diff
changeset
|
409 |
print '-> regenerated .po catalogs for cube %s.' % cubedir |
2889091bd1bf
[i18ncube] do not crash if cube has nothing to translate
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5534
diff
changeset
|
410 |
print '\nYou can now edit the following files:' |
2889091bd1bf
[i18ncube] do not crash if cube has nothing to translate
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5534
diff
changeset
|
411 |
print '* ' + '\n* '.join(toedit) |
2889091bd1bf
[i18ncube] do not crash if cube has nothing to translate
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5534
diff
changeset
|
412 |
print ('When you are done, run "cubicweb-ctl i18ninstance ' |
2889091bd1bf
[i18ncube] do not crash if cube has nothing to translate
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5534
diff
changeset
|
413 |
'<yourinstance>" to see changes in your instances.') |
8247
65b0d2587fb5
[cubicweb-ctl] i18ncube return 2 (failed command) on failure (closes #2192336)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
7990
diff
changeset
|
414 |
return True |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
415 |
|
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
416 |
def update_cube_catalogs(cubedir): |
0 | 417 |
import shutil |
2446
440cb4ea7e5c
[refactor] #342855: replace uses of (deprecated) mktemp
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
418 |
import tempfile |
0 | 419 |
from logilab.common.fileutils import ensure_fs_mode |
420 |
from logilab.common.shellutils import find, rm |
|
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
421 |
from cubicweb.i18n import extract_from_tal, execute2 |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
422 |
cube = osp.basename(osp.normpath(cubedir)) |
2446
440cb4ea7e5c
[refactor] #342855: replace uses of (deprecated) mktemp
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
423 |
tempdir = tempfile.mkdtemp() |
2396
8bfb99d7bbcc
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2395
diff
changeset
|
424 |
print underline_title('Updating i18n catalogs for cube %s' % cube) |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
425 |
chdir(cubedir) |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
426 |
if osp.exists(osp.join('i18n', 'entities.pot')): |
2551
91f579b7a1e1
[F bw compat] warn if entities.pot exists but consider it anyway
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2534
diff
changeset
|
427 |
warn('entities.pot is deprecated, rename file to static-messages.pot (%s)' |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
428 |
% osp.join('i18n', 'entities.pot'), DeprecationWarning) |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
429 |
potfiles = [osp.join('i18n', 'entities.pot')] |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
430 |
elif osp.exists(osp.join('i18n', 'static-messages.pot')): |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
431 |
potfiles = [osp.join('i18n', 'static-messages.pot')] |
2551
91f579b7a1e1
[F bw compat] warn if entities.pot exists but consider it anyway
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2534
diff
changeset
|
432 |
else: |
91f579b7a1e1
[F bw compat] warn if entities.pot exists but consider it anyway
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2534
diff
changeset
|
433 |
potfiles = [] |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
434 |
print '-> extracting messages:', |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
435 |
print 'schema', |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
436 |
schemapot = osp.join(tempdir, 'schema.pot') |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
437 |
potfiles.append(schemapot) |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
438 |
# explicit close necessary else the file may not be yet flushed when |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
439 |
# we'll using it below |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
440 |
schemapotstream = file(schemapot, 'w') |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
441 |
generate_schema_pot(schemapotstream.write, cubedir) |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
442 |
schemapotstream.close() |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
443 |
print 'TAL', |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
444 |
tali18nfile = osp.join(tempdir, 'tali18n.py') |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
445 |
ptfiles = find('.', ('.py', '.pt'), blacklist=STD_BLACKLIST+('test',)) |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
446 |
extract_from_tal(ptfiles, tali18nfile) |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
447 |
print 'Javascript' |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
448 |
jsfiles = [jsfile for jsfile in find('.', '.js') |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
449 |
if osp.basename(jsfile).startswith('cub')] |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
450 |
if jsfiles: |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
451 |
tmppotfile = osp.join(tempdir, 'js.pot') |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
452 |
cmd = ['xgettext', '--no-location', '--omit-header', '-k_', '-L', 'java', |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
453 |
'--from-code=utf-8', '-o', tmppotfile] + jsfiles |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
454 |
execute2(cmd) |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
455 |
# no pot file created if there are no string to translate |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
456 |
if osp.exists(tmppotfile): |
0 | 457 |
potfiles.append(tmppotfile) |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
458 |
print '-> creating cube-specific catalog' |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
459 |
tmppotfile = osp.join(tempdir, 'generated.pot') |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
460 |
cubefiles = find('.', '.py', blacklist=STD_BLACKLIST+('test',)) |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
461 |
cubefiles.append(tali18nfile) |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
462 |
cmd = ['xgettext', '--no-location', '--omit-header', '-k_', '-o', tmppotfile] |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
463 |
cmd.extend(cubefiles) |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
464 |
execute2(cmd) |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
465 |
if osp.exists(tmppotfile): # doesn't exists of no translation string found |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
466 |
potfiles.append(tmppotfile) |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
467 |
potfile = osp.join(tempdir, 'cube.pot') |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
468 |
print '-> merging %i .pot files' % len(potfiles) |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
469 |
cmd = ['msgcat', '-o', potfile] |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
470 |
cmd.extend(potfiles) |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
471 |
execute2(cmd) |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
472 |
if not osp.exists(potfile): |
5537
2889091bd1bf
[i18ncube] do not crash if cube has nothing to translate
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5534
diff
changeset
|
473 |
print 'no message catalog for cube', cube, 'nothing to translate' |
2889091bd1bf
[i18ncube] do not crash if cube has nothing to translate
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5534
diff
changeset
|
474 |
# cleanup |
2889091bd1bf
[i18ncube] do not crash if cube has nothing to translate
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5534
diff
changeset
|
475 |
rm(tempdir) |
2889091bd1bf
[i18ncube] do not crash if cube has nothing to translate
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5534
diff
changeset
|
476 |
return () |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
477 |
print '-> merging main pot file with existing translations:', |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
478 |
chdir('i18n') |
5537
2889091bd1bf
[i18ncube] do not crash if cube has nothing to translate
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5534
diff
changeset
|
479 |
toedit = [] |
6749
48f468f33704
[config, i18n] Create default translation mechanism for all supported languages.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
6356
diff
changeset
|
480 |
for lang in CubicWebNoAppConfiguration.cw_languages(): |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
481 |
print lang, |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
482 |
cubepo = '%s.po' % lang |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
483 |
if not osp.exists(cubepo): |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
484 |
shutil.copy(potfile, cubepo) |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
485 |
else: |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
486 |
cmd = ['msgmerge','-N','-s','-o', cubepo+'new', cubepo, potfile] |
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
487 |
execute2(cmd) |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
488 |
ensure_fs_mode(cubepo) |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
489 |
shutil.move('%snew' % cubepo, cubepo) |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
490 |
toedit.append(osp.abspath(cubepo)) |
8620
61c4bdd70dd8
[cw-ctl] silence msgcat and msgfmt (closes #2527594)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8544
diff
changeset
|
491 |
print |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
492 |
# cleanup |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
493 |
rm(tempdir) |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
494 |
return toedit |
0 | 495 |
|
496 |
||
4439
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
497 |
# XXX totally broken, fix it |
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
498 |
# class LiveServerCommand(Command): |
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
499 |
# """Run a server from within a cube directory. |
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
500 |
# """ |
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
501 |
# name = 'live-server' |
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
502 |
# arguments = '' |
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
503 |
# options = () |
1451 | 504 |
|
4439
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
505 |
# def run(self, args): |
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
506 |
# """run the command with its specific arguments""" |
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
507 |
# from cubicweb.devtools.livetest import runserver |
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
508 |
# runserver() |
0 | 509 |
|
510 |
||
132
561671b87c22
rename NewTemplateCommand class into NewCubeCommand
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
61
diff
changeset
|
511 |
class NewCubeCommand(Command): |
0 | 512 |
"""Create a new cube. |
513 |
||
514 |
<cubename> |
|
5184
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
515 |
the name of the new cube. It should be a valid python module name. |
0 | 516 |
""" |
517 |
name = 'newcube' |
|
518 |
arguments = '<cubename>' |
|
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
519 |
min_args = max_args = 1 |
133
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
520 |
options = ( |
5184
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
521 |
("layout", |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
522 |
{'short': 'L', 'type' : 'choice', 'metavar': '<cube layout>', |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
523 |
'default': 'simple', 'choices': ('simple', 'full'), |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
524 |
'help': 'cube layout. You\'ll get a minimal cube with the "simple" \ |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
525 |
layout, and a full featured cube with "full" layout.', |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
526 |
} |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
527 |
), |
1106
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
528 |
("directory", |
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
529 |
{'short': 'd', 'type' : 'string', 'metavar': '<cubes directory>', |
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
530 |
'help': 'directory where the new cube should be created', |
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
531 |
} |
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
532 |
), |
133
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
533 |
("verbose", |
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
534 |
{'short': 'v', 'type' : 'yn', 'metavar': '<verbose>', |
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
535 |
'default': 'n', |
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
536 |
'help': 'verbose mode: will ask all possible configuration questions', |
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
537 |
} |
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
538 |
), |
365
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
539 |
("author", |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
540 |
{'short': 'a', 'type' : 'string', 'metavar': '<author>', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
541 |
'default': 'LOGILAB S.A. (Paris, FRANCE)', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
542 |
'help': 'cube author', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
543 |
} |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
544 |
), |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
545 |
("author-email", |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
546 |
{'short': 'e', 'type' : 'string', 'metavar': '<email>', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
547 |
'default': 'contact@logilab.fr', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
548 |
'help': 'cube author\'s email', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
549 |
} |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
550 |
), |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
551 |
("author-web-site", |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
552 |
{'short': 'w', 'type' : 'string', 'metavar': '<web site>', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
553 |
'default': 'http://www.logilab.fr', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
554 |
'help': 'cube author\'s web site', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
555 |
} |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
556 |
), |
5184
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
557 |
("license", |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
558 |
{'short': 'l', 'type' : 'choice', 'metavar': '<license>', |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
559 |
'default': 'LGPL', 'choices': ('GPL', 'LGPL', ''), |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
560 |
'help': 'cube license', |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
561 |
} |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
562 |
), |
133
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
563 |
) |
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
564 |
|
5184
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
565 |
LICENSES = { |
5423
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
566 |
'LGPL': '''\ |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
567 |
# This program is free software: you can redistribute it and/or modify it under |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
568 |
# the terms of the GNU Lesser General Public License as published by the Free |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
569 |
# Software Foundation, either version 2.1 of the License, or (at your option) |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
570 |
# any later version. |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
571 |
# |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
572 |
# This program is distributed in the hope that it will be useful, but WITHOUT |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
573 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
574 |
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
575 |
# details. |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
576 |
# |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
577 |
# You should have received a copy of the GNU Lesser General Public License along |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
578 |
# with this program. If not, see <http://www.gnu.org/licenses/>. |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
579 |
''', |
5537
2889091bd1bf
[i18ncube] do not crash if cube has nothing to translate
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5534
diff
changeset
|
580 |
|
5423
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
581 |
'GPL': '''\ |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
582 |
# This program is free software: you can redistribute it and/or modify it under |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
583 |
# the terms of the GNU General Public License as published by the Free Software |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
584 |
# Foundation, either version 2.1 of the License, or (at your option) any later |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
585 |
# version. |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
586 |
# |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
587 |
# This program is distributed in the hope that it will be useful, but WITHOUT |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
588 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
589 |
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
590 |
# |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
591 |
# You should have received a copy of the GNU General Public License along with |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
592 |
# this program. If not, see <http://www.gnu.org/licenses/>. |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
593 |
''', |
e15abfdcce38
backport default into stable: stable is now cw 3.8
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
594 |
'': '# INSERT LICENSE HERE' |
5184
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
595 |
} |
1451 | 596 |
|
0 | 597 |
def run(self, args): |
5184
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
598 |
import re |
4718
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
599 |
from logilab.common.shellutils import ASK |
5184
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
600 |
cubename = args[0] |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
601 |
if not re.match('[_A-Za-z][_A-Za-z0-9]*$', cubename): |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
602 |
raise BadCommandUsage( |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
603 |
'cube name must be a valid python module name') |
133
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
604 |
verbose = self.get('verbose') |
1106
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
605 |
cubesdir = self.get('directory') |
1116
163e6a65d488
fix dumb name error, should call cubes_search_path, not cubes_path
sylvain.thenault@logilab.fr
parents:
1106
diff
changeset
|
606 |
if not cubesdir: |
163e6a65d488
fix dumb name error, should call cubes_search_path, not cubes_path
sylvain.thenault@logilab.fr
parents:
1106
diff
changeset
|
607 |
cubespath = ServerConfiguration.cubes_search_path() |
1106
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
608 |
if len(cubespath) > 1: |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
609 |
raise BadCommandUsage( |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
610 |
"can't guess directory where to put the new cube." |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
611 |
" Please specify it using the --directory option") |
1106
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
612 |
cubesdir = cubespath[0] |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
613 |
if not osp.isdir(cubesdir): |
2615
1ea41b7c0836
F [dialog] offer to create backup. refactor to use l.c.shellutils.ASK
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2551
diff
changeset
|
614 |
print "-> creating cubes directory", cubesdir |
0 | 615 |
try: |
1106
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
616 |
mkdir(cubesdir) |
8695
358d8bed9626
[toward-py3k] rewrite to "except AnException as exc:" (part of #2711624)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8666
diff
changeset
|
617 |
except OSError as err: |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
618 |
self.fail("failed to create directory %r\n(%s)" |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
619 |
% (cubesdir, err)) |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
620 |
cubedir = osp.join(cubesdir, cubename) |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
621 |
if osp.exists(cubedir): |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
622 |
self.fail("%s already exists !" % cubedir) |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
623 |
skeldir = osp.join(BASEDIR, 'skeleton') |
5297
cc747dcef851
[c-c newcube] finish #676915: cubicweb-ctl newcube must be aware of python modules and debian package convention (python part already implemented)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5184
diff
changeset
|
624 |
default_name = 'cubicweb-%s' % cubename.lower().replace('_', '-') |
133
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
625 |
if verbose: |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
626 |
distname = raw_input('Debian name for your cube ? [%s]): ' |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
627 |
% default_name).strip() |
133
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
628 |
if not distname: |
2615
1ea41b7c0836
F [dialog] offer to create backup. refactor to use l.c.shellutils.ASK
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2551
diff
changeset
|
629 |
distname = default_name |
133
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
630 |
elif not distname.startswith('cubicweb-'): |
2615
1ea41b7c0836
F [dialog] offer to create backup. refactor to use l.c.shellutils.ASK
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2551
diff
changeset
|
631 |
if ASK.confirm('Do you mean cubicweb-%s ?' % distname): |
133
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
632 |
distname = 'cubicweb-' + distname |
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
633 |
else: |
2615
1ea41b7c0836
F [dialog] offer to create backup. refactor to use l.c.shellutils.ASK
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2551
diff
changeset
|
634 |
distname = default_name |
5297
cc747dcef851
[c-c newcube] finish #676915: cubicweb-ctl newcube must be aware of python modules and debian package convention (python part already implemented)
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5184
diff
changeset
|
635 |
if not re.match('[a-z][-a-z0-9]*$', distname): |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
636 |
raise BadCommandUsage( |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
637 |
'cube distname should be a valid debian package name') |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
638 |
longdesc = shortdesc = raw_input( |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
639 |
'Enter a short description for your cube: ') |
133
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
640 |
if verbose: |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
641 |
longdesc = raw_input( |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
642 |
'Enter a long description (leave empty to reuse the short one): ') |
5347
8ebed973819b
merge stable, fixing dependencies generation on c-c newcube on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
643 |
dependencies = {'cubicweb': '>= %s' % cubicwebversion} |
133
6ad5e7eb06ff
provide a --verbose option to the newcube command and only ask for a short description by default
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
132
diff
changeset
|
644 |
if verbose: |
5347
8ebed973819b
merge stable, fixing dependencies generation on c-c newcube on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
645 |
dependencies.update(self._ask_for_dependencies()) |
0 | 646 |
context = {'cubename' : cubename, |
647 |
'distname' : distname, |
|
648 |
'shortdesc' : shortdesc, |
|
649 |
'longdesc' : longdesc or shortdesc, |
|
5347
8ebed973819b
merge stable, fixing dependencies generation on c-c newcube on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
650 |
'dependencies' : dependencies, |
0 | 651 |
'version' : cubicwebversion, |
1016
26387b836099
use datetime instead of mx.DateTime
sylvain.thenault@logilab.fr
parents:
396
diff
changeset
|
652 |
'year' : str(datetime.now().year), |
365
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
653 |
'author': self['author'], |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
654 |
'author-email': self['author-email'], |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
655 |
'author-web-site': self['author-web-site'], |
5184
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
656 |
'license': self['license'], |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
657 |
'long-license': self.LICENSES[self['license']], |
0 | 658 |
} |
5184
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
659 |
exclude = SKEL_EXCLUDE |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
660 |
if self['layout'] == 'simple': |
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
661 |
exclude += ('sobjects.py*', 'precreate.py*', 'realdb_test*', |
5466
b5af2ac0c43c
[uiprops] test and fix reloading of modified css files; update c-c newcube; deprecates config.has_resource.
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5442
diff
changeset
|
662 |
'cubes.*', 'uiprops.py*') |
5184
955ee1b24756
[c-c newcube] #1192: simpler cubicweb-ctl newcube, and more
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4722
diff
changeset
|
663 |
copy_skeleton(skeldir, cubedir, context, exclude=exclude) |
0 | 664 |
|
5344
ed4cd1ca96d6
[skeleton/dependencies] fix typo & new cube generation from template
Aurelien Campeas <aurelien.campeas@logilab.fr>
parents:
4722
diff
changeset
|
665 |
def _ask_for_dependencies(self): |
4718
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
666 |
from logilab.common.shellutils import ASK |
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
667 |
from logilab.common.textutils import splitstrip |
5347
8ebed973819b
merge stable, fixing dependencies generation on c-c newcube on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
668 |
depcubes = [] |
8ebed973819b
merge stable, fixing dependencies generation on c-c newcube on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
669 |
for cube in ServerConfiguration.available_cubes(): |
8ebed973819b
merge stable, fixing dependencies generation on c-c newcube on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
670 |
answer = ASK.ask("Depends on cube %s? " % cube, |
2615
1ea41b7c0836
F [dialog] offer to create backup. refactor to use l.c.shellutils.ASK
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2551
diff
changeset
|
671 |
('N','y','skip','type'), 'N') |
1ea41b7c0836
F [dialog] offer to create backup. refactor to use l.c.shellutils.ASK
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2551
diff
changeset
|
672 |
if answer == 'y': |
5347
8ebed973819b
merge stable, fixing dependencies generation on c-c newcube on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
673 |
depcubes.append(cube) |
2615
1ea41b7c0836
F [dialog] offer to create backup. refactor to use l.c.shellutils.ASK
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2551
diff
changeset
|
674 |
if answer == 'type': |
5347
8ebed973819b
merge stable, fixing dependencies generation on c-c newcube on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
675 |
depcubes = splitstrip(raw_input('type dependencies: ')) |
0 | 676 |
break |
2615
1ea41b7c0836
F [dialog] offer to create backup. refactor to use l.c.shellutils.ASK
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2551
diff
changeset
|
677 |
elif answer == 'skip': |
0 | 678 |
break |
5347
8ebed973819b
merge stable, fixing dependencies generation on c-c newcube on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
679 |
return dict(('cubicweb-' + cube, ServerConfiguration.cube_version(cube)) |
8ebed973819b
merge stable, fixing dependencies generation on c-c newcube on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
diff
changeset
|
680 |
for cube in depcubes) |
1451 | 681 |
|
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
682 |
|
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
683 |
class ExamineLogCommand(Command): |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
684 |
"""Examine a rql log file. |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
685 |
|
8857
5d08086c3e6d
[cmd] fix exlog documentation (closes #2715913)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
8454
diff
changeset
|
686 |
Will print out the following table |
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
687 |
|
8857
5d08086c3e6d
[cmd] fix exlog documentation (closes #2715913)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
8454
diff
changeset
|
688 |
Percentage; Cumulative Time (clock); Cumulative Time (CPU); Occurences; Query |
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
689 |
|
8857
5d08086c3e6d
[cmd] fix exlog documentation (closes #2715913)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
8454
diff
changeset
|
690 |
sorted by descending cumulative time (clock). Time are expressed in seconds. |
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
691 |
|
8857
5d08086c3e6d
[cmd] fix exlog documentation (closes #2715913)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
8454
diff
changeset
|
692 |
Chances are the lines at the top are the ones that will bring the higher |
4708
2bd3d03721f3
#687194: cubicweb-ctl exlog : fix help message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4479
diff
changeset
|
693 |
benefit after optimisation. Start there. |
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
694 |
""" |
5375
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
695 |
arguments = 'rql.log' |
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
696 |
name = 'exlog' |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
697 |
options = () |
1451 | 698 |
|
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
699 |
def run(self, args): |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
700 |
import re |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
701 |
requests = {} |
5375
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
702 |
for filepath in args: |
1188
6937dfb242fb
[devtools] ExamineLog command does not fail on strange input and outputs to csv
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
1116
diff
changeset
|
703 |
try: |
5375
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
704 |
stream = file(filepath) |
8695
358d8bed9626
[toward-py3k] rewrite to "except AnException as exc:" (part of #2711624)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8666
diff
changeset
|
705 |
except OSError as ex: |
5375
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
706 |
raise BadCommandUsage("can't open rql log file %s: %s" |
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
707 |
% (filepath, ex)) |
5755
ca9e1c9123d7
[c-c exlog] fix code and documentation
Stephanie Marcu <stephanie.marcu@logilab.fr>
parents:
5608
diff
changeset
|
708 |
for lineno, line in enumerate(stream): |
5375
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
709 |
if not ' WHERE ' in line: |
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
710 |
continue |
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
711 |
try: |
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
712 |
rql, time = line.split('--') |
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
713 |
rql = re.sub("(\'\w+': \d*)", '', rql) |
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
714 |
if '{' in rql: |
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
715 |
rql = rql[:rql.index('{')] |
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
716 |
req = requests.setdefault(rql, []) |
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
717 |
time.strip() |
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
718 |
chunks = time.split() |
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
719 |
clocktime = float(chunks[0][1:]) |
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
720 |
cputime = float(chunks[-3]) |
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
721 |
req.append( (clocktime, cputime) ) |
8695
358d8bed9626
[toward-py3k] rewrite to "except AnException as exc:" (part of #2711624)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
8666
diff
changeset
|
722 |
except Exception as exc: |
5375
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
723 |
sys.stderr.write('Line %s: %s (%s)\n' % (lineno, exc, line)) |
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
724 |
stat = [] |
5375
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
725 |
for rql, times in requests.iteritems(): |
2092
f5102472243d
[exlog] print clocktime in addition to cputime
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1977
diff
changeset
|
726 |
stat.append( (sum(time[0] for time in times), |
f5102472243d
[exlog] print clocktime in addition to cputime
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1977
diff
changeset
|
727 |
sum(time[1] for time in times), |
f5102472243d
[exlog] print clocktime in addition to cputime
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1977
diff
changeset
|
728 |
len(times), rql) ) |
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
729 |
stat.sort() |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
730 |
stat.reverse() |
5375
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
731 |
total_time = sum(clocktime for clocktime, cputime, occ, rql in stat) * 0.01 |
2092
f5102472243d
[exlog] print clocktime in addition to cputime
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1977
diff
changeset
|
732 |
print 'Percentage;Cumulative Time (clock);Cumulative Time (CPU);Occurences;Query' |
f5102472243d
[exlog] print clocktime in addition to cputime
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1977
diff
changeset
|
733 |
for clocktime, cputime, occ, rql in stat: |
5375
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
734 |
print '%.2f;%.2f;%.2f;%s;%s' % (clocktime/total_time, clocktime, |
962e13ab0930
[c-c exlog] #687204: cubicweb-ctl exlog: use a proper file and not stdin for input
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5344
diff
changeset
|
735 |
cputime, occ, rql) |
1451 | 736 |
|
4479
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
737 |
|
4428
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
738 |
class GenerateSchema(Command): |
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
739 |
"""Generate schema image for the given cube""" |
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
740 |
name = "schema" |
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
741 |
arguments = '<cube>' |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5775
diff
changeset
|
742 |
min_args = max_args = 1 |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
743 |
options = [ |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
744 |
('output-file', |
8451
49e965bba1ec
[c-c schema] devtools: the output file for cw-ctl schema is not supposed to exist
Julien Cristau <julien.cristau@logilab.fr>
parents:
8257
diff
changeset
|
745 |
{'type':'string', 'default': None, |
6356
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
746 |
'metavar': '<file>', 'short':'o', 'help':'output image file', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
747 |
'input':False, |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
748 |
}), |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
749 |
('viewer', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
750 |
{'type': 'string', 'default':None, |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
751 |
'short': "d", 'metavar':'<cmd>', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
752 |
'help':'command use to view the generated file (empty for none)', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
753 |
}), |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
754 |
('show-meta', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
755 |
{'action': 'store_true', 'default':False, |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
756 |
'short': "m", 'metavar': "<yN>", |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
757 |
'help':'include meta and internal entities in schema', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
758 |
}), |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
759 |
('show-workflow', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
760 |
{'action': 'store_true', 'default':False, |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
761 |
'short': "w", 'metavar': "<yN>", |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
762 |
'help':'include workflow entities in schema', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
763 |
}), |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
764 |
('show-cw-user', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
765 |
{'action': 'store_true', 'default':False, |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
766 |
'metavar': "<yN>", |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
767 |
'help':'include cubicweb user entities in schema', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
768 |
}), |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
769 |
('exclude-type', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
770 |
{'type':'string', 'default':'', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
771 |
'short': "x", 'metavar': "<types>", |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
772 |
'help':'coma separated list of entity types to remove from view', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
773 |
}), |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
774 |
('include-type', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
775 |
{'type':'string', 'default':'', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
776 |
'short': "i", 'metavar': "<types>", |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
777 |
'help':'coma separated list of entity types to include in view', |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
778 |
}), |
e89f71a41e20
[c-c i18n] namespace/line wrap cleanup + dynamically compute available language + make it works in installed mode
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6138
diff
changeset
|
779 |
] |
4428
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
780 |
|
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
781 |
def run(self, args): |
4718
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
782 |
from subprocess import Popen |
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
783 |
from tempfile import NamedTemporaryFile |
4428
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
784 |
from logilab.common.textutils import splitstrip |
4718
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
785 |
from yams import schema2dot, BASE_TYPES |
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
786 |
from cubicweb.schema import (META_RTYPES, SCHEMA_TYPES, SYSTEM_RTYPES, |
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
787 |
WORKFLOW_TYPES, INTERNAL_TYPES) |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5775
diff
changeset
|
788 |
cubes = splitstrip(args[0]) |
4479
f25e61a93c42
replace DevCubeConfiguration/DevDepsConfiguration by a single DevConfiguration, fixing recently introduced by w/ i18ncube command on the way
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4467
diff
changeset
|
789 |
dev_conf = DevConfiguration(*cubes) |
4428
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
790 |
schema = dev_conf.load_schema() |
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
791 |
out, viewer = self['output-file'], self['viewer'] |
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
792 |
if out is None: |
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
793 |
tmp_file = NamedTemporaryFile(suffix=".svg") |
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
794 |
out = tmp_file.name |
4434
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
795 |
skiptypes = BASE_TYPES | SCHEMA_TYPES |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
796 |
if not self['show-meta']: |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
797 |
skiptypes |= META_RTYPES | SYSTEM_RTYPES | INTERNAL_TYPES |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
798 |
if not self['show-workflow']: |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
799 |
skiptypes |= WORKFLOW_TYPES |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
800 |
if not self['show-cw-user']: |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
801 |
skiptypes |= set(('CWUser', 'CWGroup', 'EmailAddress')) |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
802 |
skiptypes |= set(self['exclude-type'].split(',')) |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
803 |
skiptypes -= set(self['include-type'].split(',')) |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
804 |
schema2dot.schema2dot(schema, out, skiptypes=skiptypes) |
4428
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
805 |
if viewer: |
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
806 |
p = Popen((viewer, out)) |
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
807 |
p.wait() |
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
808 |
|
5775
34195230dc2a
[packaging] more cleanups, handle javascript test files
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5762
diff
changeset
|
809 |
|
34195230dc2a
[packaging] more cleanups, handle javascript test files
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5762
diff
changeset
|
810 |
class GenerateQUnitHTML(Command): |
34195230dc2a
[packaging] more cleanups, handle javascript test files
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5762
diff
changeset
|
811 |
"""Generate a QUnit html file to see test in your browser""" |
34195230dc2a
[packaging] more cleanups, handle javascript test files
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5762
diff
changeset
|
812 |
name = "qunit-html" |
34195230dc2a
[packaging] more cleanups, handle javascript test files
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5762
diff
changeset
|
813 |
arguments = '<test file> [<dependancy js file>...]' |
34195230dc2a
[packaging] more cleanups, handle javascript test files
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5762
diff
changeset
|
814 |
|
34195230dc2a
[packaging] more cleanups, handle javascript test files
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5762
diff
changeset
|
815 |
def run(self, args): |
34195230dc2a
[packaging] more cleanups, handle javascript test files
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5762
diff
changeset
|
816 |
from cubicweb.devtools.qunit import make_qunit_html |
34195230dc2a
[packaging] more cleanups, handle javascript test files
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5762
diff
changeset
|
817 |
print make_qunit_html(args[0], args[1:]) |
34195230dc2a
[packaging] more cleanups, handle javascript test files
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5762
diff
changeset
|
818 |
|
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5775
diff
changeset
|
819 |
for cmdcls in (UpdateCubicWebCatalogCommand, |
6444
cc091175d3da
[c-c i18ncube] proper command class name
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
6443
diff
changeset
|
820 |
UpdateCubeCatalogCommand, |
6138
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5775
diff
changeset
|
821 |
#LiveServerCommand, |
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5775
diff
changeset
|
822 |
NewCubeCommand, |
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5775
diff
changeset
|
823 |
ExamineLogCommand, |
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5775
diff
changeset
|
824 |
GenerateSchema, |
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5775
diff
changeset
|
825 |
GenerateQUnitHTML, |
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5775
diff
changeset
|
826 |
): |
65f5e488f983
update to lgc.clcommands 0.51 api
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
5775
diff
changeset
|
827 |
CWCTL.register(cmdcls) |