refac

pitfall/pitfall/reference.rkt

@@ -12,41 +12,30 @@
 (define-subclass object% (PDFReference document id [data (mhash)])
   (super-new)
   (field [gen 0]
-         [deflate #f]
+         [i-wanna-be-deflated #f]
          [compress (and (· document compress)
                         (not (hash-ref data 'Filter #f)))]
-         [uncompressedLength 0]
          [chunks empty]
          [offset #f])
 
   (as-methods
-   initDeflate
    write
    _write
    end
-   finalize
    toString))
 
-(define/contract (initDeflate this)
-  (->m void?)
-  (hash-ref! (· this data) 'Filter "FlateDecode")
-  (set-field! deflate this #t))
 
 (define/contract (write this data)
   (any/c . ->m . void?)
   (send this _write data #f void))
 
 (define/contract (_write this chunk-in encoding callback)
-  (any/c (or/c string? #f) procedure? . ->m . any/c)
-  #;(report* '_write (· this id) chunk-in)
+  ((or/c string? isBuffer?) (or/c string? #f) procedure? . ->m . any/c)
   (define chunk (if (isBuffer? chunk-in)
                     chunk-in
                     (newBuffer (string-append chunk-in "\n"))))
-  (increment-field! uncompressedLength this (buffer-length chunk))
   (hash-ref! (· this data) 'Length 0)
-
-  (when (· this compress) (send this initDeflate))
-
+  (when (· this compress) (set-field! i-wanna-be-deflated this #t))
   (push-end-field! chunks this chunk)
   (hash-update! (· this data) 'Length (curry + (buffer-length chunk)))
   (callback))
@@ -54,21 +43,18 @@
 
 (define/contract (end this [chunk #f])
   (() ((or/c any/c #f)) . ->*m . void?)
-  ; (super) ; todo
-  (when (· this deflate)
-    (set-field! chunks this (list (deflate (apply bytes-append (· this chunks)))))
-    (hash-set! (· this data) 'Length (apply + (map buffer-length (· this chunks)))))
-  #;(report* 'end! (· this id) (· this chunks))
-  (send this finalize))
-
 
-(define/contract (finalize this)
-  (->m void?)
-  #;(report* 'finalize! (· this id) (· this chunks))
+  (when (· this i-wanna-be-deflated)
+    (define deflated-chunk (deflate (apply bytes-append (· this chunks))))
+    (set-field! chunks this (list deflated-chunk))
+    (hash-set*! (· this data)
+                'Filter "FlateDecode"
+                'Length (buffer-length deflated-chunk)))
+  
+  (define this-doc (· this document)) 
 
-  (set-field! offset this (· this document _offset))
+  (set-field! offset this (· this-doc _offset))
 
-  (define this-doc (· this document)) 
   (send* this-doc
     [_write (format "~a ~a obj" (· this id) (· this gen))]
     [_write (convert (· this data))])
@@ -84,6 +70,7 @@
     [_write "endobj"]
     [_refEnd this]))
 
+
 (define/contract (toString this)
   (->m string?)
   (format "~a ~a R" (· this id) (· this gen)))