X-Git-Url: http://git.kpe.io/?p=lml.git;a=blobdiff_plain;f=downloads.lisp;h=d78f776ffcee171a3d52b6804c186a1ba5671f34;hp=9fc9ac8292026ead8406946790c3ff9b6db14ada;hb=2dcfda178f817bec62b9f51248d96799d254d686;hpb=3dd20782b30be51ea311ec67cbd75ada7e956a0e

diff --git a/downloads.lisp b/downloads.lisp
index 9fc9ac8..d78f776 100644
--- a/downloads.lisp
+++ b/downloads.lisp
@@ -2,12 +2,12 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          downloads.cl
+;;;; Name:          downloads.lisp
 ;;;; Purpose:       Generate downloads page
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: downloads.lisp,v 1.2 2002/10/14 03:25:05 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,15 +16,13 @@
 ;;;; (http://www.gnu.org/licenses/gpl.html)
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :lml)
+(in-package #:lml)
 
 
-(defvar *ftp-base*)
-(defvar *ftp-url*)
+(defvar *dl-base*)
+(defvar *dl-url*)
 (defvar *base-name*)
 (defvar *section-indent* 0)
-(declaim (type (fixnum *section-indent*)))
 (defvar *signed* nil)
 
 (defun list-files (files)
@@ -32,14 +30,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)))))))
      
@@ -49,72 +47,70 @@
 	(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/kevin.gpg.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*)))
     (when (>= (length name) len-base-name)
-      (dotimes (i len-base-name)
-	(declare (fixnum i))
-	(unless (char= (char *base-name* i)
-		       (char name i))
-	  (return-from match-base-name? nil)))))
-  t)
+      (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"))
+	 (len-latest (length latest)))
+    (when (>= (length name) len-latest)
+      (string= name latest :end1 len-latest :end2 len-latest))))
 
 (defun filter-against-base (files)
-  (let ((filtered '()))
-    (dolist (f files)
-      (let ((name (pathname-name f)))
-	(when (match-base-name? name)
-	  (push f filtered))))
-    (when filtered
-      (sort filtered #'(lambda (a b) (when (and a b)
-				       (string<
-					(namestring a)
-					(namestring b))))))))
+  (delete-if-not #'(lambda (f) (match-base-name? (pathname-name f))) files))
+
+(defun filter-latest (files)
+  (delete-if #'(lambda (f) (match-base-name-latest? (pathname-name f))) files))
+
+(defun sort-pathnames (list)
+  (sort list #'(lambda (a b) (string< (namestring a) (namestring b)))))
 
 (defun display-one-section (title pat)
-  (let ((files (filter-against-base (directory pat))))
+  (let ((files (sort-pathnames (filter-latest
+				(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)
   (when sects
     (let ((title (car sects))
 	  (value (cadr sects)))
       (if (consp title)
-	  (mapcar #'display-sections sects)
-	(if (consp  value)
+	  (dolist (sect sects) (display-sections sect))
+	(if (consp value)
 	    (progn
 	      (print-sect-title title)
 	      (incf *section-indent*)
@@ -122,29 +118,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)
-    (mapcar #'display-sections sects)
+    (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))
@@ -157,10 +153,10 @@
 				    :type :wild :name :wild)
 		     base))
 	  (w32-path (merge-pathnames
-		     (make-pathname :directory '(:relative "w32")
+		     (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)