r5005: *** empty log message ***

[lml.git] / downloads.lisp

diff --git a/downloads.lisp b/downloads.lisp
index bc342c0bf87cf100bab58cc7d5c1cb7c0cd07719..8cd2e32ec2f9c0ad6463bdff7836d4d2131041b0 100644 (file)
--- a/downloads.lisp
+++ b/downloads.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: downloads.lisp,v 1.5 2002/10/16 10:21:53 kevin Exp $
+;;;; $Id: downloads.lisp,v 1.8 2003/02/03 00:43:36 kevin Exp $
 ;;;;
 ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,8 +20,8 @@
 (in-package :lml)
 
 
-(defvar *ftp-base*)
-(defvar *ftp-url*)
+(defvar *dl-base*)
+(defvar *dl-url*)
 (defvar *base-name*)
 (defvar *section-indent* 0)
 (defvar *signed* nil)
@@ -31,14 +31,14 @@
   ;;files.sort()
   (mapcar #'print-file files))
 
-(defun strip-ftp-base (file)
+(defun strip-dl-base (file)
   (let ((fdir (pathname-directory file))
-       (bdir (pathname-directory *ftp-base*)))
+       (bdir (pathname-directory *dl-base*)))
     (make-pathname
      :name (pathname-name file)
      :type (pathname-type file)
      :directory 
-     (when (> (length bdir) (length fdir))
+     (when (> (length fdir) (length bdir))
        (append '(:absolute) 
               (subseq fdir (length bdir) (length fdir)))))))
      
@@ -48,33 +48,33 @@
        (basename (namestring
                   (make-pathname :name (pathname-name file)
                                  :type (pathname-type file))))
-       (ftp-name (strip-ftp-base file))
+       (dl-name (strip-dl-base file))
        (sig-path (concatenate 'string (namestring file) ".asc")))
     (when (plusp (length basename))
       (with-open-file (strm file :direction :input)
                      (setq size (round (/ (file-length strm) 1024))))
-      (lml-print "<a href=\"~A~A\">~A</a>" *ftp-url* ftp-name basename)
-      (lml-print "<span class=\"modtime\">")
-      (lml-print " (~A, <b>~:D <span style=\"font-size:90%;\">KB</span></b>)</span>" modtime size)
+      (lml-format "<a href=\"~A~A\">~A</a>" *dl-url* dl-name basename)
+      (lml-princ "<span class=\"modtime\">")
+      (lml-format " (~A, <b>~:D <span style=\"font-size:90%;\">KB</span></b>)</span>" modtime size)
       (when (probe-file sig-path)
        (setq *signed* t)
-       (lml-print " [<a href=\"~A~A.asc\">Signature</a>]" *ftp-url* ftp-name))
+       (lml-format " [<a href=\"~A~A.asc\">Signature</a>]" *dl-url* dl-name))
       (br))))
 
 (defun display-header (name url)
-  (lml-print "<h1>Download</h1>")
-  (lml-print "<div class=\"mainbody\">")
-  (lml-print "<h3>Browse ~A FTP Site</h3>" name)
-  (lml-print "<a style=\"padding-left:20pt;\" href=\"~A\">~A</a>" url url))
+  (lml-princ "<h1>Download</h1>")
+  (lml-princ "<div class=\"mainbody\">")
+  (lml-format "<h3>Browse ~A Download Site</h3>" name)
+  (lml-format "<a style=\"padding-left:20pt;\" href=\"~A\">~A</a>" url url))
 
 (defun display-footer ()
   (when *signed*
-    (lml-print "<h3>GPG Public Key</h3>")
-    (lml-print "Use this <a href=\"https://www.b9.com/key.asc\">key</a> to verify file signtatures"))
-  (lml-print "</div>"))
+    (lml-princ "<h3>GPG Public Key</h3>")
+    (lml-princ "Use this <a href=\"https://www.b9.com/key.asc\">key</a> to verify file signtatures"))
+  (lml-princ "</div>"))
   
 (defun print-sect-title (title)
-  (lml-print "<h~D>~A</h~D>" *section-indent* title *section-indent*))
+  (lml-format "<h~D>~A</h~D>" *section-indent* title *section-indent*))
 
 (defun match-base-name? (name)
   (let ((len-base-name (length *base-name*)))
@@ -102,9 +102,9 @@
   (let ((files (filter-against-base (directory pat))))
     (when files
       (print-sect-title title)
-      (lml-print "<div style=\"padding-left: 20pt;\">")
+      (lml-princ "<div style=\"padding-left: 20pt;\">")
       (list-files files)
-      (lml-print"</div>"))))
+      (lml-princ "</div>"))))
 
 
 (defun display-sections (sects)
@@ -121,29 +121,29 @@
              (decf *section-indent*))
          (display-one-section title value))))))
       
-(defun display-page (pkg-name pkg-base ftp-base ftp-url sects)
+(defun display-page (pkg-name pkg-base dl-base dl-url sects)
   (let ((*section-indent* 3)
-       (*ftp-base* ftp-base)
-       (*ftp-url* ftp-url)
+       (*dl-base* dl-base)
+       (*dl-url* dl-url)
        (*base-name* pkg-base)
        (*signed* nil))
-    (display-header pkg-name ftp-url)
+    (display-header pkg-name dl-url)
     (map nil #'display-sections sects)
     (display-footer)))
 
-(defun std-dl-page (pkg-name pkg-base ftp-base ftp-url)
-  (let ((base (parse-namestring ftp-base)))
+(defun std-dl-page (pkg-name pkg-base dl-base dl-url)
+  (let ((base (parse-namestring dl-base)))
     (let ((tgz-path (make-pathname :defaults base :type "gz" :name :wild))
          (zip-path (make-pathname :defaults base :type "zip" :name :wild))
          (doc-path (make-pathname :defaults base :type "pdf" :name :wild)))
-      (display-page pkg-name pkg-base ftp-base ftp-url
+      (display-page pkg-name pkg-base dl-base dl-url
                    `(("Manual" ,doc-path)
                      ("Source Code"
                       (("Unix (.tar.gz)" ,tgz-path)
                        ("Windows (.zip)" ,zip-path))))))))
   
-(defun full-dl-page (pkg-name pkg-base ftp-base ftp-url)
-  (let ((base (parse-namestring ftp-base)))
+(defun full-dl-page (pkg-name pkg-base dl-base dl-url)
+  (let ((base (parse-namestring dl-base)))
     (let ((tgz-path (make-pathname :defaults base :type "gz" :name :wild))
          (zip-path (make-pathname :defaults base :type "zip" :name :wild))
          (doc-path (make-pathname :defaults base :type "pdf" :name :wild))
@@ -159,7 +159,7 @@
                     (make-pathname :directory '(:relative "win32")
                                    :type :wild :name :wild)
                     base)))
-      (display-page pkg-name pkg-base ftp-base ftp-url
+      (display-page pkg-name pkg-base dl-base dl-url
                    `(("Manual" ,doc-path)
                      ("Source Code"
                       (("Unix (.tar.gz)" ,tgz-path)