Changeset 491 for pkpgcounter/trunk/pkpgpdls/plain.py

Timestamp:

11/20/07 00:04:09 (16 years ago)

Author:

jerome

Message:

Major code cleaning. Now clearer, although probably a bit slower since
a file can be opened several times.
Now universal line opening mode is only used when needed (PS, PDF and plain
text), and binary opening mode is used for the other formats.
This mean we will be able to remove mmap calls wherever possible, finally.

Files:

• pkpgcounter/trunk/pkpgpdls/plain.py (modified) (4 diffs)

pkpgcounter/trunk/pkpgpdls/plain.py

@@ -23 +23 @@
 """This modules implements a page counter for plain text documents."""
 
-import sys
-import os
-
 import pdlparser
 import version
-
 
 class Parser(pdlparser.PDLParser) :
@@ -35 +31 @@
                        'a2ps --borders 0 --quiet --portrait --no-header --columns 1 --output - | gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%(dpi)i -sOutputFile="%(fname)s" -',
                      ]  
+    openmode = "rU"                 
     def isValid(self) :    
         """Returns True if data is plain text, else False.
@@ -57 +54 @@
         linecount = 0
         for line in self.infile :
-            if line.endswith("\n") or line.endswith("\r") :
+            if line.endswith("\n") :
                 linecount += 1    
                 if (linecount > pagesize) :
@@ -70 +67 @@
                 raise pdlparser.PDLParserError, "Unsupported file format. Please send the file to %s" % version.__authoremail__
         return pagecount + 1    # NB : empty files are catched in isValid()
-        
-if __name__ == "__main__" :    
-    pdlparser.test(Parser)