author | Aurelien Campeas <aurelien.campeas@logilab.fr> |
Fri, 16 Apr 2010 19:24:53 +0200 | |
branch | stable |
changeset 5319 | 9b1b7020d179 |
parent 4722 | 9c13d5db03d9 |
child 5184 | 955ee1b24756 |
child 5344 | ed4cd1ca96d6 |
permissions | -rw-r--r-- |
0 | 1 |
"""additional cubicweb-ctl commands and command handlers for cubicweb and cubicweb's |
2 |
cubes development |
|
3 |
||
4 |
:organization: Logilab |
|
4212
ab6573088b4a
update copyright: welcome 2010
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
3978
diff
changeset
|
5 |
:copyright: 2001-2010 LOGILAB S.A. (Paris, FRANCE), license is LGPL v2. |
0 | 6 |
:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr |
1977
606923dff11b
big bunch of copyright / docstring update
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1898
diff
changeset
|
7 |
:license: GNU Lesser General Public License, v2.1 - http://www.gnu.org/licenses |
0 | 8 |
""" |
9 |
__docformat__ = "restructuredtext en" |
|
10 |
||
4718
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
11 |
# *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
|
12 |
# 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
|
13 |
# completion). So import locally in command helpers. |
0 | 14 |
import sys |
1016
26387b836099
use datetime instead of mx.DateTime
sylvain.thenault@logilab.fr
parents:
396
diff
changeset
|
15 |
from datetime import datetime |
4719
aaed3f813ef8
kill dead/useless code as suggested by pylint
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4718
diff
changeset
|
16 |
from os import mkdir, chdir |
0 | 17 |
from os.path import join, exists, abspath, basename, normpath, split, isdir |
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
|
18 |
from warnings import warn |
0 | 19 |
|
20 |
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
|
21 |
from logilab.common.clcommands import register_commands, pop_arg |
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
22 |
|
3978
2c95e3033f64
finish yesterday work on rql constraints:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3858
diff
changeset
|
23 |
from cubicweb.__pkginfo__ import version as cubicwebversion |
2790
968108e16066
move underline_title to toolsutils
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2773
diff
changeset
|
24 |
from cubicweb import CW_SOFTWARE_ROOT as BASEDIR, BadCommandUsage |
968108e16066
move underline_title to toolsutils
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2773
diff
changeset
|
25 |
from cubicweb.toolsutils import Command, copy_skeleton, underline_title |
0 | 26 |
from cubicweb.web.webconfig import WebConfiguration |
27 |
from cubicweb.server.serverconfig import ServerConfiguration |
|
28 |
||
2790
968108e16066
move underline_title to toolsutils
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2773
diff
changeset
|
29 |
|
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
|
30 |
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
|
31 |
"""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
|
32 |
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
|
33 |
""" |
0 | 34 |
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
|
35 |
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
|
36 |
|
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
|
37 |
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
|
38 |
| 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
|
39 |
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
|
40 |
| WebConfiguration.cube_appobject_path) |
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
41 |
|
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
|
42 |
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
|
43 |
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
|
44 |
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
|
45 |
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
|
46 |
self.expand_cubes(cubes, with_recommends=True)) |
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 |
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
|
48 |
self._cubes = () |
1451 | 49 |
|
0 | 50 |
@property |
51 |
def apphome(self): |
|
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
52 |
return None |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
53 |
def main_config_file(self): |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
54 |
return None |
0 | 55 |
def init_log(self, debug=None): |
56 |
pass |
|
57 |
def load_configuration(self): |
|
58 |
pass |
|
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
59 |
def default_log_file(self): |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
60 |
return None |
0 | 61 |
|
62 |
||
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
63 |
def cleanup_sys_modules(config): |
0 | 64 |
# cleanup sys.modules, required when we're updating multiple cubes |
65 |
for name, mod in sys.modules.items(): |
|
66 |
if mod is None: |
|
67 |
# duh ? logilab.common.os for instance |
|
68 |
del sys.modules[name] |
|
69 |
continue |
|
70 |
if not hasattr(mod, '__file__'): |
|
71 |
continue |
|
72 |
for path in config.vregistry_path(): |
|
73 |
if mod.__file__.startswith(path): |
|
74 |
del sys.modules[name] |
|
75 |
break |
|
1850
75661f0a691b
should be outside the loop
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1774
diff
changeset
|
76 |
# fresh rtags |
75661f0a691b
should be outside the loop
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1774
diff
changeset
|
77 |
from cubicweb import rtags |
75661f0a691b
should be outside the loop
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1774
diff
changeset
|
78 |
from cubicweb.web import uicfg |
75661f0a691b
should be outside the loop
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1774
diff
changeset
|
79 |
rtags.RTAGS[:] = [] |
75661f0a691b
should be outside the loop
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
1774
diff
changeset
|
80 |
reload(uicfg) |
1451 | 81 |
|
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
82 |
def generate_schema_pot(w, cubedir=None): |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
83 |
"""generate a pot file with schema specific i18n messages |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
84 |
|
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
85 |
notice that relation definitions description and static vocabulary |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
86 |
should be marked using '_' and extracted using xgettext |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
87 |
""" |
2650
18aec79ec3a3
R [vreg] important refactoring of the vregistry, moving behaviour to end dictionnary (and so leaving room for more flexibility ; keep bw compat ; update api usage in cw
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2633
diff
changeset
|
88 |
from cubicweb.cwvreg import CubicWebVRegistry |
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
89 |
if cubedir: |
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
|
90 |
cube = split(cubedir)[-1] |
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
|
91 |
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
|
92 |
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
|
93 |
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
|
94 |
libconfig = DevConfiguration(*depcubes) |
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
95 |
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
|
96 |
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
|
97 |
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
|
98 |
cleanup_sys_modules(config) |
1665 | 99 |
schema = config.load_schema(remove_unused_rtypes=False) |
2650
18aec79ec3a3
R [vreg] important refactoring of the vregistry, moving behaviour to end dictionnary (and so leaving room for more flexibility ; keep bw compat ; update api usage in cw
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2633
diff
changeset
|
100 |
vreg = CubicWebVRegistry(config) |
373
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
101 |
# set_schema triggers objects registrations |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
102 |
vreg.set_schema(schema) |
0c931b2e2a68
fix i18n catalog generation
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
365
diff
changeset
|
103 |
w(DEFAULT_POT_HEAD) |
4722
9c13d5db03d9
pylint suggested refactorings
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4719
diff
changeset
|
104 |
_generate_schema_pot(w, vreg, schema, libconfig=libconfig) |
1451 | 105 |
|
106 |
||
4718
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
107 |
def _generate_schema_pot(w, vreg, schema, libconfig=None): |
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
108 |
from copy import deepcopy |
4021
280c910c8710
move i18n / migration modules from cw.common to cw
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3998
diff
changeset
|
109 |
from cubicweb.i18n import add_msg |
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
|
110 |
from cubicweb.web import uicfg |
4718
3dc3ad02d091
avoid module import in c-c plugins module, and remind it
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4708
diff
changeset
|
111 |
from cubicweb.schema import META_RTYPES, SYSTEM_RTYPES, CONSTRAINTS |
3287
19c1011736a6
tweak catalog generation by adding a new SYSTEM_RTYPES set to schema
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3286
diff
changeset
|
112 |
no_context_rtypes = META_RTYPES | SYSTEM_RTYPES |
1016
26387b836099
use datetime instead of mx.DateTime
sylvain.thenault@logilab.fr
parents:
396
diff
changeset
|
113 |
w('# schema pot file, generated on %s\n' % datetime.now().strftime('%Y-%m-%d %H:%M:%S')) |
0 | 114 |
w('# \n') |
115 |
w('# singular and plural forms for each entity type\n') |
|
116 |
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
|
117 |
vregdone = set() |
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
|
118 |
if libconfig is not None: |
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
|
119 |
from cubicweb.cwvreg import CubicWebVRegistry, clear_rtag_objects |
1665 | 120 |
libschema = libconfig.load_schema(remove_unused_rtypes=False) |
3476
6e927b729ae1
[uicfg, autoform] more consistent/powerful autoform_section rtags by using formtype/section; deprecates autoform_is_inlined; refactor automatci form and renderer thanks to this
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3369
diff
changeset
|
121 |
afs = deepcopy(uicfg.autoform_section) |
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
|
122 |
appearsin_addmenu = deepcopy(uicfg.actionbox_appearsin_addmenu) |
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
|
123 |
clear_rtag_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
|
124 |
cleanup_sys_modules(libconfig) |
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
|
125 |
libvreg = CubicWebVRegistry(libconfig) |
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
|
126 |
libvreg.set_schema(libschema) # trigger objects registration |
3476
6e927b729ae1
[uicfg, autoform] more consistent/powerful autoform_section rtags by using formtype/section; deprecates autoform_is_inlined; refactor automatci form and renderer thanks to this
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3369
diff
changeset
|
127 |
libafs = uicfg.autoform_section |
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
|
128 |
libappearsin_addmenu = uicfg.actionbox_appearsin_addmenu |
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
|
129 |
# 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
|
130 |
list(_iter_vreg_objids(libvreg, vregdone)) |
0 | 131 |
else: |
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 |
libschema = {} |
3476
6e927b729ae1
[uicfg, autoform] more consistent/powerful autoform_section rtags by using formtype/section; deprecates autoform_is_inlined; refactor automatci form and renderer thanks to this
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3369
diff
changeset
|
133 |
afs = uicfg.autoform_section |
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
|
134 |
appearsin_addmenu = uicfg.actionbox_appearsin_addmenu |
3978
2c95e3033f64
finish yesterday work on rql constraints:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3858
diff
changeset
|
135 |
for cstrtype in CONSTRAINTS: |
2c95e3033f64
finish yesterday work on rql constraints:
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3858
diff
changeset
|
136 |
add_msg(w, cstrtype) |
0 | 137 |
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
|
138 |
for eschema in sorted(schema.entities()): |
0 | 139 |
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
|
140 |
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
|
141 |
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
|
142 |
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
|
143 |
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
|
144 |
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
|
145 |
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
|
146 |
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
|
147 |
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
|
148 |
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
|
149 |
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
|
150 |
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
|
151 |
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
|
152 |
if rschema.final: |
bc8d7ac70347
skip final relations at this point
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4380
diff
changeset
|
153 |
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
|
154 |
for tschema in targetschemas: |
3476
6e927b729ae1
[uicfg, autoform] more consistent/powerful autoform_section rtags by using formtype/section; deprecates autoform_is_inlined; refactor automatci form and renderer thanks to this
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3369
diff
changeset
|
155 |
fsections = afs.etype_get(eschema, rschema, role, tschema) |
4400
4d36e0e93fdb
must check for relation inlined in main form type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4399
diff
changeset
|
156 |
if 'main_inlined' in fsections and \ |
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
|
157 |
(libconfig is None or not |
4400
4d36e0e93fdb
must check for relation inlined in main form type
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4399
diff
changeset
|
158 |
'main_inlined' in libafs.etype_get( |
3476
6e927b729ae1
[uicfg, autoform] more consistent/powerful autoform_section rtags by using formtype/section; deprecates autoform_is_inlined; refactor automatci form and renderer thanks to this
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3369
diff
changeset
|
159 |
eschema, rschema, role, tschema)): |
3275
5247789df541
[gettext] provide GNU contexts to avoid translations ambiguities
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
3221
diff
changeset
|
160 |
add_msg(w, 'add a %s' % tschema, |
5247789df541
[gettext] provide GNU contexts to avoid translations ambiguities
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
3221
diff
changeset
|
161 |
'inlined:%s.%s.%s' % (etype, rschema, role)) |
4380
5613d7c06339
simplify messages used for inlined forms
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4252
diff
changeset
|
162 |
add_msg(w, str(tschema), |
3327
44efba78afac
fix/enhance i18n context usage for inlined forms
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3287
diff
changeset
|
163 |
'inlined:%s.%s.%s' % (etype, rschema, role)) |
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 appearsin_addmenu.etype_get(eschema, rschema, role, tschema) and \ |
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 |
(libconfig is None or not |
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 |
libappearsin_addmenu.etype_get(eschema, rschema, role, tschema)): |
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
|
167 |
if role == 'subject': |
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 |
label = 'add %s %s %s %s' % (eschema, rschema, |
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 |
tschema, role) |
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 |
label2 = "creating %s (%s %%(linkto)s %s %s)" % ( |
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 |
tschema, eschema, rschema, tschema) |
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 |
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
|
173 |
label = 'add %s %s %s %s' % (tschema, rschema, |
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 |
eschema, role) |
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 |
label2 = "creating %s (%s %s %s %%(linkto)s)" % ( |
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
|
176 |
tschema, tschema, rschema, eschema) |
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
|
177 |
add_msg(w, label) |
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 |
add_msg(w, label2) |
3858
ba96e4607e67
add XX reminder
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
179 |
# XXX also generate "creating ...' messages for actions in the |
ba96e4607e67
add XX reminder
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3689
diff
changeset
|
180 |
# addrelated submenu |
0 | 181 |
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
|
182 |
w('# (no object form for final or symmetric relation types)\n') |
0 | 183 |
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
|
184 |
for rschema in sorted(schema.relations()): |
0 | 185 |
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
|
186 |
if rtype 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
|
187 |
# bw compat, necessary until all translation of relation are done properly... |
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
|
188 |
add_msg(w, rtype) |
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
|
189 |
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
|
190 |
done.add(rschema.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
|
191 |
add_msg(w, rschema.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
|
192 |
done.add(rtype) |
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
|
193 |
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
|
194 |
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
|
195 |
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
|
196 |
# add context information only for non-metadata rtypes |
3287
19c1011736a6
tweak catalog generation by adding a new SYSTEM_RTYPES set to schema
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3286
diff
changeset
|
197 |
if rschema not in no_context_rtypes: |
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
|
198 |
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
|
199 |
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
|
200 |
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
|
201 |
add_msg(w, rtype, subjschema.type) |
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
|
202 |
if not (schema.rschema(rtype).final or rschema.symmetric): |
3287
19c1011736a6
tweak catalog generation by adding a new SYSTEM_RTYPES set to schema
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3286
diff
changeset
|
203 |
if rschema not in no_context_rtypes: |
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
|
204 |
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
|
205 |
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
|
206 |
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
|
207 |
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
|
208 |
if rtype 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
|
209 |
# bw compat, necessary until all translation of relation are done properly... |
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
|
210 |
add_msg(w, '%s_object' % rtype) |
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
|
211 |
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
|
212 |
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
|
213 |
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
|
214 |
|
3293 | 215 |
|
4722
9c13d5db03d9
pylint suggested refactorings
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4719
diff
changeset
|
216 |
def _iter_vreg_objids(vreg, done): |
0 | 217 |
for reg, objdict in vreg.items(): |
218 |
for objects in objdict.values(): |
|
219 |
for obj in objects: |
|
3677
acdba524bb8f
fix i18ncube
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3674
diff
changeset
|
220 |
objid = '%s_%s' % (reg, obj.__regid__) |
0 | 221 |
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
|
222 |
break |
3677
acdba524bb8f
fix i18ncube
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3674
diff
changeset
|
223 |
try: # XXX < 3.6 bw compat |
acdba524bb8f
fix i18ncube
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3674
diff
changeset
|
224 |
pdefs = obj.property_defs |
acdba524bb8f
fix i18ncube
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3674
diff
changeset
|
225 |
except AttributeError: |
acdba524bb8f
fix i18ncube
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3674
diff
changeset
|
226 |
pdefs = getattr(obj, 'cw_property_defs', {}) |
acdba524bb8f
fix i18ncube
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3674
diff
changeset
|
227 |
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
|
228 |
yield objid |
0 | 229 |
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
|
230 |
break |
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
231 |
|
1451 | 232 |
|
155
9ed6db94a087
spanish is now a supported language
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
133
diff
changeset
|
233 |
LANGS = ('en', 'fr', 'es') |
0 | 234 |
I18NDIR = join(BASEDIR, 'i18n') |
235 |
DEFAULT_POT_HEAD = r'''msgid "" |
|
236 |
msgstr "" |
|
237 |
"Project-Id-Version: cubicweb %s\n" |
|
238 |
"PO-Revision-Date: 2008-03-28 18:14+0100\n" |
|
239 |
"Last-Translator: Logilab Team <contact@logilab.fr>\n" |
|
240 |
"Language-Team: fr <contact@logilab.fr>\n" |
|
241 |
"MIME-Version: 1.0\n" |
|
242 |
"Content-Type: text/plain; charset=UTF-8\n" |
|
243 |
"Content-Transfer-Encoding: 8bit\n" |
|
244 |
"Generated-By: cubicweb-devtools\n" |
|
245 |
"Plural-Forms: nplurals=2; plural=(n > 1);\n" |
|
246 |
||
247 |
''' % cubicwebversion |
|
248 |
||
249 |
||
250 |
class UpdateCubicWebCatalogCommand(Command): |
|
251 |
"""Update i18n catalogs for cubicweb library. |
|
1451 | 252 |
|
0 | 253 |
It will regenerate cubicweb/i18n/xx.po files. You'll have then to edit those |
254 |
files to add translations of newly added messages. |
|
255 |
""" |
|
1898
39b37f90a8a4
[cw-ctl] rename i18n commands (see #342889)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
1850
diff
changeset
|
256 |
name = 'i18ncubicweb' |
0 | 257 |
|
258 |
def run(self, args): |
|
259 |
"""run the command with its specific arguments""" |
|
260 |
if args: |
|
261 |
raise BadCommandUsage('Too much arguments') |
|
262 |
import shutil |
|
2446
440cb4ea7e5c
[refactor] #342855: replace uses of (deprecated) mktemp
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
263 |
import tempfile |
0 | 264 |
import yams |
265 |
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
|
266 |
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
|
267 |
from logilab.common.modutils import get_module_files |
4021
280c910c8710
move i18n / migration modules from cw.common to cw
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3998
diff
changeset
|
268 |
from cubicweb.i18n import extract_from_tal, execute |
2692
bffb0e64736c
[i18ncubicweb] fix stupid NameError with mkdtemp
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
2657
diff
changeset
|
269 |
tempdir = tempfile.mkdtemp() |
2534
cda22bc0e6ef
[i18n] #344832: rename entities.pot
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2528
diff
changeset
|
270 |
potfiles = [join(I18NDIR, 'static-messages.pot')] |
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
271 |
print '-> extract schema messages.' |
0 | 272 |
schemapot = join(tempdir, 'schema.pot') |
273 |
potfiles.append(schemapot) |
|
274 |
# explicit close necessary else the file may not be yet flushed when |
|
275 |
# we'll using it below |
|
276 |
schemapotstream = file(schemapot, 'w') |
|
277 |
generate_schema_pot(schemapotstream.write, cubedir=None) |
|
278 |
schemapotstream.close() |
|
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
279 |
print '-> extract TAL messages.' |
0 | 280 |
tali18nfile = join(tempdir, 'tali18n.py') |
281 |
extract_from_tal(find(join(BASEDIR, 'web'), ('.py', '.pt')), tali18nfile) |
|
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
282 |
print '-> generate .pot files.' |
61
081078d5b422
rename one of the generated pot files (cubicweb pycubicweb.pot) to avoid problems when msgcats overwrites cubicweb.pot
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
60
diff
changeset
|
283 |
for id, files, lang in [('pycubicweb', get_module_files(BASEDIR) + list(globfind(join(BASEDIR, 'misc', 'migration'), '*.py')), None), |
58
c7c22b210372
only try to internationalize our own js files
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
57
diff
changeset
|
284 |
('schemadescr', globfind(join(BASEDIR, 'schemas'), '*.py'), None), |
0 | 285 |
('yams', get_module_files(yams.__path__[0]), None), |
286 |
('tal', [tali18nfile], None), |
|
58
c7c22b210372
only try to internationalize our own js files
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
57
diff
changeset
|
287 |
('js', globfind(join(BASEDIR, 'web'), 'cub*.js'), 'java'), |
0 | 288 |
]: |
60
dc90556488d8
oops, bad changeset review, revert debug changes
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
58
diff
changeset
|
289 |
cmd = 'xgettext --no-location --omit-header -k_ -o %s %s' |
0 | 290 |
if lang is not None: |
291 |
cmd += ' -L %s' % lang |
|
1502 | 292 |
potfile = join(tempdir, '%s.pot' % id) |
3117
32686ae66c75
mostly adapt the i18n subsystem to limitation wrt redirection handinling in windows, using the -o argument of the utilities
Aurélien Campéas
parents:
2692
diff
changeset
|
293 |
execute(cmd % (potfile, ' '.join('"%s"' % f for f in files))) |
1502 | 294 |
if exists(potfile): |
295 |
potfiles.append(potfile) |
|
296 |
else: |
|
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
297 |
print '-> WARNING: %s file was not generated' % potfile |
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
298 |
print '-> merging %i .pot files' % len(potfiles) |
0 | 299 |
cubicwebpot = join(tempdir, 'cubicweb.pot') |
3117
32686ae66c75
mostly adapt the i18n subsystem to limitation wrt redirection handinling in windows, using the -o argument of the utilities
Aurélien Campéas
parents:
2692
diff
changeset
|
300 |
execute('msgcat -o %s %s' % (cubicwebpot, ' '.join('"%s"' % f for f in potfiles))) |
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
301 |
print '-> merging main pot file with existing translations.' |
0 | 302 |
chdir(I18NDIR) |
303 |
toedit = [] |
|
304 |
for lang in LANGS: |
|
305 |
target = '%s.po' % lang |
|
3118 | 306 |
execute('msgmerge -N --sort-output -o "%snew" "%s" "%s"' % (target, target, cubicwebpot)) |
0 | 307 |
ensure_fs_mode(target) |
308 |
shutil.move('%snew' % target, target) |
|
309 |
toedit.append(abspath(target)) |
|
310 |
# cleanup |
|
60
dc90556488d8
oops, bad changeset review, revert debug changes
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
58
diff
changeset
|
311 |
rm(tempdir) |
0 | 312 |
# instructions pour la suite |
2396
8bfb99d7bbcc
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2395
diff
changeset
|
313 |
print '-> regenerated CubicWeb\'s .po catalogs.' |
8bfb99d7bbcc
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2395
diff
changeset
|
314 |
print '\nYou can now edit the following files:' |
0 | 315 |
print '* ' + '\n* '.join(toedit) |
2396
8bfb99d7bbcc
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2395
diff
changeset
|
316 |
print 'when you are done, run "cubicweb-ctl i18ncube yourcube".' |
0 | 317 |
|
318 |
||
319 |
class UpdateTemplateCatalogCommand(Command): |
|
320 |
"""Update i18n catalogs for cubes. If no cube is specified, update |
|
321 |
catalogs of all registered cubes. |
|
322 |
""" |
|
1898
39b37f90a8a4
[cw-ctl] rename i18n commands (see #342889)
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
1850
diff
changeset
|
323 |
name = 'i18ncube' |
0 | 324 |
arguments = '[<cube>...]' |
1451 | 325 |
|
0 | 326 |
def run(self, args): |
327 |
"""run the command with its specific arguments""" |
|
328 |
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
|
329 |
cubes = [DevConfiguration.cube_dir(cube) for cube in args] |
0 | 330 |
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
|
331 |
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
|
332 |
for cube in DevConfiguration.available_cubes()] |
1015
b5fdad9208f8
search for cubes in a list of directories
sylvain.thenault@logilab.fr
parents:
396
diff
changeset
|
333 |
cubes = [cubepath for cubepath in cubes if exists(join(cubepath, 'i18n'))] |
0 | 334 |
update_cubes_catalogs(cubes) |
335 |
||
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
336 |
|
0 | 337 |
def update_cubes_catalogs(cubes): |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
338 |
for cubedir in cubes: |
2527
e60db6312aa0
per cube message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2458
diff
changeset
|
339 |
toedit = [] |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
340 |
if not isdir(cubedir): |
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
341 |
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
|
342 |
continue |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
343 |
try: |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
344 |
toedit += update_cube_catalogs(cubedir) |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
345 |
except Exception: |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
346 |
import traceback |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
347 |
traceback.print_exc() |
2527
e60db6312aa0
per cube message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2458
diff
changeset
|
348 |
print '-> error while updating catalogs for cube', cubedir |
e60db6312aa0
per cube message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2458
diff
changeset
|
349 |
else: |
e60db6312aa0
per cube message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2458
diff
changeset
|
350 |
# instructions pour la suite |
e60db6312aa0
per cube message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2458
diff
changeset
|
351 |
print '-> regenerated .po catalogs for cube %s.' % cubedir |
e60db6312aa0
per cube message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2458
diff
changeset
|
352 |
print '\nYou can now edit the following files:' |
e60db6312aa0
per cube message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2458
diff
changeset
|
353 |
print '* ' + '\n* '.join(toedit) |
e60db6312aa0
per cube message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2458
diff
changeset
|
354 |
print ('When you are done, run "cubicweb-ctl i18ninstance ' |
e60db6312aa0
per cube message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2458
diff
changeset
|
355 |
'<yourinstance>" to see changes in your instances.') |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
356 |
|
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
357 |
def update_cube_catalogs(cubedir): |
0 | 358 |
import shutil |
2446
440cb4ea7e5c
[refactor] #342855: replace uses of (deprecated) mktemp
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
359 |
import tempfile |
0 | 360 |
from logilab.common.fileutils import ensure_fs_mode |
361 |
from logilab.common.shellutils import find, rm |
|
4021
280c910c8710
move i18n / migration modules from cw.common to cw
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
3998
diff
changeset
|
362 |
from cubicweb.i18n import extract_from_tal, execute |
0 | 363 |
toedit = [] |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
364 |
cube = basename(normpath(cubedir)) |
2446
440cb4ea7e5c
[refactor] #342855: replace uses of (deprecated) mktemp
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
365 |
tempdir = tempfile.mkdtemp() |
2396
8bfb99d7bbcc
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2395
diff
changeset
|
366 |
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
|
367 |
chdir(cubedir) |
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
|
368 |
if exists(join('i18n', 'entities.pot')): |
91f579b7a1e1
[F bw compat] warn if entities.pot exists but consider it anyway
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2534
diff
changeset
|
369 |
warn('entities.pot is deprecated, rename file to static-messages.pot (%s)' |
91f579b7a1e1
[F bw compat] warn if entities.pot exists but consider it anyway
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2534
diff
changeset
|
370 |
% join('i18n', 'entities.pot'), DeprecationWarning) |
91f579b7a1e1
[F bw compat] warn if entities.pot exists but consider it anyway
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2534
diff
changeset
|
371 |
potfiles = [join('i18n', 'entities.pot')] |
91f579b7a1e1
[F bw compat] warn if entities.pot exists but consider it anyway
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2534
diff
changeset
|
372 |
elif exists(join('i18n', 'static-messages.pot')): |
91f579b7a1e1
[F bw compat] warn if entities.pot exists but consider it anyway
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2534
diff
changeset
|
373 |
potfiles = [join('i18n', 'static-messages.pot')] |
91f579b7a1e1
[F bw compat] warn if entities.pot exists but consider it anyway
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2534
diff
changeset
|
374 |
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
|
375 |
potfiles = [] |
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
376 |
print '-> extract schema messages' |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
377 |
schemapot = join(tempdir, 'schema.pot') |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
378 |
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
|
379 |
# 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
|
380 |
# 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
|
381 |
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
|
382 |
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
|
383 |
schemapotstream.close() |
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
384 |
print '-> extract TAL messages' |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
385 |
tali18nfile = join(tempdir, 'tali18n.py') |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
386 |
extract_from_tal(find('.', ('.py', '.pt'), blacklist=STD_BLACKLIST+('test',)), tali18nfile) |
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
387 |
print '-> extract Javascript messages' |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
388 |
jsfiles = [jsfile for jsfile in find('.', '.js') if basename(jsfile).startswith('cub')] |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
389 |
if jsfiles: |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
390 |
tmppotfile = join(tempdir, 'js.pot') |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
391 |
execute('xgettext --no-location --omit-header -k_ -L java --from-code=utf-8 -o %s %s' |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
392 |
% (tmppotfile, ' '.join(jsfiles))) |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
393 |
# no pot file created if there are no string to translate |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
394 |
if exists(tmppotfile): |
0 | 395 |
potfiles.append(tmppotfile) |
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
396 |
print '-> create cube-specific catalog' |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
397 |
tmppotfile = join(tempdir, 'generated.pot') |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
398 |
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
|
399 |
cubefiles.append(tali18nfile) |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
400 |
execute('xgettext --no-location --omit-header -k_ -o %s %s' |
3118 | 401 |
% (tmppotfile, ' '.join('"%s"' % f for f in cubefiles))) |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
402 |
if exists(tmppotfile): # doesn't exists of no translation string found |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
403 |
potfiles.append(tmppotfile) |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
404 |
potfile = join(tempdir, 'cube.pot') |
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
405 |
print '-> merging %i .pot files:' % len(potfiles) |
3117
32686ae66c75
mostly adapt the i18n subsystem to limitation wrt redirection handinling in windows, using the -o argument of the utilities
Aurélien Campéas
parents:
2692
diff
changeset
|
406 |
execute('msgcat -o %s %s' % (potfile, |
32686ae66c75
mostly adapt the i18n subsystem to limitation wrt redirection handinling in windows, using the -o argument of the utilities
Aurélien Campéas
parents:
2692
diff
changeset
|
407 |
' '.join('"%s"' % f for f in potfiles))) |
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
408 |
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
|
409 |
chdir('i18n') |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
410 |
for lang in LANGS: |
2395
e3093fc12a00
[cw-ctl] improve dialog messages
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2092
diff
changeset
|
411 |
print '-> language', lang |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
412 |
cubepo = '%s.po' % lang |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
413 |
if not exists(cubepo): |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
414 |
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
|
415 |
else: |
3118 | 416 |
execute('msgmerge -N -s -o %snew %s %s' % (cubepo, cubepo, potfile)) |
1770
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
417 |
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
|
418 |
shutil.move('%snew' % cubepo, cubepo) |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
419 |
toedit.append(abspath(cubepo)) |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
420 |
# cleanup |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
421 |
rm(tempdir) |
8bd788149f85
refactor and don't crash on error while generating a cube's catalogs
sylvain.thenault@logilab.fr
parents:
1769
diff
changeset
|
422 |
return toedit |
0 | 423 |
|
424 |
||
4439
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
425 |
# 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
|
426 |
# 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
|
427 |
# """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
|
428 |
# """ |
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
429 |
# 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
|
430 |
# arguments = '' |
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
431 |
# options = () |
1451 | 432 |
|
4439
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
433 |
# 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
|
434 |
# """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
|
435 |
# 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
|
436 |
# runserver() |
0 | 437 |
|
438 |
||
132
561671b87c22
rename NewTemplateCommand class into NewCubeCommand
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
61
diff
changeset
|
439 |
class NewCubeCommand(Command): |
0 | 440 |
"""Create a new cube. |
441 |
||
442 |
<cubename> |
|
443 |
the name of the new cube |
|
444 |
""" |
|
445 |
name = 'newcube' |
|
446 |
arguments = '<cubename>' |
|
447 |
||
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
|
448 |
options = ( |
1106
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
449 |
("directory", |
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
450 |
{'short': 'd', 'type' : 'string', 'metavar': '<cubes directory>', |
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
451 |
'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
|
452 |
} |
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
453 |
), |
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
|
454 |
("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
|
455 |
{'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
|
456 |
'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
|
457 |
'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
|
458 |
} |
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
|
459 |
), |
365
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
460 |
("author", |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
461 |
{'short': 'a', 'type' : 'string', 'metavar': '<author>', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
462 |
'default': 'LOGILAB S.A. (Paris, FRANCE)', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
463 |
'help': 'cube author', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
464 |
} |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
465 |
), |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
466 |
("author-email", |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
467 |
{'short': 'e', 'type' : 'string', 'metavar': '<email>', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
468 |
'default': 'contact@logilab.fr', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
469 |
'help': 'cube author\'s email', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
470 |
} |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
471 |
), |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
472 |
("author-web-site", |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
473 |
{'short': 'w', 'type' : 'string', 'metavar': '<web site>', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
474 |
'default': 'http://www.logilab.fr', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
475 |
'help': 'cube author\'s web site', |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
476 |
} |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
477 |
), |
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
|
478 |
) |
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
|
479 |
|
1451 | 480 |
|
0 | 481 |
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
|
482 |
from logilab.common.shellutils import ASK |
0 | 483 |
if len(args) != 1: |
484 |
raise BadCommandUsage("exactly one argument (cube name) is expected") |
|
485 |
cubename, = args |
|
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
|
486 |
verbose = self.get('verbose') |
1106
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
487 |
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
|
488 |
if not cubesdir: |
163e6a65d488
fix dumb name error, should call cubes_search_path, not cubes_path
sylvain.thenault@logilab.fr
parents:
1106
diff
changeset
|
489 |
cubespath = ServerConfiguration.cubes_search_path() |
1106
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
490 |
if len(cubespath) > 1: |
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
491 |
raise BadCommandUsage("can't guess directory where to put the new cube." |
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
492 |
" Please specify it using the --directory option") |
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
493 |
cubesdir = cubespath[0] |
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
494 |
if not 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
|
495 |
print "-> creating cubes directory", cubesdir |
0 | 496 |
try: |
1106
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
497 |
mkdir(cubesdir) |
0 | 498 |
except OSError, err: |
1116
163e6a65d488
fix dumb name error, should call cubes_search_path, not cubes_path
sylvain.thenault@logilab.fr
parents:
1106
diff
changeset
|
499 |
self.fail("failed to create directory %r\n(%s)" % (cubesdir, err)) |
1106
de873146183a
fix newcube command to deal with cubes path
sylvain.thenault@logilab.fr
parents:
1105
diff
changeset
|
500 |
cubedir = join(cubesdir, cubename) |
0 | 501 |
if exists(cubedir): |
502 |
self.fail("%s already exists !" % (cubedir)) |
|
503 |
skeldir = join(BASEDIR, 'skeleton') |
|
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
|
504 |
default_name = 'cubicweb-%s' % cubename.lower() |
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
|
505 |
if verbose: |
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
|
506 |
distname = raw_input('Debian name for your cube ? [%s]): ' % 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
|
507 |
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
|
508 |
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
|
509 |
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
|
510 |
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
|
511 |
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
|
512 |
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
|
513 |
distname = default_name |
1451 | 514 |
|
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
|
515 |
longdesc = shortdesc = raw_input('Enter a short description for your cube: ') |
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
|
516 |
if verbose: |
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
|
517 |
longdesc = raw_input('Enter a long description (leave empty to reuse the short one): ') |
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
|
518 |
if 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
|
519 |
includes = self._ask_for_dependancies() |
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 |
if len(includes) == 1: |
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
|
521 |
dependancies = '%r,' % includes[0] |
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
|
522 |
else: |
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
|
523 |
dependancies = ', '.join(repr(cube) for cube in includes) |
0 | 524 |
else: |
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
|
525 |
dependancies = '' |
0 | 526 |
context = {'cubename' : cubename, |
527 |
'distname' : distname, |
|
528 |
'shortdesc' : shortdesc, |
|
529 |
'longdesc' : longdesc or shortdesc, |
|
530 |
'dependancies' : dependancies, |
|
531 |
'version' : cubicwebversion, |
|
1016
26387b836099
use datetime instead of mx.DateTime
sylvain.thenault@logilab.fr
parents:
396
diff
changeset
|
532 |
'year' : str(datetime.now().year), |
365
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
533 |
'author': self['author'], |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
534 |
'author-email': self['author-email'], |
5d8336b70aa7
make author information configurable
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
264
diff
changeset
|
535 |
'author-web-site': self['author-web-site'], |
0 | 536 |
} |
537 |
copy_skeleton(skeldir, cubedir, context) |
|
538 |
||
539 |
def _ask_for_dependancies(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
|
540 |
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
|
541 |
from logilab.common.textutils import splitstrip |
0 | 542 |
includes = [] |
543 |
for stdtype in ServerConfiguration.available_cubes(): |
|
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
|
544 |
answer = ASK.ask("Depends on cube %s? " % stdtype, |
1ea41b7c0836
F [dialog] offer to create backup. refactor to use l.c.shellutils.ASK
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
2551
diff
changeset
|
545 |
('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
|
546 |
if answer == 'y': |
0 | 547 |
includes.append(stdtype) |
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
|
548 |
if answer == 'type': |
2633
bc9386c3b2c9
get_csv is being renamed to splitstrip
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
2615
diff
changeset
|
549 |
includes = splitstrip(raw_input('type dependancies: ')) |
0 | 550 |
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
|
551 |
elif answer == 'skip': |
0 | 552 |
break |
553 |
return includes |
|
1451 | 554 |
|
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
555 |
|
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
556 |
class ExamineLogCommand(Command): |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
557 |
"""Examine a rql log file. |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
558 |
|
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
559 |
will print out the following table |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
560 |
|
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
561 |
total execution time || number of occurences || rql query |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
562 |
|
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
563 |
sorted by descending total execution time |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
564 |
|
4708
2bd3d03721f3
#687194: cubicweb-ctl exlog : fix help message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4479
diff
changeset
|
565 |
chances are the lines at the top are the ones that will bring the higher |
2bd3d03721f3
#687194: cubicweb-ctl exlog : fix help message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4479
diff
changeset
|
566 |
benefit after optimisation. Start there. |
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
567 |
""" |
4708
2bd3d03721f3
#687194: cubicweb-ctl exlog : fix help message
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4479
diff
changeset
|
568 |
arguments = '< rql.log' |
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
569 |
name = 'exlog' |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
570 |
options = ( |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
571 |
) |
1451 | 572 |
|
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
573 |
def run(self, args): |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
574 |
if args: |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
575 |
raise BadCommandUsage("no argument expected") |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
576 |
import re |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
577 |
requests = {} |
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
|
578 |
for lineno, line in enumerate(sys.stdin): |
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
579 |
if not ' WHERE ' in line: |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
580 |
continue |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
581 |
#sys.stderr.write( line ) |
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
|
582 |
try: |
6937dfb242fb
[devtools] ExamineLog command does not fail on strange input and outputs to csv
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
1116
diff
changeset
|
583 |
rql, time = line.split('--') |
6937dfb242fb
[devtools] ExamineLog command does not fail on strange input and outputs to csv
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
1116
diff
changeset
|
584 |
rql = re.sub("(\'\w+': \d*)", '', rql) |
1189
8a075bc94563
[devtools] improve output of exlog command
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
1188
diff
changeset
|
585 |
if '{' in rql: |
8a075bc94563
[devtools] improve output of exlog command
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
1188
diff
changeset
|
586 |
rql = rql[:rql.index('{')] |
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
|
587 |
req = requests.setdefault(rql, []) |
6937dfb242fb
[devtools] ExamineLog command does not fail on strange input and outputs to csv
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
1116
diff
changeset
|
588 |
time.strip() |
6937dfb242fb
[devtools] ExamineLog command does not fail on strange input and outputs to csv
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
1116
diff
changeset
|
589 |
chunks = time.split() |
2092
f5102472243d
[exlog] print clocktime in addition to cputime
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1977
diff
changeset
|
590 |
clocktime = float(chunks[0][1:]) |
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
|
591 |
cputime = float(chunks[-3]) |
2092
f5102472243d
[exlog] print clocktime in addition to cputime
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1977
diff
changeset
|
592 |
req.append( (clocktime, cputime) ) |
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
|
593 |
except Exception, exc: |
1189
8a075bc94563
[devtools] improve output of exlog command
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
1188
diff
changeset
|
594 |
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
|
595 |
|
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
596 |
stat = [] |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
597 |
for rql, times in requests.items(): |
2092
f5102472243d
[exlog] print clocktime in addition to cputime
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1977
diff
changeset
|
598 |
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
|
599 |
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
|
600 |
len(times), rql) ) |
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
601 |
|
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
602 |
stat.sort() |
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
603 |
stat.reverse() |
1189
8a075bc94563
[devtools] improve output of exlog command
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
1188
diff
changeset
|
604 |
|
2092
f5102472243d
[exlog] print clocktime in addition to cputime
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1977
diff
changeset
|
605 |
total_time = sum(clocktime for clocktime, cputime, occ, rql in stat)*0.01 |
f5102472243d
[exlog] print clocktime in addition to cputime
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1977
diff
changeset
|
606 |
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
|
607 |
for clocktime, cputime, occ, rql in stat: |
f5102472243d
[exlog] print clocktime in addition to cputime
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
1977
diff
changeset
|
608 |
print '%.2f;%.2f;%.2f;%s;%s' % (clocktime/total_time, clocktime, cputime, occ, rql) |
1451 | 609 |
|
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
|
610 |
|
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
|
611 |
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
|
612 |
"""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
|
613 |
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
|
614 |
arguments = '<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
|
615 |
options = [('output-file', {'type':'file', 'default': 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
|
616 |
'metavar': '<file>', 'short':'o', 'help':'output image file', |
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
617 |
'input':False}), |
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
618 |
('viewer', {'type': 'string', 'default':None, |
4434
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
619 |
'short': "d", 'metavar':'<cmd>', |
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
|
620 |
'help':'command use to view the generated file (empty for 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
|
621 |
), |
4434
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
622 |
('show-meta', {'action': 'store_true', 'default':False, |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
623 |
'short': "m", 'metavar': "<yN>", |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
624 |
'help':'include meta and internal entities in schema'} |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
625 |
), |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
626 |
('show-workflow', {'action': 'store_true', 'default':False, |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
627 |
'short': "w", 'metavar': "<yN>", |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
628 |
'help':'include workflow entities in schema'} |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
629 |
), |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
630 |
('show-cw-user', {'action': 'store_true', 'default':False, |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
631 |
'metavar': "<yN>", |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
632 |
'help':'include cubicweb user entities in schema'} |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
633 |
), |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
634 |
('exclude-type', {'type':'string', 'default':'', |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
635 |
'short': "x", 'metavar': "<types>", |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
636 |
'help':'coma separated list of entity types to remove from view'} |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
637 |
), |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
638 |
('include-type', {'type':'string', 'default':'', |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
639 |
'short': "i", 'metavar': "<types>", |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
640 |
'help':'coma separated list of entity types to include in view'} |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
641 |
), |
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
|
642 |
] |
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
643 |
|
03614b377ecd
Add a ``schema`` command to cmd ctrl to generate schema image.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4400
diff
changeset
|
644 |
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
|
645 |
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
|
646 |
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
|
647 |
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
|
648 |
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
|
649 |
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
|
650 |
WORKFLOW_TYPES, INTERNAL_TYPES) |
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
|
651 |
cubes = splitstrip(pop_arg(args, 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
|
652 |
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
|
653 |
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
|
654 |
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
|
655 |
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
|
656 |
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
|
657 |
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
|
658 |
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
|
659 |
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
|
660 |
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
|
661 |
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
|
662 |
skiptypes |= WORKFLOW_TYPES |
101344a6ff9b
Improve the schema command with filtering option.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
4428
diff
changeset
|
663 |
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
|
664 |
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
|
665 |
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
|
666 |
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
|
667 |
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
|
668 |
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
|
669 |
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
|
670 |
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
|
671 |
|
0 | 672 |
register_commands((UpdateCubicWebCatalogCommand, |
673 |
UpdateTemplateCatalogCommand, |
|
4439
5ab3f63b06ad
live-server doesn't work, don't make think it does
Sylvain Thénault <sylvain.thenault@logilab.fr>
parents:
4434
diff
changeset
|
674 |
#LiveServerCommand, |
132
561671b87c22
rename NewTemplateCommand class into NewCubeCommand
Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
parents:
61
diff
changeset
|
675 |
NewCubeCommand, |
374
89225b187eb8
turn exlog into a cw-ctl command
Sylvain Thenault <sylvain.thenault@logilab.fr>
parents:
373
diff
changeset
|
676 |
ExamineLogCommand, |
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
|
677 |
GenerateSchema, |
0 | 678 |
)) |