X-Git-Url: http://git.kpe.io/?p=lml2.git;a=blobdiff_plain;f=apache-dir.lisp;h=9cd155a5380080ef69c131f8384d32e2603f62d8;hp=31c9d5cbb3769a0a8ad45f7d5b99daf1c5171ab3;hb=9c5e52ab7792dc7e57d02141c797d95b31b23039;hpb=710507af21b320d11151423b73b73f1d3fdfebee
diff --git a/apache-dir.lisp b/apache-dir.lisp
index 31c9d5c..9cd155a 100644
--- a/apache-dir.lisp
+++ b/apache-dir.lisp
@@ -33,58 +33,58 @@
(defun universal-time-to-apache-date (utime)
(multiple-value-bind
- (second minute hour day-of-month month year day-of-week daylight-p zone)
+ (second minute hour day-of-month month year day-of-week daylight-p zone)
(decode-universal-time utime)
(declare (ignore second day-of-week daylight-p zone))
(format nil
- (formatter "~2,'0D-~3/kmrcl::monthname/-~4,'0D ~2,'0D:~2,'0D")
- day-of-month month year hour minute)))
-
+ (formatter "~2,'0D-~3/kmrcl::monthname/-~4,'0D ~2,'0D:~2,'0D")
+ day-of-month month year hour minute)))
+
(defun sort-dir-entries (entries sort-field direct)
(case sort-field
(:name
(sort entries
- (lambda (a b)
- (funcall (if (eq direct :asc) #'string-lessp #'string-greaterp)
- (aif (third a) it "")
- (aif (third b) it "")))))
+ (lambda (a b)
+ (funcall (if (eq direct :asc) #'string-lessp #'string-greaterp)
+ (aif (third a) it "")
+ (aif (third b) it "")))))
(:modified
(sort entries
- (lambda (a b)
- (funcall (if (eq direct :asc) #'< #'>)
- (aif (fourth a) it 0)
- (aif (fourth b) it 0)))))
+ (lambda (a b)
+ (funcall (if (eq direct :asc) #'< #'>)
+ (aif (fourth a) it 0)
+ (aif (fourth b) it 0)))))
(:size
(sort entries
- (lambda (a b)
- (funcall (if (eq direct :asc) #'< #'>)
- (aif (fifth a) it 0)
- (aif (fifth b) it 0)))))
+ (lambda (a b)
+ (funcall (if (eq direct :asc) #'< #'>)
+ (aif (fifth a) it 0)
+ (aif (fifth b) it 0)))))
(:description
(sort entries
- (lambda (a b)
- (funcall (if (eq direct :asc) #'string-lessp #'string-greaterp)
- (aif (sixth a) it "")
- (aif (sixth b) it "")))))
+ (lambda (a b)
+ (funcall (if (eq direct :asc) #'string-lessp #'string-greaterp)
+ (aif (sixth a) it "")
+ (aif (sixth b) it "")))))
(t
entries)))
-
+
(defun write-html-apache-directory (stream title entries this-url &key parent address query-string
- icon-base)
+ icon-base)
(let* ((query (when query-string (split-uri-query-string query-string)))
- (sort-field (if query
- (cond
- ((string-equal (caar query) "N") :name)
- ((string-equal (caar query) "M") :modified)
- ((string-equal (caar query) "S") :size)
- ((string-equal (caar query) "D") :description)
- (t :name))
- :name))
- (dir (cond
- ((and query (string-equal (cdr (first query)) "D") :desc))
- (t :asc))))
+ (sort-field (if query
+ (cond
+ ((string-equal (caar query) "N") :name)
+ ((string-equal (caar query) "M") :modified)
+ ((string-equal (caar query) "S") :size)
+ ((string-equal (caar query) "D") :description)
+ (t :name))
+ :name))
+ (dir (cond
+ ((and query (string-equal (cdr (first query)) "D") :desc))
+ (t :asc))))
(setq entries (sort-dir-entries entries sort-field dir))
-
+
(html-stream
stream
""
@@ -98,100 +98,100 @@
((:body :bgcolor "#FFFFFF" :text "#000000")
:newline
(:table
- (:tr
- ((:td :bgcolor "#FFFFFF" :class "title")
- ((:font :size "+3" :face "Hevetica,Arial,sans-serif")
- (:b (:princ title))))))
+ (:tr
+ ((:td :bgcolor "#FFFFFF" :class "title")
+ ((:font :size "+3" :face "Hevetica,Arial,sans-serif")
+ (:b (:princ title))))))
:newline
(:pre
- (when icon-base
- (html-stream
- stream
- ((:img :border "0"
- :src (format nil "~Ablank.png" icon-base)
- :alt " "))))
- " "
- ((:a :href (format nil "~A?N=~A" this-url
- (if (and (eq sort-field :name) (eq dir :asc))
- "D" "A")))
- "Name")
- (:princ (format nil "~20A" ""))
- " "
- ((:a :href (format nil "~A?M=~A" this-url
- (if (and (eq sort-field :modified) (eq dir :asc))
- "D" "A")))
- "Last modified")
- " "
- ((:a :href (format nil "~A?S=~A" this-url
- (if (and (eq sort-field :size) (eq dir :asc))
- "D" "A")))
- "Size")
- " "
- ((:a :href (format nil "~A?D=~A" this-url
- (if (and (eq sort-field :description) (eq dir :asc))
- "D" "A")))
- "Description")
- :newline
- (:princ "
")
- :newline
- (when parent
- (html-stream
- stream
- (when icon-base
- (html-stream
- stream
- ((:img :border "0"
- :src (format nil "~Aback.png" icon-base
- :alt "[DIR]")))))
- " "
- (write-name-link stream (first parent) (second parent))
- " "
- (print-n-chars #\space 17 stream)
- " -"
- :newline))
- (dolist (entry entries)
- (html-stream
- stream
- (when icon-base
- (html-stream
- stream
- ((:img :border "0"
- :src
- (case (car entry)
- (:dir (format nil "~Afolder.png" icon-base))
- (:text (format nil "~Atext.png" icon-base))
- (t (format nil "~Af.png" icon-base)))
- :alt
- (case (car entry)
- (:dir "[DIR]")
- (:text "[TXT]")
- (t "[FIL]"))))))
- " "
- (write-name-link stream (second entry) (third entry))
- " "
- (:princ (universal-time-to-apache-date (fourth entry)))
- (:princ
- (cond
- ((or (eq :dir (first entry))
- (null (fifth entry)))
- " -")
- ((< (fifth entry) (* 1024 1024))
- (format nil "~5,' Dk" (round (fifth entry) 1024)))
- ((< (fifth entry) (* 1024 1024 1024))
- (format nil "~5,' Dm" (round (fifth entry) (* 1024 1024))))
- (t
- (format nil "~5,' Dg" (round (fifth entry) (* 1024 1024 1024))))
- ))
- " "
- (:princ
- (if (sixth entry)
- (sixth entry)
- ""))
- :newline)))
+ (when icon-base
+ (html-stream
+ stream
+ ((:img :border "0"
+ :src (format nil "~Ablank.png" icon-base)
+ :alt " "))))
+ " "
+ ((:a :href (format nil "~A?N=~A" this-url
+ (if (and (eq sort-field :name) (eq dir :asc))
+ "D" "A")))
+ "Name")
+ (:princ (format nil "~20A" ""))
+ " "
+ ((:a :href (format nil "~A?M=~A" this-url
+ (if (and (eq sort-field :modified) (eq dir :asc))
+ "D" "A")))
+ "Last modified")
+ " "
+ ((:a :href (format nil "~A?S=~A" this-url
+ (if (and (eq sort-field :size) (eq dir :asc))
+ "D" "A")))
+ "Size")
+ " "
+ ((:a :href (format nil "~A?D=~A" this-url
+ (if (and (eq sort-field :description) (eq dir :asc))
+ "D" "A")))
+ "Description")
+ :newline
+ (:princ "
")
+ :newline
+ (when parent
+ (html-stream
+ stream
+ (when icon-base
+ (html-stream
+ stream
+ ((:img :border "0"
+ :src (format nil "~Aback.png" icon-base)
+ :alt "[DIR]"))))
+ " "
+ (write-name-link stream (first parent) (second parent))
+ " "
+ (print-n-chars #\space 17 stream)
+ " -"
+ :newline))
+ (dolist (entry entries)
+ (html-stream
+ stream
+ (when icon-base
+ (html-stream
+ stream
+ ((:img :border "0"
+ :src
+ (case (car entry)
+ (:dir (format nil "~Afolder.png" icon-base))
+ (:text (format nil "~Atext.png" icon-base))
+ (t (format nil "~Af.png" icon-base)))
+ :alt
+ (case (car entry)
+ (:dir "[DIR]")
+ (:text "[TXT]")
+ (t "[FIL]"))))))
+ " "
+ (write-name-link stream (second entry) (third entry))
+ " "
+ (:princ (universal-time-to-apache-date (fourth entry)))
+ (:princ
+ (cond
+ ((or (eq :dir (first entry))
+ (null (fifth entry)))
+ " -")
+ ((< (fifth entry) (* 1024 1024))
+ (format nil "~5,' Dk" (round (fifth entry) 1024)))
+ ((< (fifth entry) (* 1024 1024 1024))
+ (format nil "~5,' Dm" (round (fifth entry) (* 1024 1024))))
+ (t
+ (format nil "~5,' Dg" (round (fifth entry) (* 1024 1024 1024))))
+ ))
+ " "
+ (:princ
+ (if (sixth entry)
+ (sixth entry)
+ ""))
+ :newline)))
(:princ "
")
:newline
(when address
- (html-stream
- stream
- (:address address))))))))
+ (html-stream
+ stream
+ (:address address))))))))