Changeset 21126

Timestamp:

10/11/08 16:57:22 (8 weeks ago)

Author:

kiyoka

Message:

Added monthly index feature to blog-list page.

Location:

lang/gauche/oldtype/trunk

Files:

• Kahua/oldtype/oldtype/util.scm (modified) (2 diffs)
• Kahua/oldtype/oldtype/version.kahua (modified) (1 diff)
• command/blog (modified) (4 diffs)

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

@@ -56 +56 @@
           oldtype:utc->ago-string
           oldtype:grouping-blog-entries
+          oldtype:thumbnail-filter
           pretty-print-sexp))
 (select-module oldtype.util)
@@ -307 +308 @@
 
 
+;;
+;; test pattern:
+;;   (thumbnail-filter '("line 1"
+;;                       "line 2"
+;;                       "line 3"
+;;                       "line 4"
+;;                       "##(amazon 4873113482)       ##(img-s ../img/abc.jpg)"
+;;                       "! ##(youtube 4873113482)    ##(img-m ../img/abc.jpg)"
+;;                       ))
+;; result:
+;;  "##(img-s ../img/abc.jpg)  ##(amazon-s 4873113482) "
+;; 
+(define (oldtype:thumbnail-filter str-list)
+  (let1 ret '()
+        (for-each
+         (lambda (line)
+           (when (not (#/^[!]/ line))
+             (regexp-replace-all
+              #/##\((img|img-s|img-m|youtube|youtube-s|youtube-m|amazon|amazon-s|amazon-m)[ ]+([^\)]+)\)/
+              line
+              (lambda (m)
+                (push! ret (list
+                            (rxmatch-substring m 1)
+                            (rxmatch-substring m 2)))))))
+         str-list)
+        (string-join
+         (map
+          (lambda (x)
+            (let1 command-pair (string-split (car x) #\-)
+                  (string-append
+                   "##(" (car command-pair) "-s " (cadr x) ") ")))
+          (reverse ret)))))
+
+
 (provide "oldtype/util")

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

@@ -7 +7 @@
 
 ;;---------------------------------------------------------
-(define *oldtype-version* "0.3.4")
+(define *oldtype-version* "0.3.5")

lang/gauche/oldtype/trunk/command/blog

@@ -39 +39 @@
              (for-each
               (lambda (line)
-                (if (#/##\(comment\)/ line)
+                (if (and (#/##\(comment\)/ line) (not (#/^[!]/ line)))
                     (print (string-append "comment please => [[" (oldtype:otpath->wikiname filename) "]]"))
                     (print line)))
@@ -47 +47 @@
       (newline))))
 
-;;
-;; test pattern:
-;;   (thumbnail-filter '("line 1"
-;;                       "line 2"
-;;                       "line 3"
-;;                       "line 4"
-;;                       "##(amazon 4873113482)       ##(img-s ../img/abc.jpg)"
-;;                       "! ##(youtube 4873113482)    ##(img-m ../img/abc.jpg)"
-;;                       ))
-;; result:
-;;  "##(img-s ../img/abc.jpg)  ##(amazon-s 4873113482) "
-;; 
-(define (thumbnail-filter str-list)
-  (let1 ret '()
-        (for-each
-         (lambda (line)
-           (when (not (#/^!/ line))
-             (regexp-replace-all
-              #/##\((img|img-s|img-m|youtube|youtube-s|youtube-m|amazon|amazon-s|amazon-m)[ ]+([^\)]+)\)/
-              line
-              (lambda (m)
-                (push! ret (list
-                            (rxmatch-substring m 1)
-                            (rxmatch-substring m 2)))))))
-         str-list)
-        (string-join
-         (map
-          (lambda (x)
-            (let1 command-pair (string-split (car x) #\-)
-                  (string-append
-                   "##(" (car command-pair) "-s " (cadr x) ") ")))
-          (reverse ret)))))
 
-
-(define (output-blog-list save-filename entrylist)
+(define (output-blog-list save-filename group-entries)
   (with-output-to-file save-filename
     (lambda ()
+      (print "  Past blog entries. ")
       (for-each
-       (lambda (filename)
-         (with-input-from-file (string-append (oldtype:editpath) "/" filename)
-           (lambda ()
-             (when (#/[.][0-9]+/ filename)
-               (display
-                (string-append "- [[" (oldtype:otpath->wikiname filename) "]]"))
-               (let* ((lst (port->string-list (current-input-port)))
-                      (image-line (thumbnail-filter lst)))
-                 (print (car lst)) ;; first line
-                 (when (< 0 (string-length image-line))
-                   (print image-line)))))))
-       entrylist))))
+       (lambda (group)
+         (let ((month_year (car group))
+               (entries    (cdr group)))
+           (print 
+            (string-append "* [[!" (oldtype:user-local) ".blog." #?=month_year "]]"))
+           (for-each
+            (lambda (filename)
+              (with-input-from-file (string-append (oldtype:editpath) "/" filename)
+                (lambda ()
+                  (when (#/[.][0-9]+/ #?=filename)
+                    (display
+                     (string-append "-   [[" (oldtype:otpath->wikiname filename) "]]"))
+                    (let* ((lst (port->string-list (current-input-port)))
+                           (image-line (oldtype:thumbnail-filter lst)))
+                      (print (car lst)) ;; first line
+                      (when (< 0 (string-length image-line))
+                        (print image-line)))))))
+            (reverse (sort entries)))))
+       group-entries))))
 
 
@@ -106 +81 @@
                "")
   (output-blog-list (string-append ot-blog ".list.ot")
-                    (ot-blog-entrylist))
+                    (sort 
+                     (oldtype:grouping-blog-entries
+                      (ot-blog-entrylist))
+                     (lambda (x y) (string>? (car x) (car y)))))
+
   (for-each
    (lambda (x)
@@ -118 +97 @@
    (oldtype:grouping-blog-entries
     (ot-blog-entrylist)))
-
+  
   (exit 0))