@@ -15,5 +15,6 @@

   :components ((:file "tools")

 	       (:file "yason-encoders")

 	       (:file "encoders")

+	       (:file "feed-index-utils")

 	       (:file "feed-archive")))

@@ -12,42 +12,6 @@

 (defparameter +dirname-format+

   '((:year 4) #\- (:month 2) #\- (:day 2) #\/ (:hour 2) #\- (:min 2) #\/))

-(defclass feed-index ()

-  ((%pull-time :initarg :pull-time :reader pull-time)

-   ;; Why this slot? Won't the references duplicate this?

-   (%feed-references :initarg :references :reader references)))

-

-(defclass feed-reference ()

-  ((%url :initarg :url :reader url)

-   (%title :initarg :title :reader title :initform nil)

-   (%path :initarg :path :reader path :initform nil)))

-

-(defun make-feed-index (pull-time references)

-  (make-instance 'feed-index

-		 :pull-time pull-time

-		 :references (copy-seq references)))

-

-(defun make-feed-reference (url &rest feed-data &key title path)

-  (declare (ignore title path))

-  (apply #'make-instance 'feed-reference

-	 :url url feed-data))

-

-(defmethod yason:encode-slots progn ((object feed-reference))

-  (let ((title (title object))

-	(path (path object)))

-    (yason:encode-object-element "url" (url object))

-    (when title

-      (yason:encode-object-element "title" title))

-    (when path

-      (yason:encode-object-element "path" path))))

-

-(defmethod yason:encode-slots progn ((object feed-index))

-  (with-accessors ((pull-time pull-time) (references references)) object

-    (yason:encode-object-element "pull-time" (local-time:format-timestring nil pull-time))

-    (yason:with-object-element ("feeds")

-      (yason:with-array ()

-	(mapcar 'yason:encode-object references)))))

-

 (defun get-store-directory-name (timestamp)

   (flet ((make-dirname (timestamp)

 	   (-> (local-time:format-timestring nil (local-time:timestamp-minimize-part timestamp :sec)

new file mode 100644

@@ -0,0 +1,37 @@

+(in-package :alimenta.feed-archive)

+

+(defclass feed-index ()

+  ((%pull-time :initarg :pull-time :reader pull-time)

+   ;; Why this slot? Won't the references duplicate this?

+   (%feed-references :initarg :references :reader references)))

+

+(defclass feed-reference ()

+  ((%url :initarg :url :reader url)

+   (%title :initarg :title :reader title :initform nil)

+   (%path :initarg :path :reader path :initform nil)))

+

+(defun make-feed-index (pull-time references)

+  (make-instance 'feed-index

+		 :pull-time pull-time

+		 :references (copy-seq references)))

+

+(defun make-feed-reference (url &rest feed-data &key title path)

+  (declare (ignore title path))

+  (apply #'make-instance 'feed-reference

+	 :url url feed-data))

+

+(defmethod yason:encode-slots progn ((object feed-reference))

+  (let ((title (title object))

+	(path (path object)))

+    (yason:encode-object-element "url" (url object))

+    (when title

+      (yason:encode-object-element "title" title))

+    (when path

+      (yason:encode-object-element "path" path))))

+

+(defmethod yason:encode-slots progn ((object feed-index))

+  (with-accessors ((pull-time pull-time) (references references)) object

+    (yason:encode-object-element "pull-time" (local-time:format-timestring nil pull-time))

+    (yason:with-object-element ("feeds")

+      (yason:with-array ()

+	(mapcar 'yason:encode-object references)))))