Changeset 371 for pkpgcounter/trunk/pkpgpdls

Timestamp:

08/26/06 23:39:31 (18 years ago)

Author:

jerome

Message:

Refactored some duplicate code.

Location:

pkpgcounter/trunk/pkpgpdls

Files:

• pdf.py (modified) (3 diffs)
• pdlparser.py (modified) (3 diffs)
• postscript.py (modified) (2 diffs)

pkpgcounter/trunk/pkpgpdls/pdf.py

@@ -25 +25 @@
 
 import sys
-import popen2
 import re
 
@@ -44 +43 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for PDF documents."""
+    totiffcommand = 'gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -'
     def isValid(self) :    
         """Returns 1 if data is PDF, else 0."""
@@ -105 +105 @@
         return pagecount    
         
-    def convertToTiffMultiPage24NC(self, fname, dpi) :
-        """Converts the input file to TIFF format, X dpi, 24 bits per pixel, uncompressed.
-           Writes TIFF datas to the outputfile file object.
-        """   
-        command = 'gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%i -sOutputFile="%s" -' % (dpi, fname)
-        child = popen2.Popen4(command)
-        try :
-            data = self.infile.read(pdlparser.MEGABYTE)    
-            while data :
-                child.tochild.write(data)
-                data = self.infile.read(pdlparser.MEGABYTE)
-            child.tochild.flush()
-            child.tochild.close()    
-        except (IOError, OSError), msg :    
-            raise pdlparser.PDLParserError, "Problem during conversion to TIFF : %s" % msg
-            
-        child.fromchild.close()
-        try :
-            child.wait()
-        except OSError, msg :    
-            raise pdlparser.PDLParserError, "Problem during conversion to TIFF : %s" % msg
-        
 def test() :        
     """Test function."""

pkpgcounter/trunk/pkpgpdls/pdlparser.py

@@ -23 +23 @@
 
 import sys
+import popen2
 
 KILOBYTE = 1024    
@@ -40 +41 @@
 class PDLParser :
     """Generic PDL parser."""
+    totiffcommand = None        # Default command to convert to TIFF
     def __init__(self, infile, debug=0, firstblock=None, lastblock=None) :
         """Initialize the generic parser."""
@@ -87 +89 @@
            Writes TIFF datas to the file named by fname.
         """   
-        raise RuntimeError, "Not implemented !"
+        if self.totiffcommand :
+            child = popen2.Popen4(self.totiffcommand % locals())
+            try :
+                try :
+                    data = self.infile.read(MEGABYTE)    
+                    while data :
+                        child.tochild.write(data)
+                        data = self.infile.read(MEGABYTE)
+                    child.tochild.flush()
+                    child.tochild.close()    
+                except (IOError, OSError), msg :    
+                    raise PDLParserError, "Problem during conversion to TIFF : %s" % msg
+            finally :    
+                child.fromchild.close()
+                
+            try :
+                child.wait()
+            except OSError, msg :    
+                raise PDLParserError, "Problem during conversion to TIFF : %s" % msg
+        else :        
+            raise PDLParserError, "Impossible to compute ink coverage for this file format."

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" -'
     def isValid(self) :    
         """Returns 1 if data is PostScript, else 0."""
@@ -177 +178 @@
         return self.natively() or self.throughGhostScript()
         
-    def convertToTiffMultiPage24NC(self, fname, dpi) :
-        """Converts the input file to TIFF format, X dpi, 24 bits per pixel, uncompressed.
-           Writes TIFF datas to the outputfile file object.
-        """   
-        command = 'gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%i -sOutputFile="%s" -' % (dpi, fname)
-        child = popen2.Popen4(command)
-        try :
-            data = self.infile.read(pdlparser.MEGABYTE)    
-            while data :
-                child.tochild.write(data)
-                data = self.infile.read(pdlparser.MEGABYTE)
-            child.tochild.flush()
-            child.tochild.close()    
-        except (IOError, OSError), msg :    
-            raise pdlparser.PDLParserError, "Problem during conversion to TIFF : %s" % msg
-            
-        child.fromchild.close()
-        try :
-            child.wait()
-        except OSError, msg :    
-            raise pdlparser.PDLParserError, "Problem during conversion to TIFF : %s" % msg
-        
 def test() :        
     """Test function."""