[Spambayes-checkins] spambayes/spambayes ServerUI.py, NONE, 1.1 Options.py, 1.70, 1.71 Version.py, 1.17, 1.18

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1:/tmp/cvs-serv1864/spambayes

Modified Files:
	Options.py Version.py 
Added Files:
	ServerUI.py 
Log Message:
Opps.  I should have done this before.  Add a missing file that's necessary to try out the
sb_pop3dnd.py script, and the version and options necessary.  Also update to reflect
the pop3proxy.py renaming.

--- NEW FILE: ServerUI.py ---
"""IMAP Server Web Interface

Classes:
    ServerInterface - Interface class for imapserver

Abstract:

This module implements a browser based Spambayes user interface for the
IMAP server.  Users may use it to interface with the server.

The following functions are currently included:
[From the base class UserInterface]
  onClassify - classify a given message
  onWordquery - query a word from the database
  onTrain - train a message or mbox
  onSave - save the database and possibly shutdown
[Here]
  onHome - a home page with various options

To do:
 o Suggestions?
"""

# This module is part of the spambayes project, which is Copyright 2002-3
# The Python Software Foundation and is covered by the Python Software
# Foundation license.

__author__ = "Tony Meyer <ta-meyer at ihug.co.nz>"
__credits__ = "All the Spambayes folk."

try:
    True, False
except NameError:
    # Maintain compatibility with Python 2.2
    True, False = 1, 0

from spambayes import UserInterface
from spambayes.Options import options

# These are the options that will be offered on the configuration page.
# If the option is None, then the entry is a header and the following
# options will appear in a new box on the configuration page.
# These are also used to generate http request parameters and template
# fields/variables.
parm_ini_map = (
    ('POP3 Proxy Options',  None),
    ('pop3proxy',           'remote_servers'),
    ('pop3proxy',           'listen_ports'),
    ('IMAP Server Options', None),
    ('imapserver',          'username'),
    ('imapserver',          'password'),
    ('imapserver',          'port'),
    ('Storage Options',  None),
    ('Storage',             'persistent_storage_file'),
    ('Storage',             'messageinfo_storage_file'),
    ('Statistics Options',  None),
    ('Categorization',      'ham_cutoff'),
    ('Categorization',      'spam_cutoff'),
    ('Classifier',          'experimental_ham_spam_imbalance_adjustment'),
)


class ServerUserInterface(UserInterface.UserInterface):
    """Serves the HTML user interface for the server."""

    def __init__(self, state, state_recreator):
        UserInterface.UserInterface.__init__(self, state.bayes,
                                             parm_ini_map)
        self.state = state
        self.state_recreator = state_recreator

    def onHome(self):
        """Serve up the homepage."""
        stateDict = self.state.__dict__.copy()
        stateDict.update(self.state.bayes.__dict__)
        statusTable = self.html.statusTable.clone()
        if not self.state.servers:
            statusTable.proxyDetails = "No POP3 proxies running."
        content = (self._buildBox('Status and Configuration',
                                  'status.gif', statusTable % stateDict)+
                   self._buildTrainBox() +
                   self._buildClassifyBox() +
                   self._buildBox('Word query', 'query.gif',
                                  self.html.wordQuery)
                   )
        self._writePreamble("Home")
        self.write(content)
        self._writePostamble()

    def reReadOptions(self):
        """Called by the config page when the user saves some new options,
        or restores the defaults."""
        # Reload the options.
        self.state.bayes.store()
        import Options
        reload(Options)
        global options
        from Options import options

        # Recreate the state.
        self.state = self.state_recreator()

    def verifyInput(self, parms):
        '''Check that the given input is valid.'''
        # Most of the work here is done by the parent class, but
        # we have a few extra checks
        errmsg = UserInterface.UserInterface.verifyInput(self, parms)
        
        # check for equal number of pop3servers and ports
        slist = list(parms['pop3proxy_remote_servers'])
        plist = list(parms['pop3proxy_listen_ports'])
        if len(slist) != len(plist):
            errmsg += '<li>The number of POP3 proxy ports specified ' + \
                      'must match the number of servers specified</li>\n'

        # check for duplicate ports
        plist.sort()
        for p in range(len(plist)-1):
            try:
                if plist[p] == plist[p+1]:
                    errmsg += '<li>All POP3 port numbers must be unique</li>'
                    break
            except IndexError:
                pass

        return errmsg

Index: Options.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Options.py,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** Options.py	5 Sep 2003 01:15:28 -0000	1.70
--- Options.py	6 Sep 2003 04:03:35 -0000	1.71
***************
*** 892,895 ****
--- 892,921 ----
    ),
  
+   "imapserver" : (
+     ("username", "Username", "",
+      """The username to use when logging into the SpamBayes IMAP server.""",
+      IMAP_ASTRING, DO_NOT_RESTORE),
+ 
+     ("password", "Password", "",
+      """The password to use when logging into the SpamBayes IMAP server.""",
+      IMAP_ASTRING, DO_NOT_RESTORE),
+ 
+     ("port", "IMAP Listen Port", 143,
+      """The port to serve the SpamBayes IMAP server on.""",
+      PORT, RESTORE),
+ 
+     ("spam_directory", "Spam directory", "imapserver-spam",
+      """The directory to store spam messages in.""",
+      PATH, DO_NOT_RESTORE),
+     
+     ("ham_directory", "Ham directory", "imapserver-ham",
+      """The directory to store ham messages in.""",
+      PATH, DO_NOT_RESTORE),
+     
+     ("unsure_directory", "Unsure directory", "imapserver-unsure",
+      """The directory to store unsure messages in.""",
+      PATH, DO_NOT_RESTORE),
+   ),
+  
    "globals" : (
      ("verbose", "Verbose", False,

Index: Version.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Version.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Version.py	2 Sep 2003 01:31:04 -0000	1.17
--- Version.py	6 Sep 2003 04:03:35 -0000	1.18
***************
*** 73,76 ****
--- 73,85 ----
  using %(InterfaceDescription)s, version %(InterfaceVersion)s""",
          },
+         "IMAP Server" : {
+             "Version":          0.01,
+             "Description":      "SpamBayes IMAP Server Alpha1",
+             "Date":             "September 2003",
+             "InterfaceVersion":             0.02,
+             "InterfaceDescription":        "SpamBayes IMAP Filter Web Interface Alpha2",
+             "Full Description": """%(Description)s, version %(Version)s (%(Date)s),
+ using %(InterfaceDescription)s, version %(InterfaceVersion)s""",
+         },
      },
  }