From: tomo <tomo>
Date: Thu, 6 Nov 2008 13:46:49 +0000 (+0000)
Subject: (iphoto-dir-format-time-range-as-album-dir): Use
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=340b2b96b750283d9c81fc63332c05ec381a7e8a;p=elisp%2Falbum.git

(iphoto-dir-format-time-range-as-album-dir): Use
<dd>h<dd>m<dd>s-<dd>h<dd>m<dd>s instead of
<dd>-<dd>-<dd>_<dd>-<dd>-<dd>.
(iphoto-dir-to-album-dir): Modify for <dd>h<dd>m<dd>s-<dd>h<dd>m<dd>s.
---

diff --git a/iphoto-util.el b/iphoto-util.el
index dcac895..27d9ed3 100644
--- 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)
@@ -140,9 +140,10 @@
 				   (mapconcat
 				    (lambda (time)
 				      (mapconcat #'identity
-						 (split-string time "-")
+						 (nbutlast
+						  (split-string time "[hms]"))
 						 ":"))
-				    (split-string a-dir-n "_")
+				    (split-string a-dir-n "-")
 				    "〜")))
                      ;; (cons 'files
                      ;;       (directory-files dir nil nil nil t))