Changeset 555 for pkpgcounter/trunk/pkpgpdls

Timestamp:

12/09/07 15:26:15 (17 years ago)

Author:

jerome

Message:

Each parser now has a 'format' attribute containing its short name.

Location:

pkpgcounter/trunk/pkpgpdls

Files:

• bj.py (modified) (1 diff)
• cfax.py (modified) (1 diff)
• dvi.py (modified) (2 diffs)
• escp2.py (modified) (2 diffs)
• escpages03.py (modified) (1 diff)
• hbp.py (modified) (1 diff)
• lidil.py (modified) (2 diffs)
• mscrap.py (modified) (2 diffs)
• ooo.py (modified) (2 diffs)
• pcl345.py (modified) (2 diffs)
• pclxl.py (modified) (2 diffs)
• pdf.py (modified) (2 diffs)
• pdlparser.py (modified) (2 diffs)
• pil.py (modified) (1 diff)
• plain.py (modified) (2 diffs)
• pnmascii.py (modified) (1 diff)
• postscript.py (modified) (2 diffs)
• qpdl.py (modified) (2 diffs)
• spl1.py (modified) (2 diffs)
• tiff.py (modified) (2 diffs)
• zjstream.py (modified) (1 diff)

pkpgcounter/trunk/pkpgpdls/bj.py

@@ -30 +30 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for Canon BJ documents."""
+    format = "Canon BJ/BJC"
     def isValid(self) :        
         """Returns True if data is BJ/BJC, else False."""
         if self.firstblock.startswith("\033[K\002\000") :
-            self.logdebug("DEBUG: Input file is in the Canon BJ format.")
             return True
         else :    

pkpgcounter/trunk/pkpgpdls/cfax.py

@@ -29 +29 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for Structured Fax documents."""
+    format = "Structured Fax"
     def isValid(self) :        
         """Returns True if data is Structured Fax, else False."""
         if self.firstblock.startswith("Sfff") :
-            self.logdebug("DEBUG: Input file is in the Structured Fax format.")
             return True
         else :    

pkpgcounter/trunk/pkpgpdls/dvi.py

@@ -34 +34 @@
     totiffcommands = [ 'dvips -q -o - "%(infname)s" | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r"%(dpi)i" -sOutputFile="%(outfname)s" -' ]
     required = [ "dvips", "gs" ]
+    format = "DVI"
     def isValid(self) :        
         """Returns True if data is DVI, else False."""
@@ -39 +40 @@
             if (ord(self.firstblock[0]) == 0xf7) \
                 and (ord(self.lastblock[-1]) == 0xdf) :
-                self.logdebug("DEBUG: Input file is in the DVI format.")
                 return True
             else :    

pkpgcounter/trunk/pkpgpdls/escp2.py

@@ -29 +29 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for ESC/P2 documents."""
+    format = "ESC/P2"
     def isValid(self) :        
         """Returns True if data is ESC/P2, else False."""
@@ -35 +36 @@
            self.firstblock.startswith("\n\033@") or \
            self.firstblock.startswith("\0\0\0\033\1@EJL") : # ESC/P Raster ??? Seen on Stylus Photo 1284
-            self.logdebug("DEBUG: Input file is in the ESC/P2 format.")
             return True
         else :    

pkpgcounter/trunk/pkpgpdls/escpages03.py

@@ -33 +33 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for ESC/PageS03 documents."""
+    format = "ESC/PageS03"
     def isValid(self) :        
         """Returns True if data is TIFF, else False."""
         if self.firstblock.startswith("\033\1@EJL") and \
             (self.firstblock.find("=ESC/PAGES03\n") != -1) :
-            self.logdebug("DEBUG: Input file is in the ESC/PageS03 format.")
             return True
         else :    

pkpgcounter/trunk/pkpgpdls/hbp.py

@@ -32 +32 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for HBP documents."""
+    format = "Brother HBP"
     def isValid(self) :        
         """Returns True if data is HBP, else False."""
         if self.firstblock.find("@PJL ENTER LANGUAGE = HBP\n") != -1 :
-            self.logdebug("DEBUG: Input file is in the HBP format.")
             return True
         else :    

pkpgcounter/trunk/pkpgpdls/lidil.py

@@ -52 +52 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for HP LIDIL documents."""
+    format = "Hewlett-Packard LIDIL"
     def isValid(self) :    
         """Returns True if data is LIDIL, else False."""
@@ -64 +65 @@
         if self.firstblock.startswith(BOFMarker) \
            and self.lastblock.endswith(EOFMarker) :
-            self.logdebug("DEBUG: Input file is in the Hewlett-Packard LIDIL format.")
             return True
         else :    

pkpgcounter/trunk/pkpgpdls/mscrap.py

@@ -33 +33 @@
     totiffcommands = [ 'xvfb-run -a abiword --import-extension=.doc --print="| gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r\"%(dpi)i\" -sOutputFile=\"%(outfname)s\" -" "%(infname)s"' ]
     required = [ "xvfb-run", "xauth", "abiword", "gs" ]
+    format = "Microsoft shitty"
     def isValid(self) :    
         """Returns True if data is MS crap, else False.
@@ -46 +47 @@
            or self.firstblock.startswith("\x31\xbe\x00\x00") \
            or self.firstblock[2112:].startswith("MSWordDoc") :
-            self.logdebug("DEBUG: Input file seems to be in a Microsoft shitty file format.")
             # Here we do the missing test because all commands will be needed even in page counting mode
             if self.isMissing(self.required) :

pkpgcounter/trunk/pkpgpdls/ooo.py

@@ -32 +32 @@
     totiffcommands = [ 'xvfb-run -a abiword --import-extension=.odt --print="| gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r\"%(dpi)i\" -sOutputFile=\"%(outfname)s\" -" "%(infname)s"' ]
     required = [ "xvfb-run", "xauth", "abiword", "gs" ]
+    format = "ISO/IEC DIS 26300"
     def isValid(self) :        
         """Returns True if data is OpenDocument, else False."""
@@ -42 +43 @@
                 return False
             else :
-                self.logdebug("DEBUG: Input file is in the OpenDocument (ISO/IEC DIS 26300) format.")
                 return True
         else :    

pkpgcounter/trunk/pkpgpdls/pcl345.py

@@ -43 +43 @@
                      ]
     required = [ "pcl6", "gs" ]
+    format = "PCL3/4/5"
     mediasizes = {  # ESC&l####A
                     0 : "Default",
@@ -110 +111 @@
                (firstblock.find("@PJL ENTER LANGUAGE=PCL\012\015\033") != -1) or \
                (firstblock.startswith(chr(0xcd)+chr(0xca)) and (firstblock.find("\033E\033") != -1)) :
-                self.logdebug("DEBUG: Input file is in the PCL3/4/5 format.")
                 return True
             else :    

pkpgcounter/trunk/pkpgpdls/pclxl.py

@@ -37 +37 @@
                      ]
     required = [ "pcl6", "gs" ]
+    format = "PCLXL (aka PCL6)"
     mediasizes = { 
                     0 : "Letter",
@@ -89 +90 @@
               (self.firstblock.find("LANGUAGE = PCLXL") != -1)))) \
              or ((self.firstblock.startswith(chr(0xcd)+chr(0xca)) and (self.firstblock.find(" HP-PCL XL;") != -1))) :
-            self.logdebug("DEBUG: Input file is in the PCLXL (aka PCL6) format.")
             return True
         else :    

pkpgcounter/trunk/pkpgpdls/pdf.py

@@ -46 +46 @@
     required = [ "gs" ]
     openmode = "rU"
+    format = "PDF"
     def isValid(self) :    
         """Returns True if data is PDF, else False."""
@@ -52 +53 @@
            ((self.firstblock[:128].find("\033%-12345X") != -1) and (self.firstblock.upper().find("LANGUAGE=PDF") != -1)) or \
            (self.firstblock.find("%PDF-") != -1) :
-            self.logdebug("DEBUG: Input file is in the PDF format.")
             return True
         else :    

pkpgcounter/trunk/pkpgpdls/pdlparser.py

@@ -43 +43 @@
     required = []               # Default list of required commands
     openmode = "rb"             # Default file opening mode
+    format = "Unknown"          # Default file format
     def __init__(self, parent, filename, (firstblock, lastblock)) :
         """Initialize the generic parser."""
@@ -54 +55 @@
         if not self.isValid() :
             raise PDLParserError, "Invalid file format !"
+        else :    
+            self.logdebug("Input file is in the '%s' file format." % self.format)
         try :
             import psyco 

pkpgcounter/trunk/pkpgpdls/pil.py

@@ -44 +44 @@
             return False
         else :    
-            self.logdebug("DEBUG: Input file seems to be an image in the %s (%s) format." % (image.format, image.format_description))
+            self.format = "%s (%s)" % (image.format, image.format_description)
             return True
             

pkpgcounter/trunk/pkpgpdls/plain.py

@@ -33 +33 @@
     required = [ "a2ps | enscript", "gs" ]
     openmode = "rU"                 
+    format = "plain text"
     def isValid(self) :    
         """Returns True if data is plain text, else False.
@@ -46 +47 @@
                 lines = lines[0].split("\n")
         if len(lines) > 1 :
-            self.logdebug("DEBUG: Input file seems to be in the plain text format.")
             return True
         else :    

pkpgcounter/trunk/pkpgpdls/pnmascii.py

@@ -28 +28 @@
     """A parser for PNM (ascii) documents."""
     openmode = "rU"                 
+    format = "PNM (ascii)"
     def isValid(self) :    
         """Returns True if data is ASCII PNM, else False."""
         if self.firstblock.split()[0] in ("P1", "P2", "P3") :
-            self.logdebug("DEBUG: Input file seems to be in the PNM (ascii) format.")
             self.marker = self.firstblock[:2]
             return True

pkpgcounter/trunk/pkpgpdls/postscript.py

@@ -34 +34 @@
     required = [ "gs" ]
     openmode = "rU"
+    format = "PostScript"
     def isValid(self) :    
         """Returns True if data is PostScript, else False."""
@@ -44 +45 @@
               (self.firstblock.find("LANGUAGE = Postscript") != -1))) or \
               (self.firstblock.find("%!PS-Adobe") != -1) :
-            self.logdebug("DEBUG: Input file is in the PostScript format.")
             return True
         else :    

pkpgcounter/trunk/pkpgpdls/qpdl.py

@@ -33 +33 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for QPDL (aka SPL2) documents."""
+    format = "QPDL (aka SPL2)"
     mediasizes = { 
                     # The first values are identical to that of PCLXL
@@ -76 +77 @@
              ((self.firstblock.find("LANGUAGE=QPDL") != -1) or \
               (self.firstblock.find("LANGUAGE = QPDL") != -1))) :
-            self.logdebug("DEBUG: Input file is in the QPDL (aka SPL2) format.")
             return True
         else :    

pkpgcounter/trunk/pkpgpdls/spl1.py

@@ -34 +34 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for SPL1 documents."""
+    format = "SPL1 (aka GDI)"
     def isValid(self) :    
         """Returns True if data is SPL1, else False."""
@@ -40 +41 @@
              ((self.firstblock.find("LANGUAGE=SMART") != -1) or \
               (self.firstblock.find("LANGUAGE = SMART") != -1))) :
-            self.logdebug("DEBUG: Input file is in the SPL1 format.")
             return True
         else :    

pkpgcounter/trunk/pkpgpdls/tiff.py

@@ -34 +34 @@
     totiffcommands = [ 'cp "%(infname)s" "%(outfname)s"' ]
     required = [ "cp" ]
+    format = "TIFF"
     def isValid(self) :        
         """Returns True if data is TIFF, else False."""
@@ -39 +40 @@
         bigendian = (chr(0x4d)*2) + chr(0) + chr(0x2a)
         if self.firstblock[:4] in (littleendian, bigendian) :
-            self.logdebug("DEBUG: Input file is in the TIFF format.")
             return True
         else :    

pkpgcounter/trunk/pkpgpdls/zjstream.py

@@ -32 +32 @@
         """Returns True if data is ZjStream, else False."""
         if self.firstblock[:4] == "ZJZJ" :
-            self.logdebug("DEBUG: Input file is in the Zenographics ZjStream (little endian) format.")
+            self.format = "Zenographics ZjStream (little endian)"
             return self.littleEndian()
         elif self.firstblock[:4] == "JZJZ" :    
-            self.logdebug("DEBUG: Input file is in the Zenographics ZjStream (big endian) format.")
+            self.format = "Zenographics ZjStream (big endian)"
             return self.bigEndian()
         else :