Changeset 2 for trac_plugins

Timestamp:

04/12/06 16:55:54 (3 years ago)

Author:

pacopablo

Message:

• Fixed up the CS template
• Added a bit of CSS
• Refactored a bit of code

Location:

trac_plugins/logviewer/0.10/logviewer

Files:

• __init__.py (modified) (1 diff)
• admin.py (modified) (5 diffs)
• defaults.py (added)
• htdocs/css/logs.css (modified) (1 diff)
• templates/log_admin.cs (modified) (3 diffs)
• templates/logs.cs (modified) (1 diff)
• web_ui.py (modified) (1 diff)

trac_plugins/logviewer/0.10/logviewer/__init__.py

@@ +1 @@
+from defaults import *
 from web_ui import *
 from admin import *

trac_plugins/logviewer/0.10/logviewer/admin.py

@@ -22 +22 @@
 from trac.wiki.formatter import wiki_to_html
 from webadmin.web_ui import IAdminPageProvider
+from logviewer.defaults import ADMIN_FIELDS, get_admin_values
 
 import os
@@ -43 +44 @@
     def get_admin_pages(self, req):
         if req.perm.has_permission('LOG_ADMIN'):
-            yield ('logviewer', 'Log Viewer', 'defaults', 'Defaults')
+            yield ('logviewer', 'Log Viewer', 'logdefaults', 'Defaults')
 
     def process_admin_request(self, req, cat, page, path_info):
@@ -53 +54 @@
         req.hdf['logadmin.page'] = page
 
-        admin_fields = {
-                        'log_dir'       : '.',
-                        'log_name_fmt'  : '%Y%m%d.log',
-                        'timestamp_sep' : '|', 
-#                        'post_size'    : 1024,
-#                        'history_days' : 30,
-#                        'new_bot_link' : 'New Blog Post',
-#                        'first_week_day' : 'SUNDAY',
-                       }
+        admin_fields = ADMIN_FIELDS
         if req.method == 'POST':
-            if page == 'defaults':
+            if page == 'logdefaults':
                 for field in admin_fields.keys():
                     self._set_field_value(req, field)
                 self.env.config.save()
-        for field, default in admin_fields.items():
-            self._get_field_value(req, field, default)
+        fields = get_admin_values(self.env.config, 'logviewer')
+        for key, value in fields.items():
+            req.hdf['logadmin.' + key] = value
         req.hdf['logadmin.docs'] = wiki_to_html(self._get_docs(page),
                                                 self.env, req)
@@ -75 +69 @@
     def _get_docs(self, page):
         """Return the wikitext documentation for the page options. """
-        if page == 'defaults':
+        doc = ''
+        if page == 'logdefaults':
             doc = """
  '''Path to the logs directory'''::
@@ -115 +110 @@
         pass
 
-    def _get_field_value(self, req, field_name, default=None):
-        """Get the field from trac.ini and set the hdf appropriately. """
-        field = self.env.config.get('logviewer', field_name) or default
-        req.hdf['logadmin.' + field_name] = field
-        pass
-
     # INavigationContributor
     def get_templates_dirs(self):

trac_plugins/logviewer/0.10/logviewer/htdocs/css/logs.css

@@ -26 +26 @@
     font-weight: bold;
 }
+
+.log {
+    margin-left: 10%;
+    margin-right: 10;
+}
+
+.logtable {
+}
+
+.logtable th {
+    font-size: 150%;
+}
+
+.log_line {
+}
+
+.log_timestamp {
+    padding-right: 5px;
+}
+
+.log_message {
+    padding-left: 5px;
+}
+
+.log_sys_message {
+    padding-left: 5px;
+    color: gray;
+}

trac_plugins/logviewer/0.10/logviewer/templates/log_admin.cs

@@ -1 @@
-<h2>Log Admin<?cs if logadmin.page == 'defaults' ?> -- Defaults<?cs /if ?></h2>
+<h2>Log Admin<?cs if logadmin.page == 'logdefaults' ?> -- Defaults<?cs /if ?></h2>
 
-<?cs if logadmin.page == 'defaults' ?>
+<?cs if logadmin.page == 'logdefaults' ?>
     <form class="mod" id="modbasic" method="post">
         <fieldset>
@@ -10 +10 @@
                     <input type="text" name="log_name_fmt" 
                     value="<?cs var:logadmin.log_name_fmt ?>" />
+                </label>
+            </div>
+            <div class="field">
+                <label>Log Date Format:<br />
+                    <input type="text" name="log_date_fmt" 
+                    value="<?cs var:logadmin.log_date_fmt ?>" />
                 </label>
             </div>
@@ -22 +28 @@
                     <input type="text" name="timestamp_sep" 
                     value="<?cs var:logadmin.timestamp_sep ?>" />
+                </label>
+            </div>
+            <div class="field">
+                <label>System Message Indicator:<br/>
+                    <input type="text" name="sys_indicator" 
+                    value="<?cs var:logadmin.sys_indicator ?>" />
                 </label>
             </div>

trac_plugins/logviewer/0.10/logviewer/templates/logs.cs

@@ -36 +36 @@
                 <tr class="log_line">
                     <td class="log_timestamp"><?cs var:lentry.timestamp ?></td>
-                    <td class="log_message"><?cs var:lentry.message ?></td>
+                    <td class="<?cs alt:lentry.class ?>log_message<?cs /alt ?>"
+                        ><?cs var:lentry.message ?></td>
                 </tr>
                 <?cs /each ?>

trac_plugins/logviewer/0.10/logviewer/web_ui.py

@@ -95 +95 @@
               now.day
         baseday = datetime.datetime(year, month, day)
+        fields = get_admin_values(self.env.config, 'logviewer')
         log_name_fmt = self.env.config.get('logviewer', 'log_name_fmt') \
                               or '%Y%m%d.log'
+        log_date_fmt = self.env.config.get('logviewer', 'log_date_fmt') \
+                              or '%A, %B %d, %Y'
         log_dir = self.env.config.get('logviewer', 'log_dir') or '.'
         timestamp_sep = self.env.config.get('logviewer', 'timestamp_sep') or '|'
         logname = os.path.join(log_dir, baseday.strftime(log_name_fmt))
         log = file(logname, 'r')
+        sys_indicator = self.env.config.get('logviewer', 'sys_indicator') or ''
         log_data = []
         for line in log.readlines():
             ls = line.split(timestamp_sep)
             if len(ls) > 1:
-                timestamp = ls[0].strip()
+                timestamp = ls[0].strip().split(' ')[1].strip()
                 msg = '|'.join(ls[1:]).strip()
             else:
                 timestamp = ''
                 msg = ls[0].strip()
-            log_data.append({'timestamp' : timestamp, 'message' : msg})
+            if sys_indicator and (msg.find(sys_indicator) == 0):
+                _class = 'log_sys_message'
+            else:
+                _class = 'log_message'
+            log_line = {
+                        'timestamp' : timestamp, 
+                        'message' : msg,
+                        'class' : _class,
+                       }
+            log_data.append(log_line)
             continue
         req.hdf['logviewer.entries'] = log_data
-        req.hdf['logviewer.logname'] = logname
+        req.hdf['logviewer.logname'] = "Log for %s for %s (%s) " % \
+                                       (logtype, logdate, os.basename(logname))