Changeset 546

Timestamp:

12/09/07 14:12:05 (17 years ago)

Author:

jerome

Message:

Added support for ASCII PNM files.

Location:

pkpgcounter/trunk/pkpgpdls

Files:

• analyzer.py (modified) (2 diffs)
• netpbm.py (copied) (copied from pkpgcounter/trunk/pkpgpdls/plain.py) (4 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, \
-       bj, qpdl, spl1, escpages03, plain
+       netpbm, bj, qpdl, spl1, escpages03, plain
 import inkcoverage
 
@@ -165 +165 @@
                        escpages03, \
                        bj, \
+                       netpbm, \
                        pil, \
                        mscrap, \

pkpgcounter/trunk/pkpgpdls/netpbm.py

@@ -21 +21 @@
 #
 
-"""This modules implements a page counter for plain text documents."""
+"""This modules implements a page counter for PNM (ascii) documents."""
 
 import pdlparser
@@ -27 +27 @@
 
 class Parser(pdlparser.PDLParser) :
-    """A parser for plain text documents."""
-    totiffcommands = [ 'enscript --quiet --portrait --no-header --columns 1 --output - "%(infname)s" | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r"%(dpi)i" -sOutputFile="%(outfname)s" -',
-                       'a2ps --borders 0 --quiet --portrait --no-header --columns 1 --output - "%(infname)s" | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r"%(dpi)i" -sOutputFile="%(outfname)s" -',
-                     ]  
+    """A parser for Netpbm documents."""
     required = [ "a2ps | enscript", "gs" ]
     openmode = "rU"                 
@@ -40 +37 @@
            If it's impossible to find one we consider it's not plain text.
         """   
-        lines = self.firstblock.split("\r\n")
-        if len(lines) == 1 :
-            lines = lines[0].split("\r")
-            if len(lines) == 1 :
-                lines = lines[0].split("\n")
-        if len(lines) > 1 :
-            self.logdebug("DEBUG: Input file seems to be in the plain text format.")
+        if (self.firstblock[:2] in ("P1", "P2", "P3")) :
+            self.logdebug("DEBUG: Input file seems to be in the PNM (ascii) format.")
+            self.marker = self.firstblock[:2]
             return True
         else :    
@@ -52 +45 @@
             
     def getJobSize(self) :
-        """Counts pages in a plain text document."""
-        pagesize = 66   # TODO : Does this vary wrt the default page size ?
-                        # TODO : /etc/papersize and /etc/paper.config
+        """Counts pages in a PNM (ascii) document."""
         pagecount = 0
-        linecount = 0
+        marker = self.marker
         for line in self.infile :
-            if line.endswith("\n") :
-                linecount += 1    
-                if (linecount > pagesize) :
-                    pagecount += 1
-                    linecount = 0
-                else :    
-                    cnt = line.count("\f")
-                    if cnt :
-                        pagecount += cnt
-                        linecount = 0
-            else :        
-                raise pdlparser.PDLParserError, "Unsupported file format. Please send the file to %s" % version.__authoremail__
-        return pagecount + 1    # NB : empty files are catched in isValid()
+            pagecount += line.split().count(marker)
+        return pagecount