Changeset 492 for pkpgcounter/trunk

Timestamp:

11/20/07 00:56:15 (17 years ago)

Author:

jerome

Message:

Even more code cleaning : we use named temporary files now, so no need for pipes.

Location:

pkpgcounter/trunk/pkpgpdls

Files:

• analyzer.py (modified) (1 diff)
• dvi.py (modified) (1 diff)
• inkcoverage.py (modified) (1 diff)
• pcl345.py (modified) (1 diff)
• pclxl.py (modified) (1 diff)
• pdf.py (modified) (1 diff)
• pdlparser.py (modified) (1 diff)
• plain.py (modified) (1 diff)
• postscript.py (modified) (1 diff)
• tiff.py (modified) (1 diff)

pkpgcounter/trunk/pkpgpdls/analyzer.py

@@ -82 +82 @@
             try :
                 pdlhandler = self.detectPDLHandler()
-                pdlhandler.convertToTiffMultiPage24NC(self.filename, self.options.resolution)
-                result = inkcoverage.getInkCoverage(self.filename, cspace)
+                (handle, filename) = tempfile.mkstemp(".tmp", "pkpgcounter")
+                os.close(handle)
+                try :
+                    pdlhandler.convertToTiffMultiPage24NC(filename, self.options.resolution)
+                    result = inkcoverage.getInkCoverage(filename, cspace)
+                finally :    
+                    try :
+                        os.remove(filename)
+                    except OSError :    
+                        sys.stderr.write("Problem while trying to remove temporary file %s\n" % filename)
             except pdlparser.PDLParserError, msg :    
                 raise pdlparser.PDLParserError, "Unknown file format for %s (%s)" % (self.filename, msg)
-        finally :    
+        finally :
             self.closeFile()
         return result

pkpgcounter/trunk/pkpgpdls/dvi.py

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

pkpgcounter/trunk/pkpgpdls/inkcoverage.py

@@ -116 +116 @@
     else :    
         try :
-            while 1 :
+            while True :
                 nbpixels = image.size[0] * image.size[1]
                 result.append(computation(image, nbpixels))

pkpgcounter/trunk/pkpgpdls/pcl345.py

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

pkpgcounter/trunk/pkpgpdls/pclxl.py

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

pkpgcounter/trunk/pkpgpdls/pdf.py

@@ -43 +43 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for PDF documents."""
-    totiffcommands = [ '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="%(outfname)s" "%(infname)s"' ]
     openmode = "rU"
     def isValid(self) :    

pkpgcounter/trunk/pkpgpdls/pdlparser.py

@@ -94 +94 @@
         raise RuntimeError, "Not implemented !"
         
-    def convertToTiffMultiPage24NC(self, fname, dpi) :
+    def convertToTiffMultiPage24NC(self, outfname, dpi) :
         """Converts the input file to TIFF format, X dpi, 24 bits per pixel, uncompressed.
-           Writes TIFF datas to the file named by fname.
+           Writes TIFF datas to the file named by outfname.
         """   
         if self.totiffcommands :
-            infile = open(self.filename, "rb")
-            try :
-                for totiffcommand in self.totiffcommands :
-                    infile.seek(0)
-                    error = False
-                    commandline = totiffcommand % locals()
-                    child = popen2.Popen4(commandline)
-                    try :
-                        try :
-                            data = infile.read(MEGABYTE)    
-                            while data :
-                                child.tochild.write(data)
-                                child.tochild.flush()
-                                data = infile.read(MEGABYTE)
-                        except (IOError, OSError) :    
-                            error = True
-                    finally :    
-                        child.tochild.close()    
-                        dummy = child.fromchild.read()
-                        child.fromchild.close()
-                        
-                    try :
-                        status = child.wait()
-                    except OSError :    
+            infname = self.filename
+            for totiffcommand in self.totiffcommands :
+                error = False
+                commandline = totiffcommand % locals()
+                # self.logdebug("Executing '%s'" % commandline)
+                status = os.system(commandline)
+                if os.WIFEXITED(status) :
+                    if os.WEXITSTATUS(status) :
                         error = True
-                    else :    
-                        if os.WIFEXITED(status) :
-                            if os.WEXITSTATUS(status) :
-                                error = True
-                        else :        
-                            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))
-            finally :        
-                infile.close()
+                else :        
+                    error = True
+                if not os.path.exists(outfname) :
+                    error = True
+                elif not os.stat(outfname).st_size :
+                    error = True
+                else :        
+                    break       # Conversion worked fine it seems.
+                sys.stderr.write("Command failed : %s\n" % repr(commandline))
             if error :
                 raise PDLParserError, "Problem during conversion to TIFF."

pkpgcounter/trunk/pkpgpdls/plain.py

@@ -28 +28 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for plain text documents."""
-    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" -',
+    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" -',
                      ]  
     openmode = "rU"                 

pkpgcounter/trunk/pkpgpdls/postscript.py

@@ -33 +33 @@
 class Parser(pdlparser.PDLParser) :
     """A parser for PostScript documents."""
-    totiffcommands = [ '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="%(outfname)s" "%(infname)s"' ]
     openmode = "rU"
     def isValid(self) :    

pkpgcounter/trunk/pkpgpdls/tiff.py

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