src/unix.lisp

@@ -41,48 +41,32 @@
 ;; NIL → NIL
 (defun main ()
   "Actual invocation of the program. This is what you should set as :toplevel."
-  (error-print
-   99 ""
-   (multiple-value-bind (opts free) (opts:get-opts)
-     (when-opt opts :help (help))
-     (let* ((input-file   (car free))
-            (url-base     (or (getf opts :url-base) (getf opts :download-dir) "mirror/"))
-            (download-dir (or (getf opts :download-dir) url-base)))
-       (when (not input-file)
-         (error-print 1 "No HTML file provided. Use --help for more information."))
-       (format
-        't
-        (mirror-img:mirror-img
-         (pathname input-file)
-         download-dir
-         :url-dir url-base))))))
+  (multiple-value-bind (opts free) (opts:get-opts)
+    (when-opt opts :help (help))
+    (let* ((input-stream (pathname (car free))))
+      (when (not input-stream)
+        (format *error-output* "No file provided.~%")
+        (help 2))
+
+      (format
+       't
+       (mirror-img:mirror-img
+        input-stream
+        #p"mirror/")))))
 
 (opts:define-opts
   (:name :help
    :description "print this help text."
    :short #\h  :long "help")
-  (:name :url-base
-   :description "path to mirror directory used in URLs"
-   :short #\b :long "base")
-  (:name :download-dir
+  (:name :base
    :description "directory for all mirrored files"
-   :short #\d :long "downloads"
-   :arg-parser
-         (lambda (dir)
-           (handler-case
-               (ensure-directories-exist dir)
-             (error (c)
-               (error-print 11 "Could not access or create directory." c))))))
+   :short #\b :long "base"
+   :arg-parser (lambda (dir)
+                 (car (directory dir)))))
 
 ;; number stream → nil
 (defun help (&optional (exit-code 0) (stream *standard-output*))
   "Prints help message and dies."
-  (unix-opts:describe :prefix "usage: mirror-img [-h] [-d DIR] [-b BASE] HTML_FILE"
+  (unix-opts:describe :prefix "usage: mirror-img [-h] [-b DIR] HTML_FILE"
                       :stream stream)
   (unix-opts:exit exit-code))
-
-;; number string condition → nil
-(defun error-print (exit-code &optional message condition)
-  "Print an error-message and exit."
-  (format *error-output* "~@[~A~%~]~@[~A~%~]" message condition)
-  (unix-opts:exit exit-code))