Changeset 428

Timestamp:

10/17/06 09:41:55 (18 years ago)

Author:

jerome

Message:

Improved ink accounting by allowing several commands to be launch to convert to TIFF in case one of them fails.

Location:

pkpgcounter/trunk/pkpgpdls

Files:

• dvi.py (modified) (1 diff)
• oldpcl345.py (modified) (1 diff)
• pcl345.py (modified) (1 diff)
• pclxl.py (modified) (1 diff)
• pdf.py (modified) (1 diff)
• pdlparser.py (modified) (3 diffs)
• plain.py (modified) (1 diff)
• postscript.py (modified) (1 diff)
• tiff.py (modified) (1 diff)

pkpgcounter/trunk/pkpgpdls/dvi.py

@@ -33 +33 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for DVI documents."""
-    totiffcommand = 'cat >%(fname)s && dvips -q -o - %(fname)s | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -'
+    totiffcommands = [ 'cat >%(fname)s && dvips -q -o - %(fname)s | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -' ]
     def isValid(self) :        
         """Returns True if data is DVI, else False."""

pkpgcounter/trunk/pkpgpdls/oldpcl345.py

@@ -34 +34 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for PCL3, PCL4, PCL5 documents."""
-    totiffcommand = 'pcl6 -sDEVICE=pswrite -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -sOutputFile=- - | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -'
+    totiffcommands = [ 'pcl6 -sDEVICE=pdfwrite -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -sOutputFile=- - | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -', 
+                       'pcl6 -sDEVICE=pswrite -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -sOutputFile=- - | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -',
+                     ]
     mediasizes = {  # ESC&l####A
                     0 : "Default",

pkpgcounter/trunk/pkpgpdls/pcl345.py

@@ -39 +39 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for PCL3, PCL4, PCL5 documents."""
-    totiffcommand = 'pcl6 -sDEVICE=pswrite -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -sOutputFile=- - | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -'
+    totiffcommands = [ 'pcl6 -sDEVICE=pdfwrite -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -sOutputFile=- - | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -', 
+                       'pcl6 -sDEVICE=pswrite -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -sOutputFile=- - | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -',
+                     ]
     mediasizes = {  # ESC&l####A
                     0 : "Default",

pkpgcounter/trunk/pkpgpdls/pclxl.py

@@ -34 +34 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for PCLXL (aka PCL6) documents."""
-    totiffcommand = 'pcl6 -sDEVICE=pswrite -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -sOutputFile=- - | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -'
+    totiffcommands = [ 'pcl6 -sDEVICE=pdfwrite -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -sOutputFile=- - | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -', 
+                       'pcl6 -sDEVICE=pswrite -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -sOutputFile=- - | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -',
+                     ]
     mediasizes = { 
                     0 : "Letter",

pkpgcounter/trunk/pkpgpdls/pdf.py

@@ -43 +43 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for PDF documents."""
-    totiffcommand = 'gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -'
+    totiffcommands = [ 'gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -' ]
     def isValid(self) :    
         """Returns True if data is PDF, else False."""

pkpgcounter/trunk/pkpgpdls/pdlparser.py

@@ -23 +23 @@
 
 import sys
+import os
 import popen2
 
@@ -41 +42 @@
 class PDLParser :
     """Generic PDL parser."""
-    totiffcommand = None        # Default command to convert to TIFF
+    totiffcommands = None        # Default command to convert to TIFF
     def __init__(self, infile, debug=0, firstblock=None, lastblock=None) :
         """Initialize the generic parser."""
@@ -89 +90 @@
            Writes TIFF datas to the file named by fname.
         """   
-        if self.totiffcommand :
-            commandline = self.totiffcommand % locals()
-            child = popen2.Popen4(commandline)
-            try :
+        if self.totiffcommands :
+            for totiffcommand in self.totiffcommands :
+                self.infile.seek(0)
+                error = False
+                commandline = totiffcommand % locals()
+                child = popen2.Popen4(commandline)
                 try :
-                    data = self.infile.read(MEGABYTE)    
-                    while data :
-                        child.tochild.write(data)
-                        data = self.infile.read(MEGABYTE)
-                except (IOError, OSError), msg :    
-                    raise PDLParserError, "Problem during conversion to TIFF : %s" % msg
-            finally :    
-                child.tochild.close()    
-                child.fromchild.close()
-                
-            try :
-                child.wait()
-            except OSError, msg :    
-                raise PDLParserError, "Problem during conversion to TIFF : %s" % msg
+                    try :
+                        data = self.infile.read(MEGABYTE)    
+                        while data :
+                            child.tochild.write(data)
+                            data = self.infile.read(MEGABYTE)
+                    except (IOError, OSError) :    
+                        error = True
+                finally :    
+                    child.tochild.close()    
+                    child.fromchild.close()
+                    
+                try :
+                    child.wait()
+                except OSError :    
+                    error = True
+                    
+                if not os.path.exists(fname) :
+                    error = True
+                elif not os.stat(fname).st_size :
+                    error = True
+                else :        
+                    break       # Conversion worked fine it seems.
+                self.logdebug("Command failed : %s" % repr(commandline))
+            if error :
+                raise PDLParserError, "Problem during conversion to TIFF."
         else :        
             raise PDLParserError, "Impossible to compute ink coverage for this file format."

pkpgcounter/trunk/pkpgpdls/plain.py

@@ -33 +33 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for plain text documents."""
-    enscript = 'enscript --quiet --portrait --no-header --columns 1 --output - | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -'
-    a2ps = 'a2ps --borders 0 --quiet --portrait --no-header --columns 1 --output - | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -'
-    def __init__(self, infile, debug=0, firstblock=None, lastblock=None) :
-        """Initialize the plain text parser."""
-        pdlparser.PDLParser.__init__(self, infile, debug, firstblock, lastblock)
-        
-        # Tries to detect is a plain text to PostScript command line tool is available
-        # and use the first one we find.
-        paths = os.environ.get("PATH", "/usr/local/bin:/usr/bin:/bin").split(os.pathsep)
-        for cmd in ("enscript", "a2ps") :
-            for path in paths :
-                if os.path.exists(os.path.join(path, cmd)) :
-                    self.totiffcommand = getattr(self, cmd)
-                    return
-        
+    totiffcommands = [ 'enscript --quiet --portrait --no-header --columns 1 --output - | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -',
+                       'a2ps --borders 0 --quiet --portrait --no-header --columns 1 --output - | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -',
+                     ]  
     def isValid(self) :    
         """Returns True if data is plain text, else False.

pkpgcounter/trunk/pkpgpdls/postscript.py

@@ -34 +34 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for PostScript documents."""
-    totiffcommand = 'gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -'
+    totiffcommands = [ 'gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -' ]
     def isValid(self) :    
         """Returns True if data is PostScript, else False."""

pkpgcounter/trunk/pkpgpdls/tiff.py

@@ -33 +33 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for TIFF documents."""
-    totiffcommand = "cat >%(fname)s"
+    totiffcommands = [ "cat >%(fname)s" ]
     def isValid(self) :        
         """Returns True if data is TIFF, else False."""