Support for multi-file outputs (e.g, maildir)
This commit is contained in:
parent
56ce38a617
commit
e1c80f7e78
|
@ -86,6 +86,7 @@
|
||||||
|
|
||||||
|
|
||||||
(define (entry->string entry template)
|
(define (entry->string entry template)
|
||||||
|
(print (entry-templating-parameters entry template))
|
||||||
(named-format
|
(named-format
|
||||||
template
|
template
|
||||||
(append entry
|
(append entry
|
||||||
|
@ -154,7 +155,7 @@
|
||||||
(urls ,(map (lambda (link) (atom-link->string link atom))
|
(urls ,(map (lambda (link) (atom-link->string link atom))
|
||||||
(entry-links entry)))
|
(entry-links entry)))
|
||||||
(authors ,(if (null? entry-authors) feed-authors entry-authors))
|
(authors ,(if (null? entry-authors) feed-authors entry-authors))
|
||||||
(feed-title ,(feed-title atom)))))
|
(feed-title ,(last (feed-title atom))))))
|
||||||
|
|
||||||
|
|
||||||
;; The preferred/given URL for an atom feed
|
;; The preferred/given URL for an atom feed
|
||||||
|
@ -200,7 +201,7 @@
|
||||||
|
|
||||||
;; The UNIX-style frontend for feedsnake
|
;; The UNIX-style frontend for feedsnake
|
||||||
(module feedsnake-unix
|
(module feedsnake-unix
|
||||||
(update-feed-file latest-entries all-entries write-entry write-entries feed-files *mbox-template*)
|
(update-feed-file latest-entries all-entries write-entry write-entries entry-output-path feed-files *mbox-template* *maildir-template*)
|
||||||
|
|
||||||
(import scheme
|
(import scheme
|
||||||
(chicken base) (chicken condition) (chicken file) (chicken io)
|
(chicken base) (chicken condition) (chicken file) (chicken io)
|
||||||
|
@ -208,6 +209,7 @@
|
||||||
srfi-1 srfi-19
|
srfi-1 srfi-19
|
||||||
date-strings
|
date-strings
|
||||||
feedsnake feedsnake-helpers
|
feedsnake feedsnake-helpers
|
||||||
|
named-format
|
||||||
xattr)
|
xattr)
|
||||||
|
|
||||||
|
|
||||||
|
@ -225,7 +227,7 @@
|
||||||
"~{{~A||localhost||TO_HOST||HOSTNAME}}>"
|
"~{{~A||localhost||TO_HOST||HOSTNAME}}>"
|
||||||
"\n"
|
"\n"
|
||||||
"Subject: ~{{~A||Unnamed post||title}}\n"
|
"Subject: ~{{~A||Unnamed post||title}}\n"
|
||||||
"Date: ~{{~A||||updated||published}}\n"
|
"Date: ~{{~A||||updated-rfc228||published-rfc228}}\n"
|
||||||
"\n"
|
"\n"
|
||||||
"~{{~{~a~^, ~}~%***~%||||urls}}\n"
|
"~{{~{~a~^, ~}~%***~%||||urls}}\n"
|
||||||
"~{{~A||||summary}}\n"))
|
"~{{~A||||summary}}\n"))
|
||||||
|
@ -239,16 +241,6 @@
|
||||||
"\n"))
|
"\n"))
|
||||||
(multifile-output? #f)))
|
(multifile-output? #f)))
|
||||||
|
|
||||||
|
|
||||||
(define *html-template*
|
|
||||||
`((entry-template
|
|
||||||
"<li><b>~{{~A||Unnamed post||title}}</b> <i>~{{~A||||updated}}<i> <p>~{{~A||No summary||summary}}</p></li>")
|
|
||||||
(multifile-output? #f)
|
|
||||||
(output-header "<!DOCTYPE html>\n<html>\n<head>\n<title>~{{~A||Unnamed feed||title}}</title>\n</head>\n<body>")
|
|
||||||
(output-footer "</body></html>")
|
|
||||||
(multifile-output? #f)))
|
|
||||||
|
|
||||||
|
|
||||||
(define *default-template*
|
(define *default-template*
|
||||||
(append *maildir-template*
|
(append *maildir-template*
|
||||||
'((output-dir "./"))))
|
'((output-dir "./"))))
|
||||||
|
@ -257,26 +249,27 @@
|
||||||
'((output-dir "./")))
|
'((output-dir "./")))
|
||||||
|
|
||||||
(define *default-multifile-values*
|
(define *default-multifile-values*
|
||||||
'((filename-template "~{{~A||||updated||published}}.~{{~A||you||USER}}@~{{~A||localhost|HOSTNAME}}.~{{~A||||title||title}}")))
|
'((filename-template "~{{~A||||updated||published}}.~{{~A||you||USER}}@~{{~A||localhost|HOSTNAME}}")
|
||||||
|
(multifile-output? #t)))
|
||||||
|
|
||||||
(define *default-singlefile-values*
|
(define *default-singlefile-values*
|
||||||
'())
|
'((filename-template "feed.out")
|
||||||
|
(multifile-output? #f)))
|
||||||
|
|
||||||
|
|
||||||
;; Writes a given feed entry to the out-path, as per the feedsnake-unix-format template alist
|
;; Writes a given feed entry to the out-path, as per the feedsnake-unix-format template alist
|
||||||
(define (write-entry entry template-alist out-path)
|
(define (write-entry entry template-alist out-path)
|
||||||
(let ([file-mode (if (alist-car-ref 'multifile-output? template-alist) #:text #:append)]
|
(let ([template (if (alist-car-ref 'multifile-output? template-alist)
|
||||||
[header (or (alist-car-ref 'output-header template-alist) "")]
|
(append template-alist *default-multifile-values* *default-values*)
|
||||||
[footer (or (alist-car-ref 'output-footer template-alist) "")]
|
(append template-alist *default-singlefile-values* *default-values*))]
|
||||||
|
[file-mode (if (alist-car-ref 'multifile-output? template-alist) #:text #:append)]
|
||||||
[entry-w-env-vars (append (get-environment-variables) entry)])
|
[entry-w-env-vars (append (get-environment-variables) entry)])
|
||||||
(call-with-output-file
|
(call-with-output-file
|
||||||
out-path
|
(entry-output-path entry template out-path)
|
||||||
(lambda (out-port)
|
(lambda (out-port)
|
||||||
(write-string
|
(write-string
|
||||||
(string-append header
|
(entry->string entry-w-env-vars (alist-car-ref 'entry-template template))
|
||||||
(entry->string entry-w-env-vars (alist-car-ref 'entry-template template-alist))
|
#f
|
||||||
footer)
|
|
||||||
#f
|
|
||||||
out-port))
|
out-port))
|
||||||
file-mode)))
|
file-mode)))
|
||||||
|
|
||||||
|
@ -288,6 +281,33 @@
|
||||||
entries))
|
entries))
|
||||||
|
|
||||||
|
|
||||||
|
;; Decides the correct output path for an entry, given the template's filename rules etc.
|
||||||
|
(define (entry-output-path entry template-alist base-out-path)
|
||||||
|
(let ([multifile? (alist-car-ref 'multifile-output? template-alist)])
|
||||||
|
(if multifile?
|
||||||
|
(multifile-entry-path entry template-alist base-out-path)
|
||||||
|
(singlefile-entry-path entry template-alist base-out-path))))
|
||||||
|
|
||||||
|
|
||||||
|
(define (singlefile-entry-path entry template-alist base-out-path)
|
||||||
|
(if (directory-exists? base-out-path)
|
||||||
|
(signal
|
||||||
|
(make-property-condition
|
||||||
|
'exn 'location 'file
|
||||||
|
'message (string-append base-out-path " shouldn't be a directory.")))
|
||||||
|
base-out-path))
|
||||||
|
|
||||||
|
|
||||||
|
(define (multifile-entry-path entry template-alist base-out-path)
|
||||||
|
(let* ([file-leaf (named-format (alist-car-ref 'filename-template template-alist) entry)])
|
||||||
|
(if (create-directory base-out-path)
|
||||||
|
(string-append base-out-path "/" file-leaf)
|
||||||
|
(signal
|
||||||
|
(make-property-condition
|
||||||
|
'exn 'location 'file
|
||||||
|
'message (string-append base-out-path " either isn't accessible or isn't a directory."))))))
|
||||||
|
|
||||||
|
|
||||||
;; Switch the cached version of the feed with a newer version, if available
|
;; Switch the cached version of the feed with a newer version, if available
|
||||||
(define (update-feed-file feed-path)
|
(define (update-feed-file feed-path)
|
||||||
(let* ([old-string (call-with-input-file feed-path
|
(let* ([old-string (call-with-input-file feed-path
|
||||||
|
|
Ŝarĝante…
Reference in New Issue