Changeset 545 for pkpgcounter/trunk/pkpgpdls

Timestamp:

12/09/07 13:01:15 (17 years ago)

Author:

jerome

Message:

Added support for Canon BJ/BJC file format in page counting mode.

Location:

pkpgcounter/trunk/pkpgpdls

Files:

• analyzer.py (modified) (2 diffs)
• bj.py (copied) (copied from pkpgcounter/trunk/pkpgpdls/dvi.py) (3 diffs)

pkpgcounter/trunk/pkpgpdls/analyzer.py

@@ -30 +30 @@
 import version, pdlparser, postscript, pdf, pcl345, pclxl, hbp, \
        pil, mscrap, cfax, lidil, escp2, dvi, tiff, ooo, zjstream, \
-       qpdl, spl1, escpages03, plain
+       bj, qpdl, spl1, escpages03, plain
 import inkcoverage
 
@@ -164 +164 @@
                        escp2, \
                        escpages03, \
+                       bj, \
                        pil, \
                        mscrap, \

pkpgcounter/trunk/pkpgpdls/bj.py

@@ -21 +21 @@
 #
 
-"""This modules implements a page counter for DVI documents."""
+"""This modules implements a page counter for Canon BJ documents."""
 
 import sys
@@ -31 +31 @@
 
 class Parser(pdlparser.PDLParser) :
-    """A parser for DVI documents."""
-    totiffcommands = [ 'dvips -q -o - "%(infname)s" | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r"%(dpi)i" -sOutputFile="%(outfname)s" -' ]
-    required = [ "dvips", "gs" ]
+    """A parser for Canon BJ documents."""
     def isValid(self) :        
         """Returns True if data is DVI, else False."""
-        try :
-            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 :    
-                return False
-        except IndexError :          
+        if self.firstblock.startswith("\033[K\002\000") :
+            self.logdebug("DEBUG: Input file is in the Canon BJ format.")
+            return True
+        else :    
             return False
             
     def getJobSize(self) :
-        """Counts pages in a DVI document.
+        """Counts pages in a Canon BJ document.
         
            Algorithm by Jerome Alet.
@@ -53 +47 @@
            The documentation used for this was :
          
-           http://www.math.umd.edu/~asnowden/comp-cont/dvi.html
+           ghostscript-8.60/src/gdevbj*.c
         """
         infileno = self.infile.fileno()
         minfile = mmap.mmap(infileno, os.fstat(infileno)[6], prot=mmap.PROT_READ, flags=mmap.MAP_SHARED)
         pagecount = 0
-        pos = -1
-        eofchar = chr(0xdf)
-        postchar = chr(0xf8)
+        pos = 0
         try :
             try :
-                while minfile[pos] == eofchar :
-                    pos -= 1
-                idbyte = minfile[pos]    
-                if idbyte != minfile[1] :
-                    raise IndexError, "Invalid DVI file."
-                pos = unpack(">I", minfile[pos - 4:pos])[0]
-                if minfile[pos] != postchar :
-                    raise IndexError, "Invalid DVI file."
-                pagecount = unpack(">H", minfile[pos + 27: pos + 29])[0]
+                while True :
+                    if minfile[pos] == "\033" :
+                        # Look if we've found an initialization sequence
+                        # through the Set Initial Condition command
+                        pageheader = minfile[pos:pos+7]
+                        if pageheader in ("\033[K\002\000\000\017", 
+                                          "\033[K\002\000\000\044",
+                                          "\033[K\002\000\004\044") :
+                            pagecount += 1
+                            pos += 6
+                    pos += 1
             except IndexError : # EOF ?
                 pass