X-Git-Url: http://git.kpe.io/?p=lml.git;a=blobdiff_plain;f=downloads.lisp;h=2c1d2b2eaaf3872e14d28f1872fff83a049ff4bb;hp=4ad88c1ca95acdf3b6f8ff053646e333c93027ae;hb=HEAD;hpb=4cb2a48870afc9f2dda44a46881ba8a249566120

diff --git a/downloads.lisp b/downloads.lisp
index 4ad88c1..2c1d2b2 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.4 2002/10/14 03:44:09 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,12 +16,11 @@
 ;;;; (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)
 (defvar *signed* nil)
@@ -31,141 +30,143 @@
   ;;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))
-       (append '(:absolute) 
-	       (subseq fdir (length bdir) (length fdir)))))))
-     
+     :directory
+     (when (> (length fdir) (length bdir))
+       (append '(:absolute)
+               (subseq fdir (length bdir) (length fdir)))))))
+
 (defun print-file (file)
   (let ((size 0)
-	(modtime (date-string (file-write-date file)))
-	(basename (namestring
-		   (make-pathname :name (pathname-name file)
-				  :type (pathname-type file))))
-	(ftp-name (strip-ftp-base file))
-	(sig-path (concatenate 'string (namestring file) ".asc")))
+        (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))
+        (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)
+                      (setq size (round (/ (file-length strm) 1024))))
+      (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))
+        (setq *signed* t)
+        (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.kpe.io/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)))
+          (value (cadr sects)))
       (if (consp title)
-	  (map nil #'display-sections sects)
-	(if (consp value)
-	    (progn
-	      (print-sect-title title)
-	      (incf *section-indent*)
-	      (display-sections value)
-	      (decf *section-indent*))
-	  (display-one-section title value))))))
-      
-(defun display-page (pkg-name pkg-base ftp-base ftp-url sects)
+          (dolist (sect sects) (display-sections sect))
+        (if (consp value)
+            (progn
+              (print-sect-title title)
+              (incf *section-indent*)
+              (display-sections value)
+              (decf *section-indent*))
+          (display-one-section title value))))))
+
+(defun display-page (pkg-name pkg-base dl-base dl-url giturl gitweb sects)
   (let ((*section-indent* 3)
-	(*ftp-base* ftp-base)
-	(*ftp-url* ftp-url)
-	(*base-name* pkg-base)
-	(*signed* nil))
-    (display-header pkg-name ftp-url)
+        (*dl-base* dl-base)
+        (*dl-url* dl-url)
+        (*base-name* pkg-base)
+        (*signed* nil))
+    (display-header pkg-name dl-url)
     (map nil #'display-sections sects)
+    (when giturl
+      (lml-format "<h2>Git Repository</h2><tt>~A</tt>" giturl)
+      (when gitweb
+        (lml-format "&nbsp;&nbsp;[<a href=\"~A\">Browse</a>]" gitweb)))
     (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 &optional giturl gitweb)
+  (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
-		    `(("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)))
+          (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 dl-base dl-url giturl gitweb
+                    `(("Manual" ,doc-path)
+                      ("Source Code"
+                       (("Unix (.tar.gz)" ,tgz-path)
+                        ("Windows (.zip)" ,zip-path))))))))
+
+(defun full-dl-page (pkg-name pkg-base dl-base dl-url &optional giturl gitweb)
+  (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))
-	  (deb-path (merge-pathnames
-		     (make-pathname :directory '(:relative "linux-debian")
-				    :type :wild :name :wild)
-		     base))
-	  (rpm-path (merge-pathnames
-		     (make-pathname :directory '(:relative "linux-rpm")
-				    :type :wild :name :wild)
-		     base))
-	  (w32-path (merge-pathnames
-		     (make-pathname :directory '(:relative "w32")
-				    :type :wild :name :wild)
-		     base)))
-      (display-page pkg-name pkg-base ftp-base ftp-url
-		    `(("Manual" ,doc-path)
-		      ("Source Code"
-		       (("Unix (.tar.gz)" ,tgz-path)
-			("Windows (.zip)" ,zip-path)))
-		      ("Binaries" 
-		       (("Linux Binaries"
-			 (("Debian Linux" ,deb-path)
-			  ("RedHat Linux" ,rpm-path)))
-			("Windows Binaries" ,w32-path))))))))
+          (zip-path (make-pathname :defaults base :type "zip" :name :wild))
+          (doc-path (make-pathname :defaults base :type "pdf" :name :wild))
+          (deb-path (merge-pathnames
+                     (make-pathname :directory '(:relative "linux-debian")
+                                    :type :wild :name :wild)
+                     base))
+          (rpm-path (merge-pathnames
+                     (make-pathname :directory '(:relative "linux-rpm")
+                                    :type :wild :name :wild)
+                     base))
+          (w32-path (merge-pathnames
+                     (make-pathname :directory '(:relative "win32")
+                                    :type :wild :name :wild)
+                     base)))
+      (display-page pkg-name pkg-base dl-base dl-url giturl gitweb
+                    `(("Manual" ,doc-path)
+                      ("Source Code"
+                       (("Unix (.tar.gz)" ,tgz-path)
+                        ("Windows (.zip)" ,zip-path)))
+                      ("Binaries"
+                       (("Linux Binaries"
+                         (("Debian Linux" ,deb-path)
+                          ("RedHat Linux" ,rpm-path)))
+                        ("Windows Binaries" ,w32-path))))))))