Changeset 7bd1035

Timestamp:

Dec 19, 2011, 12:03:56 AM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

738d179

Parents:

0ede474

git-author:

Jessica B. Hamrick <jhamrick@…> (12/19/11 00:03:56)

git-committer:

Jessica B. Hamrick <jhamrick@…> (12/19/11 00:03:56)

Message:

Move actual server code out of server/requests.py and into server/server.py

Location:

server/lib/gutenbach

Files:

• ipp/request.py (modified) (1 diff)
• server/__init__.py (modified) (1 diff)
• server/requests.py (modified) (7 diffs)
• server/server.py (added)

server/lib/gutenbach/ipp/request.py

@@ -238 +238 @@
 
     def __repr__(self):
-        val = '<IPPRequest (version=%r, ' % self.version
+        val = '<IPPRequest (version=%r, ' % [self.version]
         val += 'operation_id=%x, ' % self.operation_id
         val += 'request_id=%r, ' % self.request_id

server/lib/gutenbach/server/__init__.py

@@ -1 @@
-from requests import GutenbachIPPServer
+from server import GutenbachIPPServer
 import BaseHTTPServer
 import logging
 
 # configure logging
-logging.basicConfig(level=logging.DEBUG)
+logging.basicConfig(level=logging.INFO)
 
 def start():

server/lib/gutenbach/server/requests.py

@@ -1 @@
-import BaseHTTPServer
 import gutenbach.ipp as ipp
 import gutenbach.ipp.constants as const
@@ -42 +41 @@
         # call the handler
         handler = getattr(self, handler_name)
-        logger.debug("Sending request to handler '%s'" % handler_name)
+        logger.info("Handling request of type '%s'" % handler_name)
         handler(request, response)
 
@@ -105 +104 @@
         for job in self.printers[printer_name].get_jobs():
             self._get_job_attributes(job, request, response)
-        response.operation_id = const.StatusCodes.OK
 
     def print_uri(self, request, response):
@@ -125 +123 @@
         printer_name = self._get_printer_name(request)
         self._get_printer_attributes(self.printers[printer_name], request, response)
-        response.operation_id = const.StatusCodes.OK
 
     def set_printer_attributes(self, request, response):
@@ -209 +206 @@
             
         self._get_printer_attributes(self.printers[self.default], request, response)
-        response.operation_id = const.StatusCodes.OK
 
     @handler_for(const.Operations.CUPS_GET_PRINTERS)
@@ -282 +278 @@
         for printer in self.printers:
             self._get_printer_attributes(self.printers[printer], request, response)
-        response.operation_id = const.StatusCodes.OK
 
     @handler_for(const.Operations.CUPS_GET_CLASSES)
@@ -354 +349 @@
         
         # We have no printer classes, so we don't need to do anything
-        response.operation_id = const.StatusCodes.OK
-
-class GutenbachIPPServer(BaseHTTPServer.BaseHTTPRequestHandler):
-    def setup(self):
-        self.root = GutenbachRequestHandler()
-        BaseHTTPServer.BaseHTTPRequestHandler.setup(self)
-
-    def handle_one_request(self):
-        self.raw_requestline = self.rfile.readline()
-        if not self.raw_requestline:
-            self.close_connection = 1
-            return
-        if not self.parse_request(): # An error code has been sent, just exit
-            return
-        self.handle_ipp()
-
-    def handle_ipp(self):
-        # Receive a request
-        length = int(self.headers.getheader('content-length', 0))
-        request = ipp.Request(request=self.rfile, length=length)
-        logger.debug("Received request: %s" % repr(request))
-
-        # Operation attributes -- typically the same for any request
-        attributes = [
-            ipp.Attribute(
-                'attributes-charset',
-                [ipp.Value(ipp.Tags.CHARSET, 'utf-8')]),
-            ipp.Attribute(
-                'attributes-natural-language',
-                [ipp.Value(ipp.Tags.NATURAL_LANGUAGE, 'en-us')])
-            ]
-        # Put the operation attributes in a group
-        attribute_group = ipp.AttributeGroup(
-            const.AttributeTags.OPERATION,
-            attributes)
-
-        # Set up the default response -- handlers will override these
-        # values if they need to
-        response_kwargs = {}
-        response_kwargs['version']          = request.version
-        response_kwargs['operation_id']     = const.StatusCodes.INTERNAL_ERROR
-        response_kwargs['request_id']       = request.request_id
-        response_kwargs['attribute_groups'] = [attribute_group]
-        response = ipp.Request(**response_kwargs)
-
-        # Get the handler and pass it the request and response objects
-        self.root.handle(request, response)
-        logger.debug("Sending response: %s" % repr(response))
-
-        # Send the response across HTTP
-        self.send_response(200, "Gutenbach IPP Response")
-        self.send_header("Content-Type", "application/ipp")
-        self.send_header("Connection", "close")
-        self.end_headers()
-        self.wfile.write(response.packed_value)
+        pass