@@ -12,7 +12,8 @@

 	       #:uiop

 	       #:yason)

   :serial t

-  :components ((:file "tools")

+  :components ((:file "package")

+	       (:file "tools")

 	       (:file "yason-encoders")

 	       (:file "encoders")

 	       (:file "feed-index-utils")

@@ -1,9 +1,3 @@

-(defpackage :alimenta.feed-archive.encoders

-  (:use :cl :alexandria :serapeum :fw.lu :alimenta.feed-archive.tools)

-  (:shadowing-import-from :alimenta.feed-archive.tools :->)

-  (:export :skip-item :the-condition :the-feed :feed-error

-	   :unwrap-feed-errors))

-

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

 (defun fix-path (path)

@@ -1,11 +1,5 @@

-(defpackage :alimenta.feed-archive

-  (:use :cl :alexandria :serapeum :fw.lu :alimenta.feed-archive.tools)

-  (:shadowing-import-from :alimenta.feed-archive.tools :->)

-  (:export #:init-feeds #:archive-feeds #:command-line-main))

-

 (in-package :alimenta.feed-archive)

-

 (defvar *feeds*)

 (defvar *feed-base*)

@@ -112,7 +106,8 @@

 	 (references (pull-and-store-feeds *feeds* pull-directory))

 	 (index-path (merge-pathnames "index.json" pull-directory)))

     (with-open-file (index index-path :direction :output)

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

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

+    (format t "~&!! pull-directory ~a~%" (uiop:enough-pathname pull-directory *feed-base*))))

 ;; This is an ungodly mess, we need to avoid funneling everything through fix-pathname-or-skip

 (defun command-line-main (&optional (feed-list-initializer #'init-feeds))

new file mode 100644

@@ -0,0 +1,18 @@

+(defpackage :alimenta.feed-archive.tools

+  (:use :cl :alexandria :serapeum :fw.lu)

+  (:shadow :->)

+  (:export :fix-pathname :sha256-string :get-id :older-than-a-week :-> :get-feed-store-name

+	   :store :get-item-store-name :restart-once :coerce-feed-link :with-retry

+	   :older-than-a-month))

+

+(defpackage :alimenta.feed-archive.encoders

+  (:use :cl :alexandria :serapeum :fw.lu :alimenta.feed-archive.tools)

+  (:shadowing-import-from :alimenta.feed-archive.tools :->)

+  (:export :skip-item :the-condition :the-feed :feed-error

+	   :unwrap-feed-errors))

+

+(defpackage :alimenta.feed-archive

+  (:use :cl :alexandria :serapeum :fw.lu :alimenta.feed-archive.tools)

+  (:shadowing-import-from :alimenta.feed-archive.tools :->)

+  (:export #:init-feeds #:archive-feeds #:command-line-main))

+

@@ -1,10 +1,3 @@

-(defpackage :alimenta.feed-archive.tools

-  (:use :cl :alexandria :serapeum :fw.lu)

-  (:shadow :->)

-  (:export :fix-pathname :sha256-string :get-id :older-than-a-week :-> :get-feed-store-name

-	   :store :get-item-store-name :restart-once :coerce-feed-link :with-retry

-	   :older-than-a-month))

-

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

 (defgeneric store (item directory)