From 0afb8f9c1402e7b75ebaba2d4eb9ec840c9dae45 Mon Sep 17 00:00:00 2001
From: Aaron Fischer <mail@aaron-fischer.net>
Date: Sat, 5 Dec 2015 22:32:22 +0100
Subject: [PATCH] Back in busines with a other lib (pull request pending ...)

---
 project.clj             |  2 ++
 src/mailhead/parser.clj | 37 +++++++++++--------------------------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/project.clj b/project.clj
index bc6a262..04789e2 100644
--- a/project.clj
+++ b/project.clj
@@ -22,6 +22,8 @@
                  [ring "1.4.0" :exclusions [ring/ring-jetty-adapter]]
                  [mount "0.1.5"]
                  [clj-time "0.11.0"]
+                 [io.forward/clojure-mail "1.0.3"]
+                 [macroz/tangle "0.1.9"]
                  [org.immutant/web "2.1.1" :exclusions [ch.qos.logback/logback-classic]]]
 
   :min-lein-version "2.0.0"
diff --git a/src/mailhead/parser.clj b/src/mailhead/parser.clj
index 98dc814..1a5e215 100644
--- a/src/mailhead/parser.clj
+++ b/src/mailhead/parser.clj
@@ -1,41 +1,26 @@
 (ns mailhead.parser
   (:require [clojure.string :as st]
             [clj-time.core :as time]
-            [clj-time.coerce :as timec])
-  (:use [clojure.contrib.java-utils :only [as-properties]]
-        [clojure.java.io :only [input-stream file]])
-  (:import 
-   (javax.mail Session)
-   (javax.mail.internet MimeMessage)
-   (javax.mail.internet InternetHeaders)))
-
-(def session
-  (Session/getDefaultInstance 
-   (as-properties [["mail.store.protocol" "imaps"]])))
-
-(defn all-headers [message]
-  (enumeration-seq (:allHeaders (bean message))))
+            [clj-time.coerce :as timec]
+            [clojure-mail.core :refer :all]
+            [clojure-mail.message :refer :all]))
 
 (defn received-headers [all-headers]
-  (map #(.getValue %) (filter (fn [header] (= "Received" (.getName header))) all-headers)))
+  (map #(first (vals %))
+       (filter (fn [header] (= "Received" (first (keys header)))) all-headers)))
 
 (defn parse-received-headers [received-header]
-  (let [datetime (str/trim (last (st/split received-header #";")))
+  (let [datetime (st/trim (last (st/split received-header #";")))
         ;; Hacky hacky, but no time to make this proper ...
         cleaned-date (st/trim (st/replace datetime #"(\(.*\)|  )" " "))]
     {:sender (nth (re-find #"\s*from ([^ ]+)" received-header) 1)
      :receiver (nth (re-find #"\s*by ([^ ]+)" received-header) 1)
      :time (timec/from-string cleaned-date)}))
 
-(defn extract-relevant-stuff [mime-message]
-  (->> mime-message
-       all-headers
+(defn parse-from-file [filename]
+  (->> filename
+       file->message
+       read-message
+       :headers
        received-headers
        (map parse-received-headers)))
-
-(defn parse-from-string [email-string]
-  (let [email-stream (java.io.ByteArrayInputStream. (.getBytes email-string))]
-    (extract-relevant-stuff (MimeMessage. session email-stream))))
-
-(defn parse-from-file [filename]
-  (extract-relevant-stuff (MimeMessage. session (input-stream filename))))