X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=www-page.el;h=30fe875409c7fe4c0e0d9b262fc0e579470a19f5;hb=19733a295d7cc9d30f83d9a45c071ce798d6ed80;hp=1fe94417c5cf98278b11731d8724e79e7a639f8a;hpb=5a6b4fa99f63d5daefa2b3e9c5758140f98dd82c;p=elisp%2Falbum.git diff --git a/www-page.el b/www-page.el index 1fe9441..30fe875 100644 --- a/www-page.el +++ b/www-page.el @@ -1,6 +1,6 @@ ;;; www-page.el --- Album page generator for page.cgi. -;; Copyright (C) 2005,2006,2007 MORIOKA Tomohiko +;; Copyright (C) 2005,2006,2007,2009,2010 MORIOKA Tomohiko ;; Keywords: Photo, image, album, HTML, WWW @@ -27,6 +27,8 @@ ;;; Code: +(defconst www-page-version "0.5") + (defvar www-page-coding-system (if (featurep 'chise) 'utf-8-jp-er @@ -67,20 +69,32 @@ (concat dest (substring string i)) coding-system)))) +(defun www-page-open-dir (url-dir &optional image-root) + (let* ((path (expand-file-name url-dir image-root)) + (desc-file (expand-file-name "dir.desc" path))) + (cons (cons 'location path) + (with-temp-buffer + (when (file-exists-p desc-file) + (insert-file-contents desc-file) + (read (current-buffer))))))) + +(defun www-page-directory-image-files (url-dir image-root) + (let (source-images) + (dolist (file (directory-files (expand-file-name url-dir image-root) + nil "\\.\$jpg\\|JPG\$$" nil t)) + (unless (string-match "_[^_]+GA[^_]*$" + (file-name-sans-extension file)) + (setq source-images (cons file source-images)))) + (nreverse source-images))) + (defun www-page-display-dir (url-dir &optional size image-root - lang title parent-url hide-cgi) + lang title parent-url hide-cgi + pivot-mode) (setq url-dir (file-name-as-directory url-dir)) (princ "Content-Type: text/html; charset=UTF-8 ") - (let* ((desc-file - (expand-file-name "dir.desc" - (expand-file-name url-dir image-root))) - (params - (with-temp-buffer - (when (file-exists-p desc-file) - (insert-file-contents desc-file) - (read (current-buffer))))) + (let* ((params (www-page-open-dir url-dir image-root)) source-images ref-images file i ref-file prev-file next-file file-desc note) @@ -94,6 +108,9 @@ (setq source-images (cdr source-images))) (when (setq ref-images (assq 'refs params)) (setq ref-images (cdr ref-images))) + (unless (or source-images ref-images) + (setq source-images + (www-page-directory-image-files url-dir image-root))) (when (setq note (assq 'note params)) (setq note (cdr note))) (when (setq parent-url (assq 'exit params)) @@ -111,10 +128,19 @@ (insert "\n") (insert "\n") (insert (format "

%s

\n" title)) - (insert "

") + (cond + ((or (eq lang 'ja) + (string= lang "ja")) + (insert + "[Note] サムネイルをクリックすると大きな画像が表示されます +

+") + ) + (t + (insert (format "lang = %s
\n" lang)))) (dolist (image-file source-images) (setq file (file-name-nondirectory image-file)) (insert "" + (insert (format ".html.%s&size=%s&p=%s\">" (or lang 'en) - (or size 'VGA))) + (or size 'VGA) + (or pivot-mode t))) (insert (format " $\"%s\"$ Return]\n" parent-url))) + (insert + (format "

+Powered by MnjAlbum WWW-Page Version %s." www-page-version)) (insert " @@ -195,9 +225,12 @@ ))) (defun www-page-display-page (file &optional size image-root - lang prev-file next-file hide-cgi) + lang prev-file next-file hide-cgi + pivot-mode) (if (stringp size) (setq size (intern size))) + (if (stringp pivot-mode) + (setq pivot-mode (intern pivot-mode))) (if (stringp lang) (setq lang (intern lang))) (princ "Content-Type: text/html; charset=UTF-8 @@ -223,24 +256,29 @@ (when (file-exists-p desc-file) (insert-file-contents desc-file) (read (current-buffer))))) - dir-desc-file + ;; dir-desc-file image-file image-ref prev-file next-file prev-grade next-grade rest spec ret) (unless params - (setq dir-desc-file - (expand-file-name "dir.desc" - (expand-file-name (file-name-directory file) - image-root))) + ;; (setq dir-desc-file + ;; (expand-file-name "dir.desc" + ;; (expand-file-name (file-name-directory file) + ;; image-root))) (setq params - (with-temp-buffer - (when (file-exists-p dir-desc-file) - (insert-file-contents dir-desc-file) - (read (current-buffer))))) + (www-page-open-dir (file-name-directory file) image-root) + ;; (with-temp-buffer + ;; (when (file-exists-p dir-desc-file) + ;; (insert-file-contents dir-desc-file) + ;; (read (current-buffer)))) + ) (unless (assq 'refs params) - (when (setq rest (assq 'files params)) - (setq rest (cdr rest))) + (if (setq rest (assq 'files params)) + (setq rest (cdr rest)) + (setq rest + (www-page-directory-image-files + (file-name-directory file) image-root))) (setq ret (file-name-nondirectory file)) (while (and rest (not (string= (car rest) ret))) @@ -277,10 +315,11 @@ (insert "" + (insert (format "%s.html.%s&size=%s&p=%s\">" prev-file (or lang 'en) - size)) + size + pivot-mode)) ) (cond ((eq lang 'ja) (insert "[前]") @@ -296,10 +335,11 @@ (insert "" + (insert (format "%s.html.%s&size=%s&p=%s\">" next-file (or lang 'en) - size)) + size + pivot-mode)) ) (cond ((eq lang 'ja) (insert "[次]") @@ -315,10 +355,11 @@ (insert "" + (insert (format "%s.html.%s&size=%s&p=%s\">" (file-name-nondirectory file) (or lang 'en) - prev-grade)) + prev-grade + pivot-mode)) ) (cond ((eq lang 'ja) (insert "[縮小]") @@ -334,10 +375,11 @@ (insert "" + (insert (format "%s.html.%s&size=%s&p=%s\">" (file-name-nondirectory file) (or lang 'en) - next-grade)) + next-grade + pivot-mode)) ) (cond ((eq lang 'ja) (insert "[拡大]") @@ -356,23 +398,25 @@ (insert "" + (insert (format "%s.html.%s&size=%s&p=%s\">" next-file (or lang 'en) - size)) + size + pivot-mode)) ) (cond (image-ref (insert - (format " $\"%s\"$ " - file image-ref size)) + (format " $\"%s\"$ " + file image-ref size pivot-mode)) ) (t ; (file-exists-p (expand-file-name image-file image-root)) (insert (format " $\"%s\"$ " - (file-name-nondirectory image-file) size)) + (insert (format "%s&size=%s&p=%s\">" + (file-name-nondirectory image-file) + size pivot-mode)) ) (t (insert "

") @@ -399,9 +443,22 @@ (insert "[index]" + (insert (format "&lang=%s&size=%s&p=%s\">%s" (or lang 'en) - size)) + size + pivot-mode + (cond ((eq lang 'ja) + "[index] に戻る") + (t + "[index]")))) + (insert + (cond ((eq lang 'ja) + "（変更した大きさは維持されます）") + (t + ""))) + (insert + (format "

+Powered by MnjAlbum WWW-Page Version %s." www-page-version)) (insert " @@ -410,38 +467,64 @@ (princ (buffer-string)) )) -(defun www-page-display-image (file &optional size image-root) +(defun www-page-display-image (file &optional size image-root pivot-mode) + (if (stringp pivot-mode) + (setq pivot-mode (intern pivot-mode))) (setq file (expand-file-name file image-root)) (when (file-exists-p file) (let (file-dir file-name resized-file resized-dir - spec width height) + spec width height + orig-width orig-height + size-opt) + (setq size (intern size)) (cond - (size + ((and size + (setq spec (assq size www-page-size-specs)) + (setq width (nth 1 spec)) + (setq height (nth 2 spec))) (setq file-dir (file-name-directory file) file-name (file-name-nondirectory file)) + (setq size-opt + (or (when (and (eq pivot-mode t) + (> width height)) + (with-temp-buffer + (call-process "identify" nil t nil file) + (goto-char (point-min)) + (if (re-search-forward + "^[^ ]+ [^ ]+ \$[0-9]+\$x\$[0-9]+\$ " nil t) + (setq orig-width (string-to-int + (match-string 1)) + orig-height (string-to-int + (match-string 2))))) + (if (> orig-height orig-width) + 'p)) + "")) (setq resized-file - (expand-file-name - file-name - (setq resized-dir - (expand-file-name - size file-dir)))) + (format "%s_%s%s.%s" + (file-name-sans-extension file) + size size-opt + (file-name-extension file))) (unless (file-exists-p resized-file) - (setq size (intern size)) - (if (and (setq spec (assq size www-page-size-specs)) - (setq width (nth 1 spec)) - (setq height (nth 2 spec))) - (progn - (condition-case nil - (unless (file-exists-p resized-dir) - (make-directory resized-dir)) - (error nil)) - (call-process - "convert" nil nil nil - "-resize" (format "%dx%d>" width height) - file resized-file) - ) - (setq resized-file file))) + (setq resized-file + (expand-file-name + file-name + (setq resized-dir + (expand-file-name + (format "%s%s" size size-opt) + file-dir)))) + (unless (file-exists-p resized-file) + (condition-case nil + (unless (file-exists-p resized-dir) + (make-directory resized-dir)) + (error nil)) + (call-process + "convert" nil nil nil + "-resize" + (if (eq size-opt 'p) + (format "%dx%d>" height width) + (format "%dx%d>" width height)) + file resized-file))) ;; (princ resized-file) (setq file resized-file) ) @@ -465,7 +548,7 @@ ;; '(iso-7 iso-8-2 utf-8 big5 shift-jis ;; iso-8-designate iso-8-1 iso-lock-shift no-conversion)) ;; (set-coding-category-system 'utf-8 'utf-8-jp) - (let (target params method size key image-root lang ret hide-cgi) + (let (target params method size pivot-mode key image-root lang ret hide-cgi) (let ((rest (car command-line-args-left)) arg val) (if rest @@ -500,7 +583,11 @@ (null (file-name-extension target))) 'dir))) ;; (setq file (car (cdr (assoc "file" params)))) - (setq size (car (cdr (assoc "size" params)))) + (setq size (or (car (cdr (assoc "size" params))) + 'VGA)) + (setq pivot-mode t) + (if (setq ret (cdr (assoc "p" params))) + (setq pivot-mode (car ret))) (if (setq ret (cdr (assoc "lang" params))) (setq lang (car ret))) (setq command-line-args-left (cdr command-line-args-left)) @@ -513,14 +600,14 @@ (setq command-line-args-left (cdr command-line-args-left)) (cond ((eq method 'dir) (www-page-display-dir target size image-root lang - nil nil hide-cgi) + nil nil hide-cgi pivot-mode) ) ((eq method 'page) (www-page-display-page target size image-root lang - nil nil hide-cgi) + nil nil hide-cgi pivot-mode) ) (t - (www-page-display-image target size image-root) + (www-page-display-image target size image-root pivot-mode) ) )))