Changeset 485 for pkpgcounter/trunk

Timestamp:

11/17/07 14:43:40 (16 years ago)

Author:

jerome

Message:

Almost ok for release.

Location:

pkpgcounter/trunk

Files:

• bin/pkpgcounter (modified) (1 diff)
• NEWS (modified) (1 diff)
• pkpgpdls/analyzer.py (modified) (2 diffs)
• pkpgpdls/lidil.py (modified) (2 diffs)
• pkpgpdls/version.py (modified) (1 diff)
• README (modified) (1 diff)

pkpgcounter/trunk/bin/pkpgcounter

@@ -53 +53 @@
     * ESC/PageS03
     * Brother HBP
+    * Hewlett-Packard LIDIL (hpijs)
 
-The seven latter ones, as well as some TIFF documents, are currently 
+The eight latter ones, as well as some TIFF documents, are currently 
 only supported in page counting mode. 
 

pkpgcounter/trunk/NEWS

@@ -21 +21 @@
 pkpgcounter News :
 
+  * 3.30 :
+  
+    - Added a minimal parser for Hewlett-Packard LIDIL documents, as 
+      produced by the hpijs driver.
+      
   * 3.20 :
    

pkpgcounter/trunk/pkpgpdls/analyzer.py

@@ -29 +29 @@
 
 import version, pdlparser, postscript, pdf, pcl345, pclxl, hbp, \
-       escp2, dvi, tiff, ooo, zjstream, qpdl, spl1, escpages03, plain
+       lidil, escp2, dvi, tiff, ooo, zjstream, qpdl, spl1, escpages03, plain
 import inkcoverage
 
@@ -166 +166 @@
                            ooo, \
                            hbp, \
+                           lidil, \
                            pcl345, \
                            escp2, \

pkpgcounter/trunk/pkpgpdls/lidil.py

@@ -36 +36 @@
 import pdlparser
 
+# Packet types taken from hplip-2.7.10/prnt/ldl.py
+PACKET_TYPE_COMMAND = 0
+PACKET_TYPE_DISABLE_PACING = 1
+PACKET_TYPE_ENABLE_PACING = 2
+PACKET_TYPE_RESUME_NORMAL_OPERATION = 3
+PACKET_TYPE_DISABLE_RESPONSES = 4
+PACKET_TYPE_ENABLE_RESPONSES = 5
+PACKET_TYPE_RESET_LIDIL = 6
+PACKET_TYPE_SYNC = 7
+PACKET_TYPE_SYNC_COMPLETE = 8
+
+# Command codes we are interested in.
+LDL_LOAD_PAGE = 1
+LDL_EJECT_PAGE = 2
+
 class Parser(pdlparser.PDLParser) :
     """A parser for HP LIDIL documents."""
@@ -57 +72 @@
     def getJobSize(self) :
         """Computes the number of pages in a HP LIDIL document."""
-        ejectpagemarker = "$\x00\x01\x00\x00\x02" # ensure it's a complete packet (ends with '$')
-        return 0
+        pagecount = 0
+        infileno = self.infile.fileno()
+        minfile = mmap.mmap(infileno, os.fstat(infileno)[6], prot=mmap.PROT_READ, flags=mmap.MAP_SHARED)
+        pos = 0
+        try :
+            try :
+                while 1 :
+                    if minfile[pos] != "$" :    # Frame Sync
+                        raise pdlparser.PDLParserError, "This file doesn't seem to be valid Hewlett-Packard LIDIL datas"
+                    try :    
+                        (framesync,     
+                         cmdlength,
+                         dummy,
+                         packettype,
+                         commandnumber,
+                         referencenumber,
+                         datalength) = unpack(">BHBBBHH", minfile[pos:pos+10])
+                    except struct.error :    
+                        raise pdlparser.PDLParserError, "This file doesn't seem to be valid Hewlett-Packard LIDIL datas"
+                    if (packettype == PACKET_TYPE_COMMAND) \
+                        and (commandnumber == LDL_EJECT_PAGE) :
+                        pagecount += 1
+                    pos += (cmdlength + datalength)
+            except IndexError : # EOF ?
+                pass 
+        finally :        
+            minfile.close()
+        return pagecount
 
 if __name__ == "__main__" :    

pkpgcounter/trunk/pkpgpdls/version.py

@@ -22 +22 @@
 
 
-__version__ = "3.20"
+__version__ = "3.30"
 
 __doc__ = """pkpgcounter : a generic Page Description Languages parser."""

pkpgcounter/trunk/README

@@ -53 +53 @@
         - Brother HBP
         
-The seven latter ones, as well as some TIFF documents, are currently 
+        - Hewlett-Packard Lightweight Imaging Device Interface Language
+        
+The eight latter ones, as well as some TIFF documents, are currently 
 only supported in page counting mode.