Pulled out the web interface.

diff --git a/.be/bugs/8cb9045c-7266-4c40-9a76-65f3c5d5bb60/values b/.be/bugs/8cb9045c-7266-4c40-9a76-65f3c5d5bb60/values
new file mode 100644 (file)
index 0000000..44d7766
--- /dev/null
+++ b/.be/bugs/8cb9045c-7266-4c40-9a76-65f3c5d5bb60/values
@@ -0,0 +1,49 @@
+
+
+
+assigned=Steve Losh <steve@stevelosh.com>
+
+
+
+
+
+
+creator=Steve Losh <steve@stevelosh.com>
+
+
+
+
+
+
+severity=minor
+
+
+
+
+
+
+status=open
+
+
+
+
+
+
+summary=Refactor the web interface into its own file.
+
+
+
+
+
+
+target=alpha
+
+
+
+
+
+
+time=Sat, 07 Feb 2009 17:27:48 +0000
+
+
+

diff --git a/cfbe.py b/cfbe.py
index ea74b4e31aee4d73e118c21f7af2fb6db22b3bf1..56badfd282084a596d56aa0e1cfa26011987557b 100755 (executable)
--- a/cfbe.py
+++ b/cfbe.py
@@ -8,151 +8,18 @@ from datetime import datetime
 from optparse import OptionParser
 from os import path
 
-module_directory = path.dirname(path.abspath(cherryflavoredbugseverywhere.__file__))
+module_dir = path.dirname(path.abspath(cherryflavoredbugseverywhere.__file__))
 
 def datetimeformat(value, format='%B %d, %Y at %I:%M %p'):
     """Takes a timestamp and revormats it into a human-readable string."""
     return datetime.fromtimestamp(value).strftime(format)
 
 
-template_root = path.join(module_directory, 'templates')
+template_root = path.join(module_dir, 'templates')
 env = Environment(loader=FileSystemLoader(template_root))
 env.filters['datetimeformat'] = datetimeformat
 
-class WebInterface:
-    """The web interface to CFBE."""
-    
-    def __init__(self, bug_root):
-        """Initialize the bug repository for this web interface."""
-        self.bug_root = bug_root
-        self.bd = bugdir.BugDir(root=self.bug_root)
-        self.repository_name = self.bd.root.split('/')[-1]
-    
-    def get_common_information(self):
-        """Returns a dict of common information that most pages will need."""
-        possible_assignees = list(set([bug.assigned for bug in self.bd if unicode(bug.assigned) != 'None']))
-        possible_assignees.sort(key=unicode.lower)
-        
-        possible_targets = list(set([bug.target for bug in self.bd if unicode(bug.target) != 'None']))
-        possible_targets.sort(key=unicode.lower)
-        
-        possible_statuses = [u'open', u'assigned', u'test', u'unconfirmed', 
-                             u'closed', u'disabled', u'fixed', u'wontfix']
-        
-        possible_severities = [u'minor', u'serious', u'critical', u'fatal', 
-                               u'wishlist']
-        
-        return {'possible_assignees': possible_assignees,
-                'possible_targets': possible_targets,
-                'possible_statuses': possible_statuses,
-                'possible_severities': possible_severities,
-                'repository_name': self.repository_name,}
-    
-    def filter_bugs(self, status, assignee, target):
-        """Filter the list of bugs to return only those desired."""
-        bugs = [bug for bug in self.bd if bug.status in status]
-        
-        if assignee != '':
-            assignee = None if assignee == 'None' else assignee
-            bugs = [bug for bug in bugs if bug.assigned == assignee]
-        
-        if target != '':
-            target = None if target == 'None' else target
-            bugs = [bug for bug in bugs if bug.target == target]
-        
-        return bugs
-    
-    
-    @cherrypy.expose
-    def index(self, status='open', assignee='', target=''):
-        """The main bug page.
-        Bugs can be filtered by assignee or target.
-        The bug database will be reloaded on each visit."""
-        
-        self.bd.load_all_bugs()
-        
-        if status == 'open':
-            status = ['open', 'assigned', 'test', 'unconfirmed', 'wishlist']
-            label = 'All Open Bugs'
-        elif status == 'closed':
-            status = ['closed', 'disabled', 'fixed', 'wontfix']
-            label = 'All Closed Bugs'
-        
-        if assignee != '':
-            label += ' Currently Unassigned' if assignee == 'None' else ' Assigned to %s' % (assignee,)
-        if target != '':
-            label += ' Currently Unschdeuled' if target == 'None' else ' Scheduled for %s' % (target,)
-        
-        template = env.get_template('list.html')
-        bugs = self.filter_bugs(status, assignee, target)
-        
-        common_info = self.get_common_information()
-        return template.render(bugs=bugs, bd=self.bd, label=label, 
-                               assignees=common_info['possible_assignees'],
-                               targets=common_info['possible_targets'],
-                               statuses=common_info['possible_statuses'],
-                               severities=common_info['possible_severities'],
-                               repository_name=common_info['repository_name'])
-    
-    
-    @cherrypy.expose
-    def bug(self, id=''):
-        """The page for viewing a single bug."""
-        
-        self.bd.load_all_bugs()
-        
-        bug = self.bd.bug_from_shortname(id)
-        
-        template = env.get_template('bug.html')
-        common_info = self.get_common_information()
-        return template.render(bug=bug, bd=self.bd, 
-                               assignees=common_info['possible_assignees'],
-                               targets=common_info['possible_targets'],
-                               statuses=common_info['possible_statuses'],
-                               severities=common_info['possible_severities'],
-                               repository_name=common_info['repository_name'])
-    
-    
-    @cherrypy.expose
-    def create(self, summary):
-        """The view that handles the creation of a new bug."""
-        if summary.strip() != '':
-            self.bd.new_bug(summary=summary).save()
-        raise cherrypy.HTTPRedirect('/', status=302)
-    
-    
-    @cherrypy.expose
-    def comment(self, id, body):
-        """The view that handles adding a comment."""
-        bug = self.bd.bug_from_uuid(id)
-        shortname = self.bd.bug_shortname(bug)
-        
-        if body.strip() != '':
-            bug.comment_root.new_reply(body=body)
-            bug.save()
-        
-        raise cherrypy.HTTPRedirect('/bug?id=%s' % (shortname,), status=302)
-    
-    
-    @cherrypy.expose
-    def edit(self, id, status=None, target=None, assignee=None, severity=None, summary=None):
-        """The view that handles editing bug details."""
-        bug = self.bd.bug_from_uuid(id)
-        shortname = self.bd.bug_shortname(bug)
-        
-        if summary != None:
-            bug.summary = summary
-        else:
-            bug.status = status if status != 'None' else None
-            bug.target = target if target != 'None' else None
-            bug.assigned = assignee if assignee != 'None' else None
-            bug.severity = severity if severity != 'None' else None
-            
-        bug.save()
-        
-        raise cherrypy.HTTPRedirect('/bug?id=%s' % (shortname,), status=302)
-    
-
+WebInterface = cherryflavoredbugseverywhere.web.WebInterface(path.abspath(options['bug_root']))
 
 def build_parser():
     """Builds and returns the command line option parser."""
@@ -173,6 +40,6 @@ def parse_arguments():
     return { 'bug_root': args[0], }
 
 
-config = path.join(module_directory, 'cfbe.config')
+config = path.join(module_dir, 'cfbe.config')
 options = parse_arguments()
-cherrypy.quickstart(WebInterface(path.abspath(options['bug_root'])), '/', config)
+cherrypy.quickstart(WebInterface, '/', config)

diff --git a/web.py b/web.py
new file mode 100644 (file)
index 0000000..0a537fc
--- /dev/null
+++ b/web.py
@@ -0,0 +1,133 @@
+class WebInterface:
+    """The web interface to CFBE."""
+    
+    def __init__(self, bug_root):
+        """Initialize the bug repository for this web interface."""
+        self.bug_root = bug_root
+        self.bd = bugdir.BugDir(root=self.bug_root)
+        self.repository_name = self.bd.root.split('/')[-1]
+    
+    def get_common_information(self):
+        """Returns a dict of common information that most pages will need."""
+        possible_assignees = list(set([bug.assigned for bug in self.bd if unicode(bug.assigned) != 'None']))
+        possible_assignees.sort(key=unicode.lower)
+        
+        possible_targets = list(set([bug.target for bug in self.bd if unicode(bug.target) != 'None']))
+        possible_targets.sort(key=unicode.lower)
+        
+        possible_statuses = [u'open', u'assigned', u'test', u'unconfirmed', 
+                             u'closed', u'disabled', u'fixed', u'wontfix']
+        
+        possible_severities = [u'minor', u'serious', u'critical', u'fatal', 
+                               u'wishlist']
+        
+        return {'possible_assignees': possible_assignees,
+                'possible_targets': possible_targets,
+                'possible_statuses': possible_statuses,
+                'possible_severities': possible_severities,
+                'repository_name': self.repository_name,}
+    
+    def filter_bugs(self, status, assignee, target):
+        """Filter the list of bugs to return only those desired."""
+        bugs = [bug for bug in self.bd if bug.status in status]
+        
+        if assignee != '':
+            assignee = None if assignee == 'None' else assignee
+            bugs = [bug for bug in bugs if bug.assigned == assignee]
+        
+        if target != '':
+            target = None if target == 'None' else target
+            bugs = [bug for bug in bugs if bug.target == target]
+        
+        return bugs
+    
+    
+    @cherrypy.expose
+    def index(self, status='open', assignee='', target=''):
+        """The main bug page.
+        Bugs can be filtered by assignee or target.
+        The bug database will be reloaded on each visit."""
+        
+        self.bd.load_all_bugs()
+        
+        if status == 'open':
+            status = ['open', 'assigned', 'test', 'unconfirmed', 'wishlist']
+            label = 'All Open Bugs'
+        elif status == 'closed':
+            status = ['closed', 'disabled', 'fixed', 'wontfix']
+            label = 'All Closed Bugs'
+        
+        if assignee != '':
+            label += ' Currently Unassigned' if assignee == 'None' else ' Assigned to %s' % (assignee,)
+        if target != '':
+            label += ' Currently Unschdeuled' if target == 'None' else ' Scheduled for %s' % (target,)
+        
+        template = env.get_template('list.html')
+        bugs = self.filter_bugs(status, assignee, target)
+        
+        common_info = self.get_common_information()
+        return template.render(bugs=bugs, bd=self.bd, label=label, 
+                               assignees=common_info['possible_assignees'],
+                               targets=common_info['possible_targets'],
+                               statuses=common_info['possible_statuses'],
+                               severities=common_info['possible_severities'],
+                               repository_name=common_info['repository_name'])
+    
+    
+    @cherrypy.expose
+    def bug(self, id=''):
+        """The page for viewing a single bug."""
+        
+        self.bd.load_all_bugs()
+        
+        bug = self.bd.bug_from_shortname(id)
+        
+        template = env.get_template('bug.html')
+        common_info = self.get_common_information()
+        return template.render(bug=bug, bd=self.bd, 
+                               assignees=common_info['possible_assignees'],
+                               targets=common_info['possible_targets'],
+                               statuses=common_info['possible_statuses'],
+                               severities=common_info['possible_severities'],
+                               repository_name=common_info['repository_name'])
+    
+    
+    @cherrypy.expose
+    def create(self, summary):
+        """The view that handles the creation of a new bug."""
+        if summary.strip() != '':
+            self.bd.new_bug(summary=summary).save()
+        raise cherrypy.HTTPRedirect('/', status=302)
+    
+    
+    @cherrypy.expose
+    def comment(self, id, body):
+        """The view that handles adding a comment."""
+        bug = self.bd.bug_from_uuid(id)
+        shortname = self.bd.bug_shortname(bug)
+        
+        if body.strip() != '':
+            bug.comment_root.new_reply(body=body)
+            bug.save()
+        
+        raise cherrypy.HTTPRedirect('/bug?id=%s' % (shortname,), status=302)
+    
+    
+    @cherrypy.expose
+    def edit(self, id, status=None, target=None, assignee=None, severity=None, summary=None):
+        """The view that handles editing bug details."""
+        bug = self.bd.bug_from_uuid(id)
+        shortname = self.bd.bug_shortname(bug)
+        
+        if summary != None:
+            bug.summary = summary
+        else:
+            bug.status = status if status != 'None' else None
+            bug.target = target if target != 'None' else None
+            bug.assigned = assignee if assignee != 'None' else None
+            bug.severity = severity if severity != 'None' else None
+            
+        bug.save()
+        
+        raise cherrypy.HTTPRedirect('/bug?id=%s' % (shortname,), status=302)
+