fix comment after review

Author: bondiano

otus-16/src/otus_16/homework.clj

@@ -4,10 +4,12 @@
    [clojure.string :as str]
    [clojure.core.reducers :as r]))
 
+(def log-regex
+  #"^([\d+.]+) (\S+) (\S+) (\[[\w+/]+:[\w+:]+ \+\d+\]) \"(.+?)\" (\d{3}) (\d+) \"([^\"]+)\" \"(.+?)\"")
+
 (defn parse-log
   [^String log]
-  (let [regex #"^([\d+.]+) (\S+) (\S+) (\[[\w+/]+:[\w+:]+ \+\d+\]) \"(.+?)\" (\d{3}) (\d+) \"([^\"]+)\" \"(.+?)\""
-        [_ ip user-name date-time request response size referer user-agent] (re-find regex log)]
+  (let [[_ ip user-name date-time request response size referer user-agent] (re-find log-regex log)]
     {:ip ip
      :user-name user-name
      :date-time date-time
@@ -19,28 +21,31 @@
 
 (defn get-logs-paths
   [dir-path]
- (->> (io/as-file dir-path)
-      (.listFiles)
-      (filter #(.isFile %))
-      (map #(.getPath %))))
+  (->> (io/as-file dir-path)
+       (file-seq)
+       (filter #(.isFile %))))
 
 (defn read-logs
   [logs]
   (map #(io/reader %) logs))
 
+(defn ->url [log]
+  (-> log :request (str/split #" ") first))
+
 (defn filter-by-url
   [url logs]
   (if (= url :all)
     logs
-    (letfn [(->url [log] (-> log :request (str/split #" ") second))]
-      (r/filter #(= url (->url %)) logs))))
+    (r/filter #(= url (->url %)) logs)))
+
+(defn ->referer [log]
+  (-> log :referer))
 
 (defn filter-by-referer
   [referer logs]
   (if (= referer :all)
     logs
-    (letfn [(->referer [log] (-> log :referer))]
-      (r/filter #(= referer (->referer %)) logs))))
+    (r/filter #(= referer (->referer %)) logs)))
 
 (defn close-logs
   [logs]
@@ -59,31 +64,26 @@
        (r/map #(parse-int-safe (:size %)))
        (r/fold +)))
 
+(defn process-partition
+  [logs {:keys [url referrer]}]
+  (->> logs
+       (map parse-log)
+       (filter-by-url url)
+       (filter-by-referer referrer)))
+
 (defn sum-partition
   [partition]
   (reduce #(+ %1 (sum-size %2))
           0
           partition))
 
 (defn process-log
-   [log-file &
-    {:keys [url referrer]}]
-    (->> log-file
-         (line-seq)
-         (partition-all 5000)
-         (pmap #(map parse-log %))
-         (filter-by-url url)
-         (filter-by-referer referrer)
-         (sum-partition)))
-
-(comment
-  (time
-   (let [file (io/reader "./logs/access.log.2")]
-     (-> file
-          (process-log {:url :all :referrer :all})
-          (println))
-     (.close file))))
-
+  [log-file filter-params]
+  (->> log-file
+       (line-seq)
+       (partition-all 5000)
+       (pmap #(process-partition % filter-params))
+       (sum-partition)))
 
 (defn solution
   [& {:keys [url referrer]
@@ -92,14 +92,14 @@
                  get-logs-paths
                  read-logs)]
     (->> logs
-         (pmap #(process-log % :url url :referrer referrer))
+         (pmap #(process-log % {:url url :referrer referrer}))
          (reduce +)
          (println "Bytes:"))
     (close-logs logs)))
 
 (comment
  ;; возможные вызовы функции
- (time (solution))
- (solution :url "some-url")
- (solution :referrer "some-referrer")
- (solution :url "some-url" :referrer "some-referrer"))
+  (time (solution))
+  (solution :url "some-url")
+  (solution :referrer "some-referrer")
+  (solution :url "some-url" :referrer "some-referrer"))

otus-16/test/otus_16/homework_test.clj

@@ -1,6 +1,19 @@
 (ns otus-16.homework-test
   (:require [clojure.test :refer :all]
-            [otus-16.core :refer :all]))
+            [otus-16.homework :as sut]))
 
 
+(def stub-row "66.249.68.12 - - [20/Sep/2020:22:11:20 +0000] \"GET /%D0%BC%D0%B0%D0%BB%D0%B5%D0%BD%D1%8C%D0%BA%D0%B8%D0%B9-%D0%BC%D0%B0%D0%BB%D1%8C%D1%87%D0%B8%D0%BA-%D0%BF%D0%BE-%D0%B8%D0%BC%D0%B5%D0%BD%D0%B8-%D0%9D%D1%83%D1%80%D0%B1%D0%B5%D0%BA-%D0%B6%D0%B8%D0%BB-%D0%B2-%D0%BD%D0%B5%D0%B1%D0%BE%D0%BB%D1%8C%D1%88%D0%BE%D0%B9/?p=2 HTTP/1.1\" 304 0 \"-\" \"Mozilla/5.0 (Linux; Android 6.0.1; Nexus 5X Build/MMB29P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.110 Mobile Safari/537.36 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)\" \"-\"")
 
+(deftest parse-log-test
+  (testing "parse-log"
+    (is (= {:ip "66.249.68.12"
+            :user-name "-",
+           :date-time "-",
+           :request "[20/Sep/2020:22:11:20 +0000]",
+           :response
+           "GET /%D0%BC%D0%B0%D0%BB%D0%B5%D0%BD%D1%8C%D0%BA%D0%B8%D0%B9-%D0%BC%D0%B0%D0%BB%D1%8C%D1%87%D0%B8%D0%BA-%D0%BF%D0%BE-%D0%B8%D0%BC%D0%B5%D0%BD%D0%B8-%D0%9D%D1%83%D1%80%D0%B1%D0%B5%D0%BA-%D0%B6%D0%B8%D0%BB-%D0%B2-%D0%BD%D0%B5%D0%B1%D0%BE%D0%BB%D1%8C%D1%88%D0%BE%D0%B9/?p=2 HTTP/1.1",
+           :size "304",
+           :referer "0",
+           :user-agent "-"}
+           (sut/parse-log stub-row)))))