Changeset 493 for pkpgcounter/trunk

Timestamp:

11/21/07 16:41:06 (17 years ago)

Author:

jerome

Message:

Re-optimize disk access by not reopening and re-reading first and last block
more than once.

Location:

pkpgcounter/trunk/pkpgpdls

Files:

• analyzer.py (modified) (2 diffs)
• pdlparser.py (modified) (3 diffs)
• plain.py (modified) (1 diff)
• spl1.py (modified) (2 diffs)

pkpgcounter/trunk/pkpgpdls/analyzer.py

@@ -136 +136 @@
         if not os.stat(self.filename).st_size :
             raise pdlparser.PDLParserError, "input file %s is empty !" % str(self.filename)
+        
+        # Now read first and last block of the input file
+        # to be able to detect the real file format and the parser to use.
+        firstblock = self.workfile.read(pdlparser.FIRSTBLOCKSIZE)
+        try :
+            self.workfile.seek(-pdlparser.LASTBLOCKSIZE, 2)
+            lastblock = self.workfile.read(pdlparser.LASTBLOCKSIZE)
+        except IOError :    
+            lastblock = ""
+            
         # IMPORTANT : the order is important below. FIXME.
         for module in (postscript, \
@@ -153 +163 @@
                        plain) :     # IMPORTANT : don't move this one up !
             try :               
-                return module.Parser(self.filename, self.options.debug)
+                return module.Parser(self.filename, firstblock,
+                                                    lastblock,
+                                                    self.options.debug)
             except pdlparser.PDLParserError :
                 pass # try next parser

pkpgcounter/trunk/pkpgpdls/pdlparser.py

@@ -43 +43 @@
     totiffcommands = None        # Default command to convert to TIFF
     openmode = "rb"              # Default file opening mode
-    def __init__(self, filename, debug=0) :
+    def __init__(self, filename, firstblock, lastblock, debug=0) :
         """Initialize the generic parser."""
         self.filename = filename
         self.debug = debug
         self.infile = None
-        (self.firstblock, self.lastblock) = self.readBlocks()
-        self.infile = open(self.filename, self.openmode)
+        (self.firstblock, self.lastblock) = (firstblock, lastblock)
         if not self.isValid() :
             raise PDLParserError, "Invalid file format !"
@@ -61 +60 @@
             # parsing will greatly benefit from this.
             psyco.bind(self.getJobSize)
+        self.infile = open(self.filename, self.openmode)
+        # self.logdebug("Opened %s in '%s' mode." % (self.filename, self.openmode))
             
     def __del__(self) :
@@ -66 +67 @@
         if self.infile :
             self.infile.close()
-            
-    def readBlocks(self) :        
-        """Reads first and last block of the input file."""
-        infile = open(self.filename, "rb")
-        try :
-            firstblock = infile.read(FIRSTBLOCKSIZE)
-            try :
-                infile.seek(-LASTBLOCKSIZE, 2)
-                lastblock = infile.read(LASTBLOCKSIZE)
-            except IOError :    
-                lastblock = ""
-        finally :        
-            infile.close()
-        return (firstblock, lastblock)    
             
     def logdebug(self, message) :       

pkpgcounter/trunk/pkpgpdls/plain.py

@@ -38 +38 @@
            read the first line, and if it doesn't end in CR or LF
            we consider it's not plain text.
+           
+           TODO : use first and last block's content instead of readline().
         """   
         line = self.infile.readline()

pkpgcounter/trunk/pkpgpdls/spl1.py

@@ -100 +100 @@
         self.escapedStuff = {}   # For escaped datas, mostly PJL commands
         self.bigEndian()
-        
+        codesop = chr(0x06) + chr(0x00) + chr(0x00) + chr(0x80) + chr(0x13) + chr(0x40)
         self.isbitmap = False
         pos = 0
@@ -114 +114 @@
                         offset = unpack(self.unpackLong, minfile[pos:pos+4])[0]
                         sequencenum = unpack(self.unpackShort, minfile[pos+4:pos+6])[0]
-                        codesop = " ".join([ "%02x" % ord(v) for v in minfile[pos+6:pos+12]])
-                        if codesop != "06 00 00 80 13 40" :
+                        if minfile[pos+6:pos+12] != codesop :
                             raise pdlparser.PDLParserError, "Unfortunately SPL1 is incompletely recognized. Parsing aborted. Please report the problem to %s" % version.__authoremail__
                         if not sequencenum :