Mercurial > kallithea
annotate rhodecode/lib/utils2.py @ 3699:49b34e3c0812 beta
version bump + changelog
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 07 Apr 2013 16:44:46 +0200 |
parents | 71860d0737e7 |
children | 3563bb7b4b82 dc4644865e8b |
rev | line source |
---|---|
2109 | 1 # -*- coding: utf-8 -*- |
2 """ | |
3 rhodecode.lib.utils | |
4 ~~~~~~~~~~~~~~~~~~~ | |
5 | |
6 Some simple helper functions | |
7 | |
8 :created_on: Jan 5, 2011 | |
9 :author: marcink | |
10 :copyright: (C) 2011-2012 Marcin Kuzminski <marcin@python-works.com> | |
11 :license: GPLv3, see COPYING for more details. | |
12 """ | |
13 # This program is free software: you can redistribute it and/or modify | |
14 # it under the terms of the GNU General Public License as published by | |
15 # the Free Software Foundation, either version 3 of the License, or | |
16 # (at your option) any later version. | |
17 # | |
18 # This program is distributed in the hope that it will be useful, | |
19 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 # GNU General Public License for more details. | |
22 # | |
23 # You should have received a copy of the GNU General Public License | |
24 # along with this program. If not, see <http://www.gnu.org/licenses/>. | |
25 | |
3577
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
26 import os |
2109 | 27 import re |
3577
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
28 import sys |
2699
4eef5eeb81a3
fixed sorting by last_login in users admin page
Marcin Kuzminski <marcin@python-works.com>
parents:
2684
diff
changeset
|
29 import time |
2726
aa17c7a1b8a5
Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents:
2699
diff
changeset
|
30 import datetime |
3577
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
31 import traceback |
2969
5085e51fba3a
Implemented #628: Pass server URL to rc-extensions hooks
Marcin Kuzminski <marcin@python-works.com>
parents:
2902
diff
changeset
|
32 import webob |
5085e51fba3a
Implemented #628: Pass server URL to rc-extensions hooks
Marcin Kuzminski <marcin@python-works.com>
parents:
2902
diff
changeset
|
33 |
2303
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
34 from pylons.i18n.translation import _, ungettext |
2109 | 35 from rhodecode.lib.vcs.utils.lazy import LazyProperty |
3577
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
36 from rhodecode.lib.compat import json |
2109 | 37 |
38 | |
39 def __get_lem(): | |
40 """ | |
41 Get language extension map based on what's inside pygments lexers | |
42 """ | |
43 from pygments import lexers | |
44 from string import lower | |
45 from collections import defaultdict | |
46 | |
47 d = defaultdict(lambda: []) | |
48 | |
49 def __clean(s): | |
50 s = s.lstrip('*') | |
51 s = s.lstrip('.') | |
52 | |
53 if s.find('[') != -1: | |
54 exts = [] | |
55 start, stop = s.find('['), s.find(']') | |
56 | |
57 for suffix in s[start + 1:stop]: | |
58 exts.append(s[:s.find('[')] + suffix) | |
59 return map(lower, exts) | |
60 else: | |
61 return map(lower, [s]) | |
62 | |
63 for lx, t in sorted(lexers.LEXERS.items()): | |
64 m = map(__clean, t[-2]) | |
65 if m: | |
66 m = reduce(lambda x, y: x + y, m) | |
67 for ext in m: | |
68 desc = lx.replace('Lexer', '') | |
69 d[ext].append(desc) | |
70 | |
71 return dict(d) | |
72 | |
3008
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
73 |
2109 | 74 def str2bool(_str): |
75 """ | |
76 returs True/False value from given string, it tries to translate the | |
77 string into boolean | |
78 | |
79 :param _str: string value to translate into boolean | |
80 :rtype: boolean | |
81 :returns: boolean from given string | |
82 """ | |
83 if _str is None: | |
84 return False | |
85 if _str in (True, False): | |
86 return _str | |
87 _str = str(_str).strip().lower() | |
88 return _str in ('t', 'true', 'y', 'yes', 'on', '1') | |
89 | |
90 | |
3008
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
91 def aslist(obj, sep=None, strip=True): |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
92 """ |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
93 Returns given string separated by sep as list |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
94 |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
95 :param obj: |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
96 :param sep: |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
97 :param strip: |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
98 """ |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
99 if isinstance(obj, (basestring)): |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
100 lst = obj.split(sep) |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
101 if strip: |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
102 lst = [v.strip() for v in lst] |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
103 return lst |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
104 elif isinstance(obj, (list, tuple)): |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
105 return obj |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
106 elif obj is None: |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
107 return [] |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
108 else: |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
109 return [obj] |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
110 |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
111 |
2109 | 112 def convert_line_endings(line, mode): |
113 """ | |
114 Converts a given line "line end" accordingly to given mode | |
115 | |
116 Available modes are:: | |
117 0 - Unix | |
118 1 - Mac | |
119 2 - DOS | |
120 | |
121 :param line: given line to convert | |
122 :param mode: mode to convert to | |
123 :rtype: str | |
124 :return: converted line according to mode | |
125 """ | |
126 from string import replace | |
127 | |
128 if mode == 0: | |
129 line = replace(line, '\r\n', '\n') | |
130 line = replace(line, '\r', '\n') | |
131 elif mode == 1: | |
132 line = replace(line, '\r\n', '\r') | |
133 line = replace(line, '\n', '\r') | |
134 elif mode == 2: | |
135 line = re.sub("\r(?!\n)|(?<!\r)\n", "\r\n", line) | |
136 return line | |
137 | |
138 | |
139 def detect_mode(line, default): | |
140 """ | |
141 Detects line break for given line, if line break couldn't be found | |
142 given default value is returned | |
143 | |
144 :param line: str line | |
145 :param default: default | |
146 :rtype: int | |
147 :return: value of line end on of 0 - Unix, 1 - Mac, 2 - DOS | |
148 """ | |
149 if line.endswith('\r\n'): | |
150 return 2 | |
151 elif line.endswith('\n'): | |
152 return 0 | |
153 elif line.endswith('\r'): | |
154 return 1 | |
155 else: | |
156 return default | |
157 | |
158 | |
159 def generate_api_key(username, salt=None): | |
160 """ | |
161 Generates unique API key for given username, if salt is not given | |
162 it'll be generated from some random string | |
163 | |
164 :param username: username as string | |
165 :param salt: salt to hash generate KEY | |
166 :rtype: str | |
167 :returns: sha1 hash from username+salt | |
168 """ | |
169 from tempfile import _RandomNameSequence | |
170 import hashlib | |
171 | |
172 if salt is None: | |
173 salt = _RandomNameSequence().next() | |
174 | |
175 return hashlib.sha1(username + salt).hexdigest() | |
176 | |
177 | |
2845
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
178 def safe_int(val, default=None): |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
179 """ |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
180 Returns int() of val if val is not convertable to int use default |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
181 instead |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
182 |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
183 :param val: |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
184 :param default: |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
185 """ |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
186 |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
187 try: |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
188 val = int(val) |
3218
c0b0351233ec
safe_int should also catch TypeError
Marcin Kuzminski <marcin@python-works.com>
parents:
3056
diff
changeset
|
189 except (ValueError, TypeError): |
2845
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
190 val = default |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
191 |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
192 return val |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
193 |
6b176c679896
failsafe the GET `page` argument
Marcin Kuzminski <marcin@python-works.com>
parents:
2759
diff
changeset
|
194 |
2109 | 195 def safe_unicode(str_, from_encoding=None): |
196 """ | |
197 safe unicode function. Does few trick to turn str_ into unicode | |
198 | |
199 In case of UnicodeDecode error we try to return it with encoding detected | |
200 by chardet library if it fails fallback to unicode with errors replaced | |
201 | |
202 :param str_: string to decode | |
203 :rtype: unicode | |
204 :returns: unicode object | |
205 """ | |
206 if isinstance(str_, unicode): | |
207 return str_ | |
208 | |
209 if not from_encoding: | |
210 import rhodecode | |
3008
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
211 DEFAULT_ENCODINGS = aslist(rhodecode.CONFIG.get('default_encoding', |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
212 'utf8'), sep=',') |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
213 from_encoding = DEFAULT_ENCODINGS |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
214 |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
215 if not isinstance(from_encoding, (list, tuple)): |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
216 from_encoding = [from_encoding] |
2109 | 217 |
218 try: | |
219 return unicode(str_) | |
220 except UnicodeDecodeError: | |
221 pass | |
222 | |
3008
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
223 for enc in from_encoding: |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
224 try: |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
225 return unicode(str_, enc) |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
226 except UnicodeDecodeError: |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
227 pass |
2109 | 228 |
229 try: | |
230 import chardet | |
231 encoding = chardet.detect(str_)['encoding'] | |
232 if encoding is None: | |
233 raise Exception() | |
234 return str_.decode(encoding) | |
235 except (ImportError, UnicodeDecodeError, Exception): | |
3008
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
236 return unicode(str_, from_encoding[0], 'replace') |
2109 | 237 |
238 | |
239 def safe_str(unicode_, to_encoding=None): | |
240 """ | |
241 safe str function. Does few trick to turn unicode_ into string | |
242 | |
243 In case of UnicodeEncodeError we try to return it with encoding detected | |
244 by chardet library if it fails fallback to string with errors replaced | |
245 | |
246 :param unicode_: unicode to encode | |
247 :rtype: str | |
248 :returns: str object | |
249 """ | |
250 | |
251 # if it's not basestr cast to str | |
252 if not isinstance(unicode_, basestring): | |
253 return str(unicode_) | |
254 | |
255 if isinstance(unicode_, str): | |
256 return unicode_ | |
257 | |
258 if not to_encoding: | |
259 import rhodecode | |
3008
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
260 DEFAULT_ENCODINGS = aslist(rhodecode.CONFIG.get('default_encoding', |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
261 'utf8'), sep=',') |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
262 to_encoding = DEFAULT_ENCODINGS |
2109 | 263 |
3008
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
264 if not isinstance(to_encoding, (list, tuple)): |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
265 to_encoding = [to_encoding] |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
266 |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
267 for enc in to_encoding: |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
268 try: |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
269 return unicode_.encode(enc) |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
270 except UnicodeEncodeError: |
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
271 pass |
2109 | 272 |
273 try: | |
274 import chardet | |
275 encoding = chardet.detect(unicode_)['encoding'] | |
276 if encoding is None: | |
277 raise UnicodeEncodeError() | |
278 | |
279 return unicode_.encode(encoding) | |
280 except (ImportError, UnicodeEncodeError): | |
3008
6e76b4892d72
Implemented #647, option to pass list of default encoding used to encode to/decode from unicode
Marcin Kuzminski <marcin@python-works.com>
parents:
2969
diff
changeset
|
281 return unicode_.encode(to_encoding[0], 'replace') |
2109 | 282 |
283 return safe_str | |
284 | |
285 | |
3018
023f7873ef59
added caching layer into RSS/ATOM feeds
Marcin Kuzminski <marcin@python-works.com>
parents:
3008
diff
changeset
|
286 def remove_suffix(s, suffix): |
023f7873ef59
added caching layer into RSS/ATOM feeds
Marcin Kuzminski <marcin@python-works.com>
parents:
3008
diff
changeset
|
287 if s.endswith(suffix): |
023f7873ef59
added caching layer into RSS/ATOM feeds
Marcin Kuzminski <marcin@python-works.com>
parents:
3008
diff
changeset
|
288 s = s[:-1 * len(suffix)] |
023f7873ef59
added caching layer into RSS/ATOM feeds
Marcin Kuzminski <marcin@python-works.com>
parents:
3008
diff
changeset
|
289 return s |
023f7873ef59
added caching layer into RSS/ATOM feeds
Marcin Kuzminski <marcin@python-works.com>
parents:
3008
diff
changeset
|
290 |
023f7873ef59
added caching layer into RSS/ATOM feeds
Marcin Kuzminski <marcin@python-works.com>
parents:
3008
diff
changeset
|
291 |
023f7873ef59
added caching layer into RSS/ATOM feeds
Marcin Kuzminski <marcin@python-works.com>
parents:
3008
diff
changeset
|
292 def remove_prefix(s, prefix): |
023f7873ef59
added caching layer into RSS/ATOM feeds
Marcin Kuzminski <marcin@python-works.com>
parents:
3008
diff
changeset
|
293 if s.startswith(prefix): |
3056
6104dfd35b16
Implemented #379 defaults settings page for creation of repositories
Marcin Kuzminski <marcin@python-works.com>
parents:
3018
diff
changeset
|
294 s = s[len(prefix):] |
3018
023f7873ef59
added caching layer into RSS/ATOM feeds
Marcin Kuzminski <marcin@python-works.com>
parents:
3008
diff
changeset
|
295 return s |
023f7873ef59
added caching layer into RSS/ATOM feeds
Marcin Kuzminski <marcin@python-works.com>
parents:
3008
diff
changeset
|
296 |
023f7873ef59
added caching layer into RSS/ATOM feeds
Marcin Kuzminski <marcin@python-works.com>
parents:
3008
diff
changeset
|
297 |
2109 | 298 def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs): |
299 """ | |
300 Custom engine_from_config functions that makes sure we use NullPool for | |
301 file based sqlite databases. This prevents errors on sqlite. This only | |
302 applies to sqlalchemy versions < 0.7.0 | |
303 | |
304 """ | |
305 import sqlalchemy | |
306 from sqlalchemy import engine_from_config as efc | |
307 import logging | |
308 | |
309 if int(sqlalchemy.__version__.split('.')[1]) < 7: | |
310 | |
311 # This solution should work for sqlalchemy < 0.7.0, and should use | |
312 # proxy=TimerProxy() for execution time profiling | |
313 | |
314 from sqlalchemy.pool import NullPool | |
315 url = configuration[prefix + 'url'] | |
316 | |
317 if url.startswith('sqlite'): | |
318 kwargs.update({'poolclass': NullPool}) | |
319 return efc(configuration, prefix, **kwargs) | |
320 else: | |
321 import time | |
322 from sqlalchemy import event | |
323 from sqlalchemy.engine import Engine | |
324 | |
325 log = logging.getLogger('sqlalchemy.engine') | |
326 BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = xrange(30, 38) | |
327 engine = efc(configuration, prefix, **kwargs) | |
328 | |
329 def color_sql(sql): | |
330 COLOR_SEQ = "\033[1;%dm" | |
331 COLOR_SQL = YELLOW | |
332 normal = '\x1b[0m' | |
333 return ''.join([COLOR_SEQ % COLOR_SQL, sql, normal]) | |
334 | |
335 if configuration['debug']: | |
336 #attach events only for debug configuration | |
337 | |
338 def before_cursor_execute(conn, cursor, statement, | |
339 parameters, context, executemany): | |
340 context._query_start_time = time.time() | |
341 log.info(color_sql(">>>>> STARTING QUERY >>>>>")) | |
342 | |
343 def after_cursor_execute(conn, cursor, statement, | |
344 parameters, context, executemany): | |
345 total = time.time() - context._query_start_time | |
346 log.info(color_sql("<<<<< TOTAL TIME: %f <<<<<" % total)) | |
347 | |
348 event.listen(engine, "before_cursor_execute", | |
349 before_cursor_execute) | |
350 event.listen(engine, "after_cursor_execute", | |
351 after_cursor_execute) | |
352 | |
353 return engine | |
354 | |
355 | |
3644
71860d0737e7
- age tests cannot be dynamic, there are cases when age calculation
Marcin Kuzminski <marcin@python-works.com>
parents:
3631
diff
changeset
|
356 def age(prevdate, show_short_version=False, now=None): |
2109 | 357 """ |
358 turns a datetime into an age string. | |
3536 | 359 If show_short_version is True, then it will generate a not so accurate but shorter string, |
360 example: 2days ago, instead of 2 days and 23 hours ago. | |
361 | |
2303
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
362 :param prevdate: datetime object |
3536 | 363 :param show_short_version: if it should aproximate the date and return a shorter string |
2109 | 364 :rtype: unicode |
365 :returns: unicode words describing age | |
366 """ | |
3644
71860d0737e7
- age tests cannot be dynamic, there are cases when age calculation
Marcin Kuzminski <marcin@python-works.com>
parents:
3631
diff
changeset
|
367 now = now or datetime.datetime.now() |
2303
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
368 order = ['year', 'month', 'day', 'hour', 'minute', 'second'] |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
369 deltas = {} |
2902
e2b2791d1e7c
fixed #597 commits in future get negative age.
Marcin Kuzminski <marcin@python-works.com>
parents:
2882
diff
changeset
|
370 future = False |
2303
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
371 |
2902
e2b2791d1e7c
fixed #597 commits in future get negative age.
Marcin Kuzminski <marcin@python-works.com>
parents:
2882
diff
changeset
|
372 if prevdate > now: |
e2b2791d1e7c
fixed #597 commits in future get negative age.
Marcin Kuzminski <marcin@python-works.com>
parents:
2882
diff
changeset
|
373 now, prevdate = prevdate, now |
e2b2791d1e7c
fixed #597 commits in future get negative age.
Marcin Kuzminski <marcin@python-works.com>
parents:
2882
diff
changeset
|
374 future = True |
3644
71860d0737e7
- age tests cannot be dynamic, there are cases when age calculation
Marcin Kuzminski <marcin@python-works.com>
parents:
3631
diff
changeset
|
375 if future: |
71860d0737e7
- age tests cannot be dynamic, there are cases when age calculation
Marcin Kuzminski <marcin@python-works.com>
parents:
3631
diff
changeset
|
376 prevdate = prevdate.replace(microsecond=0) |
3261
54a439edaf99
fixed AGE funtion for future dates, testa are now cleaner with dateutil usage
Marcin Kuzminski <marcin@python-works.com>
parents:
3218
diff
changeset
|
377 # Get date parts deltas |
3644
71860d0737e7
- age tests cannot be dynamic, there are cases when age calculation
Marcin Kuzminski <marcin@python-works.com>
parents:
3631
diff
changeset
|
378 from dateutil import relativedelta |
2303
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
379 for part in order: |
3644
71860d0737e7
- age tests cannot be dynamic, there are cases when age calculation
Marcin Kuzminski <marcin@python-works.com>
parents:
3631
diff
changeset
|
380 d = relativedelta.relativedelta(now, prevdate) |
71860d0737e7
- age tests cannot be dynamic, there are cases when age calculation
Marcin Kuzminski <marcin@python-works.com>
parents:
3631
diff
changeset
|
381 deltas[part] = getattr(d, part + 's') |
2109 | 382 |
2303
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
383 # Fix negative offsets (there is 1 second between 10:59:59 and 11:00:00, |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
384 # not 1 hour, -59 minutes and -59 seconds) |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
385 for num, length in [(5, 60), (4, 60), (3, 24)]: # seconds, minutes, hours |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
386 part = order[num] |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
387 carry_part = order[num - 1] |
2367
86aa4f1f130b
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2303
diff
changeset
|
388 |
2303
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
389 if deltas[part] < 0: |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
390 deltas[part] += length |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
391 deltas[carry_part] -= 1 |
2109 | 392 |
2303
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
393 # Same thing for days except that the increment depends on the (variable) |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
394 # number of days in the month |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
395 month_lengths = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
396 if deltas['day'] < 0: |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
397 if prevdate.month == 2 and (prevdate.year % 4 == 0 and |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
398 (prevdate.year % 100 != 0 or prevdate.year % 400 == 0)): |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
399 deltas['day'] += 29 |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
400 else: |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
401 deltas['day'] += month_lengths[prevdate.month - 1] |
2367
86aa4f1f130b
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2303
diff
changeset
|
402 |
2303
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
403 deltas['month'] -= 1 |
2367
86aa4f1f130b
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2303
diff
changeset
|
404 |
2303
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
405 if deltas['month'] < 0: |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
406 deltas['month'] += 12 |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
407 deltas['year'] -= 1 |
2367
86aa4f1f130b
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2303
diff
changeset
|
408 |
2303
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
409 # Format the result |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
410 fmt_funcs = { |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
411 'year': lambda d: ungettext(u'%d year', '%d years', d) % d, |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
412 'month': lambda d: ungettext(u'%d month', '%d months', d) % d, |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
413 'day': lambda d: ungettext(u'%d day', '%d days', d) % d, |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
414 'hour': lambda d: ungettext(u'%d hour', '%d hours', d) % d, |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
415 'minute': lambda d: ungettext(u'%d minute', '%d minutes', d) % d, |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
416 'second': lambda d: ungettext(u'%d second', '%d seconds', d) % d, |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
417 } |
2367
86aa4f1f130b
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2303
diff
changeset
|
418 |
2303
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
419 for i, part in enumerate(order): |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
420 value = deltas[part] |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
421 if value == 0: |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
422 continue |
2367
86aa4f1f130b
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2303
diff
changeset
|
423 |
2303
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
424 if i < 5: |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
425 sub_part = order[i + 1] |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
426 sub_value = deltas[sub_part] |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
427 else: |
7090e394df06
Rewrite of the age() utility function so it can be translated.
Vincent Duvert <vincent@duvert.net>
parents:
2278
diff
changeset
|
428 sub_value = 0 |
2367
86aa4f1f130b
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2303
diff
changeset
|
429 |
3536 | 430 if sub_value == 0 or show_short_version: |
2902
e2b2791d1e7c
fixed #597 commits in future get negative age.
Marcin Kuzminski <marcin@python-works.com>
parents:
2882
diff
changeset
|
431 if future: |
e2b2791d1e7c
fixed #597 commits in future get negative age.
Marcin Kuzminski <marcin@python-works.com>
parents:
2882
diff
changeset
|
432 return _(u'in %s') % fmt_funcs[part](value) |
e2b2791d1e7c
fixed #597 commits in future get negative age.
Marcin Kuzminski <marcin@python-works.com>
parents:
2882
diff
changeset
|
433 else: |
e2b2791d1e7c
fixed #597 commits in future get negative age.
Marcin Kuzminski <marcin@python-works.com>
parents:
2882
diff
changeset
|
434 return _(u'%s ago') % fmt_funcs[part](value) |
e2b2791d1e7c
fixed #597 commits in future get negative age.
Marcin Kuzminski <marcin@python-works.com>
parents:
2882
diff
changeset
|
435 if future: |
e2b2791d1e7c
fixed #597 commits in future get negative age.
Marcin Kuzminski <marcin@python-works.com>
parents:
2882
diff
changeset
|
436 return _(u'in %s and %s') % (fmt_funcs[part](value), |
e2b2791d1e7c
fixed #597 commits in future get negative age.
Marcin Kuzminski <marcin@python-works.com>
parents:
2882
diff
changeset
|
437 fmt_funcs[sub_part](sub_value)) |
e2b2791d1e7c
fixed #597 commits in future get negative age.
Marcin Kuzminski <marcin@python-works.com>
parents:
2882
diff
changeset
|
438 else: |
e2b2791d1e7c
fixed #597 commits in future get negative age.
Marcin Kuzminski <marcin@python-works.com>
parents:
2882
diff
changeset
|
439 return _(u'%s and %s ago') % (fmt_funcs[part](value), |
e2b2791d1e7c
fixed #597 commits in future get negative age.
Marcin Kuzminski <marcin@python-works.com>
parents:
2882
diff
changeset
|
440 fmt_funcs[sub_part](sub_value)) |
2109 | 441 |
442 return _(u'just now') | |
443 | |
444 | |
445 def uri_filter(uri): | |
446 """ | |
447 Removes user:password from given url string | |
448 | |
449 :param uri: | |
450 :rtype: unicode | |
451 :returns: filtered list of strings | |
452 """ | |
453 if not uri: | |
454 return '' | |
455 | |
456 proto = '' | |
457 | |
458 for pat in ('https://', 'http://'): | |
459 if uri.startswith(pat): | |
460 uri = uri[len(pat):] | |
461 proto = pat | |
462 break | |
463 | |
464 # remove passwords and username | |
465 uri = uri[uri.find('@') + 1:] | |
466 | |
467 # get the port | |
468 cred_pos = uri.find(':') | |
469 if cred_pos == -1: | |
470 host, port = uri, None | |
471 else: | |
472 host, port = uri[:cred_pos], uri[cred_pos + 1:] | |
473 | |
474 return filter(None, [proto, host, port]) | |
475 | |
476 | |
477 def credentials_filter(uri): | |
478 """ | |
479 Returns a url with removed credentials | |
480 | |
481 :param uri: | |
482 """ | |
483 | |
484 uri = uri_filter(uri) | |
485 #check if we have port | |
486 if len(uri) > 2 and uri[2]: | |
487 uri[2] = ':' + uri[2] | |
488 | |
489 return ''.join(uri) | |
490 | |
491 | |
492 def get_changeset_safe(repo, rev): | |
493 """ | |
494 Safe version of get_changeset if this changeset doesn't exists for a | |
495 repo it returns a Dummy one instead | |
496 | |
497 :param repo: | |
498 :param rev: | |
499 """ | |
500 from rhodecode.lib.vcs.backends.base import BaseRepository | |
501 from rhodecode.lib.vcs.exceptions import RepositoryError | |
2684
2b6939a77052
Bumped mercurial version to 2.3
Marcin Kuzminski <marcin@python-works.com>
parents:
2674
diff
changeset
|
502 from rhodecode.lib.vcs.backends.base import EmptyChangeset |
2109 | 503 if not isinstance(repo, BaseRepository): |
504 raise Exception('You must pass an Repository ' | |
505 'object as first argument got %s', type(repo)) | |
506 | |
507 try: | |
508 cs = repo.get_changeset(rev) | |
509 except RepositoryError: | |
510 cs = EmptyChangeset(requested_revision=rev) | |
511 return cs | |
512 | |
513 | |
2699
4eef5eeb81a3
fixed sorting by last_login in users admin page
Marcin Kuzminski <marcin@python-works.com>
parents:
2684
diff
changeset
|
514 def datetime_to_time(dt): |
4eef5eeb81a3
fixed sorting by last_login in users admin page
Marcin Kuzminski <marcin@python-works.com>
parents:
2684
diff
changeset
|
515 if dt: |
4eef5eeb81a3
fixed sorting by last_login in users admin page
Marcin Kuzminski <marcin@python-works.com>
parents:
2684
diff
changeset
|
516 return time.mktime(dt.timetuple()) |
4eef5eeb81a3
fixed sorting by last_login in users admin page
Marcin Kuzminski <marcin@python-works.com>
parents:
2684
diff
changeset
|
517 |
4eef5eeb81a3
fixed sorting by last_login in users admin page
Marcin Kuzminski <marcin@python-works.com>
parents:
2684
diff
changeset
|
518 |
2726
aa17c7a1b8a5
Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents:
2699
diff
changeset
|
519 def time_to_datetime(tm): |
aa17c7a1b8a5
Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents:
2699
diff
changeset
|
520 if tm: |
aa17c7a1b8a5
Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents:
2699
diff
changeset
|
521 if isinstance(tm, basestring): |
aa17c7a1b8a5
Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents:
2699
diff
changeset
|
522 try: |
aa17c7a1b8a5
Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents:
2699
diff
changeset
|
523 tm = float(tm) |
aa17c7a1b8a5
Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents:
2699
diff
changeset
|
524 except ValueError: |
aa17c7a1b8a5
Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents:
2699
diff
changeset
|
525 return |
aa17c7a1b8a5
Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents:
2699
diff
changeset
|
526 return datetime.datetime.fromtimestamp(tm) |
aa17c7a1b8a5
Implemented basic locking functionality.
Marcin Kuzminski <marcin@python-works.com>
parents:
2699
diff
changeset
|
527 |
2201
ea5ff843b200
#426 fixed mention extracting regex
Marcin Kuzminski <marcin@python-works.com>
parents:
2109
diff
changeset
|
528 MENTIONS_REGEX = r'(?:^@|\s@)([a-zA-Z0-9]{1}[a-zA-Z0-9\-\_\.]+)(?:\s{1})' |
ea5ff843b200
#426 fixed mention extracting regex
Marcin Kuzminski <marcin@python-works.com>
parents:
2109
diff
changeset
|
529 |
ea5ff843b200
#426 fixed mention extracting regex
Marcin Kuzminski <marcin@python-works.com>
parents:
2109
diff
changeset
|
530 |
2109 | 531 def extract_mentioned_users(s): |
532 """ | |
533 Returns unique usernames from given string s that have @mention | |
534 | |
535 :param s: string to get mentions | |
536 """ | |
2201
ea5ff843b200
#426 fixed mention extracting regex
Marcin Kuzminski <marcin@python-works.com>
parents:
2109
diff
changeset
|
537 usrs = set() |
ea5ff843b200
#426 fixed mention extracting regex
Marcin Kuzminski <marcin@python-works.com>
parents:
2109
diff
changeset
|
538 for username in re.findall(MENTIONS_REGEX, s): |
ea5ff843b200
#426 fixed mention extracting regex
Marcin Kuzminski <marcin@python-works.com>
parents:
2109
diff
changeset
|
539 usrs.add(username) |
2109 | 540 |
2201
ea5ff843b200
#426 fixed mention extracting regex
Marcin Kuzminski <marcin@python-works.com>
parents:
2109
diff
changeset
|
541 return sorted(list(usrs), key=lambda k: k.lower()) |
2674
a221706dab50
merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents:
2367
diff
changeset
|
542 |
2699
4eef5eeb81a3
fixed sorting by last_login in users admin page
Marcin Kuzminski <marcin@python-works.com>
parents:
2684
diff
changeset
|
543 |
2674
a221706dab50
merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents:
2367
diff
changeset
|
544 class AttributeDict(dict): |
a221706dab50
merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents:
2367
diff
changeset
|
545 def __getattr__(self, attr): |
a221706dab50
merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents:
2367
diff
changeset
|
546 return self.get(attr, None) |
a221706dab50
merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents:
2367
diff
changeset
|
547 __setattr__ = dict.__setitem__ |
a221706dab50
merged + fixed pull request #62: Implemented metatags and visualisation options.
Marcin Kuzminski <marcin@python-works.com>
parents:
2367
diff
changeset
|
548 __delattr__ = dict.__delitem__ |
2869
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
549 |
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
550 |
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
551 def fix_PATH(os_=None): |
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
552 """ |
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
553 Get current active python path, and append it to PATH variable to fix issues |
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
554 of subprocess calls and different python versions |
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
555 """ |
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
556 if os_ is None: |
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
557 import os |
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
558 else: |
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
559 os = os_ |
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
560 |
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
561 cur_path = os.path.split(sys.executable)[0] |
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
562 if not os.environ['PATH'].startswith(cur_path): |
ccbdff90e5a0
fix for issue #578 git hooks sometimes cannot be executed due to different python they runned under, this commit tries to fix that by altering the PATH env variable using current python that rhodecode is running
Marcin Kuzminski <marcin@python-works.com>
parents:
2845
diff
changeset
|
563 os.environ['PATH'] = '%s:%s' % (cur_path, os.environ['PATH']) |
2882
12fce5e499d5
obfuscate password in logs for engine connection string
Marcin Kuzminski <marcin@python-works.com>
parents:
2869
diff
changeset
|
564 |
12fce5e499d5
obfuscate password in logs for engine connection string
Marcin Kuzminski <marcin@python-works.com>
parents:
2869
diff
changeset
|
565 |
12fce5e499d5
obfuscate password in logs for engine connection string
Marcin Kuzminski <marcin@python-works.com>
parents:
2869
diff
changeset
|
566 def obfuscate_url_pw(engine): |
3454
867c4d7fd2d8
catch errors in obfuscate password function
Marcin Kuzminski <marcin@python-works.com>
parents:
3378
diff
changeset
|
567 _url = engine or '' |
867c4d7fd2d8
catch errors in obfuscate password function
Marcin Kuzminski <marcin@python-works.com>
parents:
3378
diff
changeset
|
568 from sqlalchemy.engine import url as sa_url |
867c4d7fd2d8
catch errors in obfuscate password function
Marcin Kuzminski <marcin@python-works.com>
parents:
3378
diff
changeset
|
569 try: |
867c4d7fd2d8
catch errors in obfuscate password function
Marcin Kuzminski <marcin@python-works.com>
parents:
3378
diff
changeset
|
570 _url = sa_url.make_url(engine) |
867c4d7fd2d8
catch errors in obfuscate password function
Marcin Kuzminski <marcin@python-works.com>
parents:
3378
diff
changeset
|
571 if _url.password: |
867c4d7fd2d8
catch errors in obfuscate password function
Marcin Kuzminski <marcin@python-works.com>
parents:
3378
diff
changeset
|
572 _url.password = 'XXXXX' |
3631
10b4e34841a4
Don't catch all exceptions
Marcin Kuzminski <marcin@python-works.com>
parents:
3590
diff
changeset
|
573 except Exception: |
3454
867c4d7fd2d8
catch errors in obfuscate password function
Marcin Kuzminski <marcin@python-works.com>
parents:
3378
diff
changeset
|
574 pass |
867c4d7fd2d8
catch errors in obfuscate password function
Marcin Kuzminski <marcin@python-works.com>
parents:
3378
diff
changeset
|
575 return str(_url) |
2969
5085e51fba3a
Implemented #628: Pass server URL to rc-extensions hooks
Marcin Kuzminski <marcin@python-works.com>
parents:
2902
diff
changeset
|
576 |
5085e51fba3a
Implemented #628: Pass server URL to rc-extensions hooks
Marcin Kuzminski <marcin@python-works.com>
parents:
2902
diff
changeset
|
577 |
5085e51fba3a
Implemented #628: Pass server URL to rc-extensions hooks
Marcin Kuzminski <marcin@python-works.com>
parents:
2902
diff
changeset
|
578 def get_server_url(environ): |
5085e51fba3a
Implemented #628: Pass server URL to rc-extensions hooks
Marcin Kuzminski <marcin@python-works.com>
parents:
2902
diff
changeset
|
579 req = webob.Request(environ) |
5085e51fba3a
Implemented #628: Pass server URL to rc-extensions hooks
Marcin Kuzminski <marcin@python-works.com>
parents:
2902
diff
changeset
|
580 return req.host_url + req.script_name |
3577
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
581 |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
582 |
3590
47631be9f449
fix GIT env extraction
Marcin Kuzminski <marcin@python-works.com>
parents:
3577
diff
changeset
|
583 def _extract_extras(env=None): |
3577
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
584 """ |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
585 Extracts the rc extras data from os.environ, and wraps it into named |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
586 AttributeDict object |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
587 """ |
3590
47631be9f449
fix GIT env extraction
Marcin Kuzminski <marcin@python-works.com>
parents:
3577
diff
changeset
|
588 if not env: |
47631be9f449
fix GIT env extraction
Marcin Kuzminski <marcin@python-works.com>
parents:
3577
diff
changeset
|
589 env = os.environ |
47631be9f449
fix GIT env extraction
Marcin Kuzminski <marcin@python-works.com>
parents:
3577
diff
changeset
|
590 |
3577
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
591 try: |
3590
47631be9f449
fix GIT env extraction
Marcin Kuzminski <marcin@python-works.com>
parents:
3577
diff
changeset
|
592 rc_extras = json.loads(env['RC_SCM_DATA']) |
3631
10b4e34841a4
Don't catch all exceptions
Marcin Kuzminski <marcin@python-works.com>
parents:
3590
diff
changeset
|
593 except Exception: |
3577
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
594 print os.environ |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
595 print >> sys.stderr, traceback.format_exc() |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
596 rc_extras = {} |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
597 |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
598 try: |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
599 for k in ['username', 'repository', 'locked_by', 'scm', 'make_lock', |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
600 'action', 'ip']: |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
601 rc_extras[k] |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
602 except KeyError, e: |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
603 raise Exception('Missing key %s in os.environ %s' % (e, rc_extras)) |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
604 |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
605 return AttributeDict(rc_extras) |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
606 |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
607 |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
608 def _set_extras(extras): |
238486bb71ab
Switched handling of RhodeCode extra params in consistent way
Marcin Kuzminski <marcin@python-works.com>
parents:
3552
diff
changeset
|
609 os.environ['RC_SCM_DATA'] = json.dumps(extras) |