Changeset 8607

Timestamp:

04/01/08 20:59:52 (5 years ago)

Author:

kiyoka

Message:

Supported ##(timestamp utc) and #(since utc) command.
Supported timezone of RecentPages's date.

Location:

lang/gauche/oldtype/trunk

Files:

• Kahua/oldtype/Makefile (modified) (1 diff)
• Kahua/oldtype/oldtype/oldtype.kahua (modified) (1 diff)
• Kahua/oldtype/oldtype/pasttime.scm (added)
• Kahua/oldtype/oldtype/util.kahua (modified) (4 diffs)
• Kahua/oldtype/oldtype/util.scm (modified) (4 diffs)
• Kahua/oldtype/plugins/oldtype.scm (modified) (1 diff)
• bin/ot_RecentChanges (modified) (1 diff)

lang/gauche/oldtype/trunk/Kahua/oldtype/Makefile

@@ -36 +36 @@
 
 TEST_DIR    = $(PWD)
-SCRIPTFILES = $(package)/$(package).kahua $(package)/version.kahua $(package)/util.kahua $(package)/format.scm $(package)/kahualib.scm $(package)/parse.scm $(package)/util.scm
+SCRIPTFILES = $(package)/$(package).kahua $(package)/version.kahua $(package)/util.kahua $(package)/format.scm $(package)/kahualib.scm $(package)/parse.scm $(package)/util.scm $(package)/pasttime.scm
 STATICFILES = $(package)/$(package).css $(package)/staticimg/*.png $(package)/*.el $(package)/import/*.js  $(package)/$(package).js
 

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/oldtype.kahua

@@ -11 +11 @@
 (use oldtype.util)
 (use oldtype.kahualib)
+(use oldtype.pasttime)
 (use srfi-1)
+(use srfi-19)
 (load "oldtype/version.kahua")
 (load "oldtype/util.kahua")

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/util.kahua

@@ -295 +295 @@
            (p/ "!!Error : No argument ##(amazon URL) command")))
       
+      ;; timestamp
+      ((timestamp)
+       (if (< 0 len)
+           (let* ((_utc    (car arg))
+                  (d (time-utc->date
+                      (seconds->time
+                       (string->number
+                        _utc)))))
+             (text/ (string-append (date->string d "~Y-~m-~d ~I:~M ~p (~z)"))))
+           (p/ "!!Error : No argument ##(timestamp UTC) command")))
+
+      ;; timestamp
+      ((since)
+       (if (< 0 len)
+           (let1 _utc (car arg)
+                 (text/ 
+                  (format "(~a ago)"
+                          (string-append
+                           (how-long-since 
+                            (string->number
+                             _utc))))))
+           (p/ "!!Error : No argument ##(since UTC) command")))
+
       ;; download link oldtype-mode.el source code
       ((download-el)
@@ -301 +324 @@
       (else
        `(p/ ,(format "!!Error : no such macro \"~a\"!!" command))))))
+
+
+(define (oldtype:timeago seconds)
+  (format "~d" (/ seconds 60)))
 
 
@@ -346 +373 @@
          (filter (lambda (x) (= 1 (modulo (car x) 2)))  alist))))
 
-(define (oldtype:get-fqdn)
-  (assq-ref (oldtype:kahua-app-args) 'fqdn))
+(define (oldtype:get-arguments sym)
+  (assq-ref (oldtype:kahua-app-args) sym))
 
 (define (oldtype:hatena-bookmarks wikiname)
@@ -354 +381 @@
                  (oldtype:gen-page-path wikiname))
         (node-set/
-         (a/ (@/ (href (string-append "http://b.hatena.ne.jp/entry/http://" (oldtype:get-fqdn) path)))
+         (a/ (@/ (href (string-append "http://b.hatena.ne.jp/entry/http://" (oldtype:get-arguments 'fqdn) path)))
              (img/ (@/ (src "http://d.hatena.ne.jp/images/b_entry_de.gif"))))
-         (img/ (@/ (src (string-append "http://b.hatena.ne.jp/entry/image/http://" (oldtype:get-fqdn) path)))))))
+         (img/ (@/ (src (string-append "http://b.hatena.ne.jp/entry/image/http://" (oldtype:get-arguments 'fqdn) path)))))))

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/util.scm

@@ -108 +108 @@
 ;;   "2007-09-25T12:54:09.955196Z"
 ;; result:
-;;   ((nanosecond . 0) (second . 9) (minute . 54) (hour . 12) (day . 25) (month . 9) (year . 2007) (zone-offset . 0))
+;;   ((nanosecond . 0) (second . 9) (minute . 54) (hour . 12) (day . 25) (month . 9) (year . 2007) (zone-offset . 0) (utc . 1190724849))
+;;   
 (define (oldtype:date-string->date-alist str)
   (let* ((splitted (map string->number (string-split str #/[TZ.\-:]/)))
@@ -129 +130 @@
       (month       . ,(date-month date-object))
       (year        . ,(date-year date-object))
-      (zone-offset . ,(date-zone-offset date-object)))))
+      (zone-offset . ,(date-zone-offset date-object))
+      (utc         . ,(time->seconds (date->time-utc date-object))))))
+
 
 ;;=================================================
 ;; parse svn log
 ;;
-
 ;;
 ;; result format:
@@ -218 +220 @@
 (define (oldtype:parse-svninfo port)
   (define (date-string-as-current-locale str)
-    (date->string (string->date str "~Y-~m-~dT~H:~M:~S")
-                  "~1 ~3 (UTC)"))
+    (let* ((date-str (string-append (car (string-split str ".")) " +0000"))
+           (utc      (date->time-utc (string->date date-str "~Y-~m-~dT~H:~M:~S ~z"))))
+      (date->string (time-utc->date utc)
+                    "~Y-~m-~d ~I:~M ~p (~z)")))
+  (define (utc-as-current-locale str)
+    (number->string
+     (time->seconds
+      (date->time-utc
+       (string->date 
+        (string-append (car (string-split str ".")) " +0000")
+        "~Y-~m-~dT~H:~M:~S ~z")))))
   (let1 sxml
         (ssax:xml->sxml port '())
@@ -233 +244 @@
              (commit_date        . ,(date-string-as-current-locale 
                                      (sixth x)))
+             (commit_utc         . ,(utc-as-current-locale 
+                                     (sixth x)))
              ))
          (zip

lang/gauche/oldtype/trunk/Kahua/oldtype/plugins/oldtype.scm

@@ -14 +14 @@
 (allow-module oldtype.util)
 (allow-module oldtype.kahualib)
+(allow-module oldtype.pasttime)
 (allow-module rfc.uri)

lang/gauche/oldtype/trunk/bin/ot_RecentChanges

@@ -18 +18 @@
       eval ${line}
       name=`basename ${name} .ot`
-      echo "- CHANGED ${commit_date}: [[${name}]] by ([[${commit_author}]])"
+      echo "- ##(timestamp ${commit_utc}) ##(since ${commit_utc}): [[${name}]] by ([[${commit_author}]])"
   fi
 done | sort -r | head -${DISPLAY_LINES} > ${OT_EDITHOME}/edit/!RecentChanges.ot.tmp