X-Git-Url: http://git.kpe.io/?p=lml2.git;a=blobdiff_plain;f=downloads.lisp;h=855505b0a948a85c69dab5825836388052e7c6b7;hp=2b977c355b8c79ed0baf1aaa6611c022309974e6;hb=43ab031bb96c1c9c872856df727a909a82a68ee1;hpb=a5621a5bf235313916f437a55d9998418ee26f5a

diff --git a/downloads.lisp b/downloads.lisp
index 2b977c3..855505b 100644
--- a/downloads.lisp
+++ b/downloads.lisp
@@ -7,32 +7,26 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: downloads.lisp,v 1.1 2003/06/20 04:12:29 kevin Exp $
+;;;; $Id$
 ;;;;
-;;;; This file, part of LML2, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of LML2, is Copyright (c) 2000-2003 by Kevin Rosenberg.
+;;;; Rights of modification and redistribution are in the LICENSE file.
 ;;;;
-;;;; LML2 users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the GNU General Public License v2
-;;;; (http://www.gnu.org/licenses/gpl.html)
 ;;;; *************************************************************************
 
 (in-package #:lml2)
 
 
-(defvar *dl-base*)
-(defvar *dl-url*)
-(defvar *base-name*)
-(defvar *section-indent* 0)
-(defvar *signed* nil)
+(defstruct dl-data base url name indent signed)
 
-(defun list-files (files)
+(defun list-files (files dl-data)
   "List files in a directory for downloading"
   ;;files.sort()
-  (mapcar #'print-file files))
+  (mapcar (lambda (f) (print-file f dl-data)) files))
 
-(defun strip-dl-base (file)
+(defun strip-dl-base (file base)
   (let ((fdir (pathname-directory file))
-	(bdir (pathname-directory *dl-base*)))
+	(bdir (pathname-directory base)))
     (make-pathname
      :name (pathname-name file)
      :type (pathname-type file)
@@ -41,92 +35,104 @@
        (append '(:absolute) 
 	       (subseq fdir (length bdir) (length fdir)))))))
      
-(defun print-file (file)
+(defun print-file (file dl-data)
   (let ((size 0)
 	(modtime (date-string (file-write-date file)))
 	(basename (namestring
 		   (make-pathname :name (pathname-name file)
 				  :type (pathname-type file))))
-	(dl-name (strip-dl-base file))
+	(dl-name (strip-dl-base file (dl-data-base dl-data)))
 	(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-format "<a href=\"~A~A\">~A</a>" *dl-url* dl-name basename)
+      (lml-format "<a href=\"~A~A\">~A</a>"
+		  (dl-data-url dl-data) 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-format " [<a href=\"~A~A.asc\">Signature</a>]" *dl-url* dl-name))
+	(setf (dl-data-signed dl-data) t)
+	(lml-format " [<a href=\"~A~A.asc\">Signature</a>]"
+		    (dl-data-url dl-data) dl-name))
       (html :br))))
 
 (defun display-header (name 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))
+  (let ((*print-circle* nil))
+    (lml-format "<a style=\"padding-left:20pt;\" href=\"~A\">~A</a>" url url)))
 
-(defun display-footer ()
-  (when *signed*
+(defun display-footer (dl-data)
+  (when (dl-data-signed dl-data)
     (lml-princ "<h3>GPG Public Key</h3>")
     (lml-princ "Use this <a href=\"https://www.b9.com/kevin.gpg.asc\">key</a> to verify file signtatures"))
   (lml-princ "</div>"))
   
-(defun print-sect-title (title)
-  (lml-format "<h~D>~A</h~D>" *section-indent* title *section-indent*))
+(defun print-sect-title (title dl-data)
+  (lml-format "<h~D>~A</h~D>"
+	      (dl-data-indent dl-data) title (dl-data-indent dl-data)))
 
-(defun match-base-name? (name)
-  (let ((len-base-name (length *base-name*)))
+(defun match-base-name? (name base-name)
+  (let ((len-base-name (length base-name)))
     (when (>= (length name) len-base-name)
-      (string= name *base-name* :end1 len-base-name :end2 len-base-name))))
+      (string= name base-name :end1 len-base-name :end2 len-base-name))))
 
-(defun match-base-name-latest? (name)
-  (let* ((latest (concatenate 'string *base-name* "-latest"))
+(defun match-base-name-latest? (name base-name)
+  (let* ((latest (concatenate 'string base-name "-latest"))
 	 (len-latest (length latest)))
     (when (>= (length name) len-latest)
       (string= name latest :end1 len-latest :end2 len-latest))))
 
-(defun filter-against-base (files)
-  (delete-if-not #'(lambda (f) (match-base-name? (pathname-name f))) files))
+(defun filter-against-base (files base-name)
+  (delete-if-not
+   (lambda (f) (match-base-name? (pathname-name f) base-name))
+   files))
 
-(defun filter-latest (files)
-  (delete-if #'(lambda (f) (match-base-name-latest? (pathname-name f))) files))
+(defun filter-latest (files base-name)
+  (delete-if
+   (lambda (f) (match-base-name-latest? (pathname-name f) base-name))
+   files))
 
 (defun sort-pathnames (list)
-  (sort list #'(lambda (a b) (string< (namestring a) (namestring b)))))
+  (sort list (lambda (a b) (string< (namestring a) (namestring b)))))
 
-(defun display-one-section (title pat)
-  (let ((files (sort-pathnames (filter-latest
-				(filter-against-base (directory pat))))))
+(defun display-one-section (title pat dl-data)
+  (let ((files (sort-pathnames
+		(filter-latest
+		 (filter-against-base (directory pat) (dl-data-name dl-data))
+		 (dl-data-name dl-data)))))
     (when files
-      (print-sect-title title)
+      (print-sect-title title dl-data)
       (lml-princ "<div style=\"padding-left: 20pt;\">")
-      (list-files files)
+      (list-files files dl-data)
       (lml-princ "</div>"))))
 
-(defun display-sections (sects)
+(defun display-sections (sects dl-data)
   (when sects
     (let ((title (car sects))
 	  (value (cadr sects)))
       (if (consp title)
-	  (dolist (sect sects) (display-sections sect))
+	  (dolist (sect sects)
+	    (display-sections sect dl-data))
 	(if (consp value)
 	    (progn
-	      (print-sect-title title)
-	      (incf *section-indent*)
-	      (display-sections value)
-	      (decf *section-indent*))
-	  (display-one-section title value))))))
+	      (print-sect-title title dl-data)
+	      (incf (dl-data-indent dl-data))
+	      (display-sections value dl-data)
+	      (decf (dl-data-indent dl-data)))
+	  (display-one-section title value dl-data))))))
       
 (defun display-page (pkg-name pkg-base dl-base dl-url sects)
-  (let ((*section-indent* 3)
-	(*dl-base* dl-base)
-	(*dl-url* dl-url)
-	(*base-name* pkg-base)
-	(*signed* nil))
+  (let ((dl-data (make-dl-data :indent 3
+			       :base dl-base
+			       :url dl-url
+			       :name pkg-base
+			       :signed nil)))
     (display-header pkg-name dl-url)
-    (map nil #'display-sections sects)
-    (display-footer)))
+    (dolist (sect sects)
+      (display-sections sect dl-data))
+    (display-footer dl-data)))
 
 (defun std-dl-page (pkg-name pkg-base dl-base dl-url)
   (let ((base (parse-namestring dl-base)))