Fixed a minor filter bug, more bug reports.

Starting to plan out the alpha release mroe thoroughly.

1 files changed, 42 insertions, 39 deletions

diff --git a/cfbe.py b/cfbe.py
index 4509bf1..ee77999 100755
--- a/cfbe.py
+++ b/cfbe.py
@@ -4,10 +4,6 @@ import cherrypy
 from libbe import bugdir
 from jinja2 import Environment, FileSystemLoader
 
-bug_root = '/Users/sjl/Documents/cherryflavoredbugseverywhere/.be'
-bd = bugdir.BugDir(root=bug_root)
-bd.load_all_bugs()
-repository_name = bd.root.split('/')[-1]
 
 template_root = '/Users/sjl/Documents/cherryflavoredbugseverywhere/templates'
 env = Environment(loader=FileSystemLoader(template_root))
@@ -15,9 +11,39 @@ env = Environment(loader=FileSystemLoader(template_root))
 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, assignee, target):
+        possible_assignees = list(set([bug.assigned for bug in self.bd if bug.assigned != None]))
+        possible_assignees.sort(key=unicode.lower)
+        
+        possible_targets = list(set([bug.target for bug in self.bd if bug.target != None]))
+        possible_targets.sort(key=unicode.lower)
+        
+        return {'possible_assignees': possible_assignees,
+                'possible_targets': possible_targets,}
+    
+    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=''):
-        bd.load_all_bugs()
+        self.bd.load_all_bugs()
         
         if status == 'open':
             status = ['open', 'assigned', 'test', 'unconfirmed', 'wishlist']
@@ -25,45 +51,22 @@ class WebInterface:
         elif status == 'closed':
             status = ['closed', 'disabled', 'fixed', 'wontfix']
             label = 'All Closed Bugs'
-            
-        if assignee != '':
-            if assignee == 'None':
-                label += ' Currently Unassigned'
-            else:
-                label += ' Assigned to %s' % (assignee,)
         
+        if assignee != '':
+            label += ' Currently Unassigned' if assignee == 'None' else ' Assigned to %s' % (assignee,)
         if target != '':
-            if target == 'None':
-                label += ' Currently Unschdeuled'
-            else:
-                label += ' Scheduled for %s' % (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)
         
-        possible_assignees = list(set([bug.assigned for bug in bd if bug.assigned != None]))
-        possible_assignees.sort(key=unicode.lower)
-        
-        possible_targets = list(set([bug.target for bug in bd if bug.target != None]))
-        possible_targets.sort(key=unicode.lower)
-        
-        bugs = [bug for bug in bd if bug.status in status]
-        
-        if assignee != '':
-            if assignee == 'None':
-                assignee = None
-            bugs = [bug for bug in bugs if bug.assigned == assignee]
-        
-        if target != '':
-            if target == 'None':
-                target = None
-            bugs = [bug for bug in bugs if bug.target == target]
-        
-        return template.render(bugs=bugs, bd=bd, label=label, 
-                               assignees=possible_assignees,
-                               targets=possible_targets,
-                               repository_name=repository_name)
+        common_info = self.get_common_information(assignee, target)
+        return template.render(bugs=bugs, bd=self.bd, label=label, 
+                               assignees=common_info['possible_assignees'],
+                               targets=common_info['possible_targets'],
+                               repository_name=self.repository_name)
     
 
 config = '/Users/sjl/Documents/cherryflavoredbugseverywhere/cfbe.config'
-cherrypy.quickstart(WebInterface(), '/', config)
+bug_root = '/Users/sjl/Documents/cherryflavoredbugseverywhere/.be'
+cherrypy.quickstart(WebInterface(bug_root), '/', config)