Adjust folder structure

Author: rollacaster

deps.edn

@@ -1,4 +1,4 @@
 {:deps {org-parser/org-parser {:mvn/version "0.1.5"}
         rhizome/rhizome {:mvn/version "0.2.9"}}
- :paths ["src/main" "resources"]
- :aliases {:test {:extra-paths ["src/test"]}}}
+ :paths ["src" "resources"]
+ :aliases {:test {:extra-paths ["test"]}}}

src/main/tech/thomas_sojka/org_parser_tree/core.clj renamed to src/tech/thomas_sojka/org_parser_tree/core.clj

@@ -1,15 +1,15 @@
-(ns tech.thomas-sojka.org-parser-tree.output
-  (:require [clojure.java.io :as io]
-            [clojure.pprint :as pp]
-            [rhizome.viz :as viz]))
-
-(defn store-tree [path data]
-  (binding [*print-level* nil
-            *print-length* nil]
-    (io/make-parents path)
-    (pp/pprint data (io/writer path))))
-
-(defn vizualize-tree [root]
-  (viz/view-tree (comp sequential? :children) :children
-                 root
-                 :node->descriptor (fn [n] {:label (:title n)})))
+(ns tech.thomas-sojka.org-parser-tree.output
+  (:require [clojure.java.io :as io]
+            [clojure.pprint :as pp]
+            [rhizome.viz :as viz]))
+
+(defn store-tree [path data]
+  (binding [*print-level* nil
+            *print-length* nil]
+    (io/make-parents path)
+    (pp/pprint data (io/writer path))))
+
+(defn vizualize-tree [root]
+  (viz/view-tree (comp sequential? :children) :children
+                 root
+                 :node->descriptor (fn [n] {:label (:title n)})))

src/main/tech/thomas_sojka/org_parser_tree/output.clj renamed to src/tech/thomas_sojka/org_parser_tree/output.clj

@@ -1,46 +1,46 @@
-(ns tech.thomas-sojka.org-parser-tree.stratify
-  (:require [clojure.string :as str]
-            [clojure.zip :as z]))
-
-(defmulti stratify (fn [_ {:keys [type]}] type))
-(defmethod stratify :head-line [org-tree headline]
-  (let [previous-level (:level (z/node org-tree))
-        current-level (:level headline)]
-    (cond
-      (= previous-level current-level)
-      (-> org-tree
-          (z/insert-right (merge headline {:children []}))
-          z/rightmost)
-      :else
-      (let [next (apply comp (repeat (+ (- previous-level current-level) (if (> previous-level current-level) 1 0))
-                                     (if (> previous-level current-level) z/up z/down)))]
-        (-> org-tree
-            next
-            (z/append-child (merge headline {:children []}))
-            z/down
-            z/rightmost)))))
-(defn edit [org-tree & args] (apply z/edit org-tree update args))
-
-(defmethod stratify :list-item-line [org-tree list-item-line]
-  (edit org-tree :list (fn [list] (if (coll? list) (conj list (:list-item list-item-line)) [(:list-item list-item-line)]))))
-(defn property [property-content-line]
-  (let [[_ name value]
-        (re-find
-         #":(.*):\s(.*)"
-         property-content-line)]
-    (hash-map (keyword (str/trim name))
-              (str/trim value))))
-(defmethod stratify :content-line [org-tree {:keys [content]}]
-  (if (:drawer (z/node org-tree))
-    (z/replace org-tree (update-in (z/node org-tree) [:drawer :node-properties] merge (property content)))
-    (edit org-tree :content str content)))
-(defmethod stratify :drawer-begin-line [org-tree drawer-begin-line]
-  (z/replace org-tree (assoc (z/node org-tree) :drawer {:name (:drawer drawer-begin-line)
-                                                        :node-properties {}})))
-(defmethod stratify :drawer-end-line [org-tree _]
-  (let [node (z/node org-tree)]
-    (z/replace org-tree (-> node
-                            (assoc (:name (:drawer node)) (:node-properties (:drawer node)))
-                            (dissoc :drawer)))))
-(defmethod stratify :default [org-tree _] org-tree)
-
+(ns tech.thomas-sojka.org-parser-tree.stratify
+  (:require [clojure.string :as str]
+            [clojure.zip :as z]))
+
+(defmulti stratify (fn [_ {:keys [type]}] type))
+(defmethod stratify :head-line [org-tree headline]
+  (let [previous-level (:level (z/node org-tree))
+        current-level (:level headline)]
+    (cond
+      (= previous-level current-level)
+      (-> org-tree
+          (z/insert-right (merge headline {:children []}))
+          z/rightmost)
+      :else
+      (let [next (apply comp (repeat (+ (- previous-level current-level) (if (> previous-level current-level) 1 0))
+                                     (if (> previous-level current-level) z/up z/down)))]
+        (-> org-tree
+            next
+            (z/append-child (merge headline {:children []}))
+            z/down
+            z/rightmost)))))
+(defn edit [org-tree & args] (apply z/edit org-tree update args))
+
+(defmethod stratify :list-item-line [org-tree list-item-line]
+  (edit org-tree :list (fn [list] (if (coll? list) (conj list (:list-item list-item-line)) [(:list-item list-item-line)]))))
+(defn property [property-content-line]
+  (let [[_ name value]
+        (re-find
+         #":(.*):\s(.*)"
+         property-content-line)]
+    (hash-map (keyword (str/trim name))
+              (str/trim value))))
+(defmethod stratify :content-line [org-tree {:keys [content]}]
+  (if (:drawer (z/node org-tree))
+    (z/replace org-tree (update-in (z/node org-tree) [:drawer :node-properties] merge (property content)))
+    (edit org-tree :content str content)))
+(defmethod stratify :drawer-begin-line [org-tree drawer-begin-line]
+  (z/replace org-tree (assoc (z/node org-tree) :drawer {:name (:drawer drawer-begin-line)
+                                                        :node-properties {}})))
+(defmethod stratify :drawer-end-line [org-tree _]
+  (let [node (z/node org-tree)]
+    (z/replace org-tree (-> node
+                            (assoc (:name (:drawer node)) (:node-properties (:drawer node)))
+                            (dissoc :drawer)))))
+(defmethod stratify :default [org-tree _] org-tree)
+

src/main/tech/thomas_sojka/org_parser_tree/stratify.clj renamed to src/tech/thomas_sojka/org_parser_tree/stratify.clj

@@ -0,0 +1,16 @@
+(ns hello-word.core
+  (:require [clojure.zip :as z]
+            [tech.thomas-sojka.org-parser-tree.core :refer [parse-tree]]
+            [tech.thomas-sojka.org-parser-tree.stratify :refer [stratify]]
+            [tech.thomas-sojka.org-parser-tree.transform :refer [transform]]))
+
+(defmethod transform :keyword-line [[_ [_ keyword-key] [_ keyword-value]]]
+  {:type :keyword-line
+   :key keyword-key
+   :value keyword-value})
+
+(defmethod stratify :keyword-line [org-tree {:keys [key value]}]
+  (z/replace org-tree (assoc (z/node org-tree) :keywords {(keyword key) value})))
+
+(parse-tree "#+TAGS: WORK(w)
+* 2021")