update.

[elisp/album.git] / iphoto-util.el

diff --git a/iphoto-util.el b/iphoto-util.el
index 1321b7d..27d9ed3 100644 (file)
--- a/iphoto-util.el
+++ b/iphoto-util.el
@@ -76,15 +76,15 @@
 (defun iphoto-dir-format-time-range-as-album-dir (range year month day)
   (let ((time-min (decode-time (car range)))
        (time-max (decode-time (cdr range))))
-    (format "%s_%s"
+    (format "%s-%s"
            (if (and (= (nth 3 time-min) day)
                     (= (nth 4 time-min) month)
                     (= (nth 5 time-min) year))
-               (format "%02d-%02d-%02d"
+               (format "%02dh%02dm%02ds"
                        (nth 2 time-min)
                        (nth 1 time-min)
                        (nth 0 time-min))
-             (format "%d-%02d-%02d-%02d-%02d-%02d"
+             (format "%d-%02d-%02d-%02dh%02dm%02ds"
                      (nth 5 time-min)
                      (nth 4 time-min)
                      (nth 3 time-min)
@@ -94,11 +94,11 @@
            (if (and (= (nth 3 time-max) day)
                     (= (nth 4 time-max) month)
                     (= (nth 5 time-max) year))
-               (format "%02d-%02d-%02d"
+               (format "%02dh%02dm%02ds"
                        (nth 2 time-max)
                        (nth 1 time-max)
                        (nth 0 time-max))
-             (format "%d-%02d-%02d-%02d-%02d-%02d"
+             (format "%d-%02d-%02d-%02dh%02dm%02ds"
                      (nth 5 time-max)
                      (nth 4 time-max)
                      (nth 3 time-max)
@@ -107,7 +107,8 @@
                      (nth 0 time-max))))))
 
 (defun iphoto-dir-to-album-dir (year month day album-name
-                                    url-root album-dir-root)
+                                    album-dir-root url-root image-url-root
+                                    album-url-prefix)
   (let ((coding-system-for-write 'utf-8-jp-er)
        (album-dir-base (expand-file-name album-name album-dir-root))
        album-dir album-dir-original ret a-dir-n a-dirs)
@@ -139,27 +140,38 @@
                                   (mapconcat
                                    (lambda (time)
                                      (mapconcat #'identity
-                                                (split-string time "-")
+                                                (nbutlast
+                                                 (split-string time "[hms]"))
                                                 ":"))
-                                   (split-string a-dir-n "_")
+                                   (split-string a-dir-n "-")
                                    "\e$B!A\e(B")))
-                    (cons 'files
-                          (directory-files dir nil nil nil t))
-                    (cons 'exit album-name))))
+                     ;; (cons 'files
+                     ;;       (directory-files dir nil nil nil t))
+                    (cons 'exit (concat album-url-prefix album-name)))))
        (write-region (point-min)(point-max)
                      (expand-file-name "dir.desc" album-dir)))
-      (unless (file-exists-p album-dir-original)
-       (make-directory album-dir-original 'parents))
       (dolist (file (directory-files
                     (expand-file-name
                      (file-name-nondirectory dir)
                      (format "~/Pictures/iPhoto Library/Originals/%d/"
                              year))
                     'full nil 'no-sort t))
-       (call-process "cp" nil nil nil
-                     "-al" 
-                     file
-                     album-dir-original))
+       (cond
+        ((string= (downcase (file-name-extension file)) "jpg")
+         (unless (file-exists-p album-dir-original)
+           (make-directory album-dir-original 'parents))
+         (call-process "cp" nil nil nil
+                       "-al" 
+                       file
+                       album-dir-original)
+         )
+        (t
+         (call-process "cp" nil nil nil
+                       "-al" 
+                       file
+                       album-dir)
+         ))
+       )
       (call-process "chgrp" nil nil nil
                    "-R" "www-data"
                    album-dir)
@@ -191,7 +203,7 @@
       >%s</a>
 "
                        url-root album-name sub-url
-                       url-root album-name sub-url
+                       image-url-root album-name sub-url
                        (progn
                          (setq ret
                                (directory-files
@@ -218,4 +230,3 @@
                    (expand-file-name
                     "index.html.ja.utf-8" album-dir-base))
       )))
-                 
\ No newline at end of file