Changeset 1980

Timestamp:

12/13/04 21:39:46 (19 years ago)

Author:

jalet

Message:

Added a --debug command line option to pkpgcounter, for people interested
in seeing what happens, and what will be available in the future :-)

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/pdlanalyzer.py (modified) (18 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.21alpha13 :
+    
+        - Added a --debug command line option to pkpgcounter, so
+          that people may see what really happens, and what will
+          be available in the future :-)
+          
     - 1.21alpha12 :
     

pykota/trunk/pykota/pdlanalyzer.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.45  2004/12/13 20:39:46  jalet
+# Added a --debug command line option to pkpgcounter, for people interested
+# in seeing what happens, and what will be available in the future :-)
+#
 # Revision 1.44  2004/11/17 15:10:31  jalet
 # Fixed Epson Stylus Photo problem in software accounting
@@ -186 +190 @@
 class PostScriptAnalyzer :
     """A class to parse PostScript documents."""
-    def __init__(self, infile) :
+    def __init__(self, infile, debug=0) :
         """Initialize PostScript Analyzer."""
+        self.debug = debug
         self.infile = infile
         self.copies = 1
@@ -193 +198 @@
     def throughGhostScript(self) :
         """Get the count through GhostScript, useful for non-DSC compliant PS files."""
+        if self.debug :
+            sys.stderr.write("Internal parser sucks, using GhostScript instead...\n")
         self.infile.seek(0)
         command = 'gs -sDEVICE=bbox -dNOPAUSE -dBATCH -dQUIET - 2>&1 | grep -c "%%HiResBoundingBox:" 2>/dev/null'
@@ -252 +259 @@
 class PDFAnalyzer :
     """A class to parse PDF documents."""
-    def __init__(self, infile) :
+    def __init__(self, infile, debug=0) :
         """Initialize PDF Analyzer."""
+        self.debug = debug
         self.infile = infile
                 
@@ -266 +274 @@
 class ESCP2Analyzer :
     """A class to parse ESC/P2 documents."""
-    def __init__(self, infile) :
+    def __init__(self, infile, debug=0) :
         """Initialize ESC/P2 Analyzer."""
+        self.debug = debug
         self.infile = infile
                 
@@ -356 +365 @@
                    
                    
-    def __init__(self, infile) :
+    def __init__(self, infile, debug=0) :
         """Initialize PCL Analyzer."""
+        self.debug = debug
         self.infile = infile
         
@@ -566 +576 @@
                 pagecount = endgfx
                 
-        #for pnum in range(pagecount) :
-        #    # if no number of copies defined, take the preceding one else the one set before any page else 1.
-        #    page = pages.get(pnum, pages.get(pnum - 1, pages.get(0, { "copies" : 1, "mediasource" : "Main", "mediasize" : "Default", "mediatype" : "Plain", "orientation" : "Portrait"})))
-        #    print "%s*%s*%s*%s*%s" % (page["copies"], page["mediatype"], page["mediasize"], page["orientation"], page["mediasource"])
+        if self.debug :        
+            for pnum in range(pagecount) :
+                # if no number of copies defined, take the preceding one else the one set before any page else 1.
+                page = pages.get(pnum, pages.get(pnum - 1, pages.get(0, { "copies" : 1, "mediasource" : "Main", "mediasize" : "Default", "mediatype" : "Plain", "orientation" : "Portrait"})))
+                print "%s*%s*%s*%s*%s" % (page["copies"], page["mediatype"], page["mediasize"], page["orientation"], page["mediasource"])
             
         return pagecount
@@ -614 +625 @@
                    }
                    
-    def __init__(self, infile) :
+    def __init__(self, infile, debug=0) :
         """Initialize PCLXL Analyzer."""
+        self.debug = debug
         self.infile = infile
         self.endianness = None
@@ -873 +885 @@
             copies = page["copies"]
             self.pagecount += (copies - 1)
-            # print "%s*%s*%s*%s*%s" % (copies, page["mediatype"], page["mediasize"], page["orientation"], page["mediasource"])
+            if self.debug :
+                print "%s*%s*%s*%s*%s" % (copies, page["mediatype"], page["mediasize"], page["orientation"], page["mediasource"])
             
         return self.pagecount
@@ -879 +892 @@
 class PDLAnalyzer :    
     """Generic PDL Analyzer class."""
-    def __init__(self, filename) :
+    def __init__(self, filename, debug=0) :
         """Initializes the PDL analyzer.
         
@@ -886 +899 @@
            supports read() and seek().
         """
+        self.debug = debug
         self.filename = filename
         try :
@@ -914 +928 @@
         else :
             try :
-                size = pdlhandler(self.infile).getJobSize()
+                size = pdlhandler(self.infile, self.debug).getJobSize()
             finally :    
                 self.closeFile()
@@ -968 +982 @@
               (sdata.find("LANGUAGE = Postscript") != -1))) or \
               (sdata.find("%!PS-Adobe") != -1) :
+            if self.debug :  
+                sys.stderr.write("%s is a PostScript file\n" % str(self.filename))
             return 1
         else :    
@@ -978 +994 @@
            ((sdata[:128].find("\033%-12345X") != -1) and (sdata.upper().find("LANGUAGE=PDF") != -1)) or \
            (sdata.find("%PDF-") != -1) :
+            if self.debug :  
+                sys.stderr.write("%s is a PDF file\n" % str(self.filename))
             return 1
         else :    
@@ -988 +1006 @@
            sdata.startswith("\033%8\033") or \
            (sdata.find("\033%-12345X") != -1) :
+            if self.debug :  
+                sys.stderr.write("%s is a PCL3/4/5 file\n" % str(self.filename))
             return 1
         else :    
@@ -998 +1018 @@
              ((sdata.find("LANGUAGE=PCLXL") != -1) or \
               (sdata.find("LANGUAGE = PCLXL") != -1))) :
+            if self.debug :  
+                sys.stderr.write("%s is a PCLXL (aka PCL6) file\n" % str(self.filename))
             return 1
         else :    
@@ -1008 +1030 @@
            sdata.startswith("\n\033@") or \
            sdata.startswith("\0\0\0\033\1@EJL") : # ESC/P Raster ??? Seen on Stylus Photo 1284
+            if self.debug :  
+                sys.stderr.write("%s is an ESC/P2 file\n" % str(self.filename))
             return 1
         else :    
@@ -1046 +1070 @@
         
     totalsize = 0    
-    for arg in sys.argv[1:] :
+    debug = 0
+    minindex = 1
+    if sys.argv[1] == "--debug" :
+        minindex = 2
+        debug = 1
+    for arg in sys.argv[minindex:] :
         try :
-            parser = PDLAnalyzer(arg)
+            parser = PDLAnalyzer(arg, debug)
             totalsize += parser.getJobSize()
         except PDLAnalyzerError, msg :    

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.21alpha12_unofficial"
+__version__ = "1.21alpha13_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""