equal
deleted
inserted
replaced
193 # return decorator... |
193 # return decorator... |
194 return _decorator |
194 return _decorator |
195 |
195 |
196 # now for our defined preferences.... |
196 # now for our defined preferences.... |
197 import pytz |
197 import pytz |
|
198 import config |
198 |
199 |
199 class TimeFormat (urltree.URLStringType, Preference) : |
200 class TimeFormat (urltree.URLStringType, Preference) : |
200 """ |
201 """ |
201 Time format |
202 Time format |
202 """ |
203 """ |
203 |
204 |
204 # set name |
205 # set name |
205 name = 'time_format' |
206 name = 'time_format' |
206 |
207 |
207 # default value |
208 # default value |
208 default = "%H:%M:%S" |
209 default = config.PREF_TIME_FMT_DEFAULT |
209 |
210 |
210 class DateFormat (urltree.URLStringType, Preference) : |
211 class DateFormat (urltree.URLStringType, Preference) : |
211 """ |
212 """ |
212 Date format |
213 Date format |
213 """ |
214 """ |
214 |
215 |
215 # set name |
216 # set name |
216 name = 'date_format' |
217 name = 'date_format' |
217 |
218 |
218 # default value |
219 # default value |
219 default = "%Y-%m-%d" |
220 default = config.PREF_DATE_FMT_DEFAULT |
220 |
221 |
221 class Timezone (Preference) : |
222 class Timezone (Preference) : |
222 """ |
223 """ |
223 Timezone |
224 Timezone |
224 """ |
225 """ |
225 |
226 |
226 # set name |
227 # set name |
227 name = 'timezone' |
228 name = 'timezone' |
228 |
229 |
229 # default value is UTC... |
230 # default value is UTC... |
230 default = pytz.utc |
231 default = config.PREF_TIMEZONE_DEFAULT |
231 |
232 |
232 def parse (self, name) : |
233 def parse (self, name) : |
233 """ |
234 """ |
234 tz_name -> pytz.timezone |
235 tz_name -> pytz.timezone |
235 """ |
236 """ |
278 class LogFormatter -> LogFormatter(tz, time_fmt) |
279 class LogFormatter -> LogFormatter(tz, time_fmt) |
279 """ |
280 """ |
280 |
281 |
281 return fmt_cls(prefs[timezone], prefs[time_format]) |
282 return fmt_cls(prefs[timezone], prefs[time_format]) |
282 |
283 |
|
284 class Count (urltree.URLIntegerType, Preference) : |
|
285 """ |
|
286 Number of lines of log data to display per page |
|
287 """ |
|
288 |
|
289 # set name |
|
290 name = "count" |
|
291 |
|
292 # default |
|
293 default = config.PREF_COUNT_DEFAULT |
|
294 |
|
295 def __init__ (self) : |
|
296 super(Count, self).__init__(allow_negative=False, allow_zero=False, max=config.PREF_COUNT_MAX) |
|
297 |
283 # and then build the Preferences object |
298 # and then build the Preferences object |
284 import log_formatter |
299 time_format = TimeFormat() |
285 |
300 date_format = DateFormat() |
286 time_format = TimeFormat() |
301 timezone = Timezone() |
287 date_format = DateFormat() |
302 formatter = Formatter(config.LOG_FORMATTERS, config.PREF_FORMATTER_DEFAULT) |
288 timezone = Timezone() |
303 count = Count() |
289 formatter = Formatter(log_formatter.FORMATTERS, log_formatter.IrssiFormatter) |
|
290 |
304 |
291 preferences = Preferences([ |
305 preferences = Preferences([ |
292 time_format, |
306 time_format, |
293 date_format, |
307 date_format, |
294 timezone, |
308 timezone, |
295 formatter, |
309 formatter, |
|
310 count, |
296 ]) |
311 ]) |
297 |
312 |