remove file based commands

Author: tiensonqin

src/main/frontend/commands.cljs

@@ -60,7 +60,7 @@
             [frontend.state :as state]
             [frontend.ui :as ui]
             [frontend.util :as util]
-            [frontend.util.file-based.clock :as clock]
+            [frontend.util.clock :as clock]
             [frontend.util.ref :as ref]
             [frontend.util.text :as text-util]
             [goog.dom :as gdom]

src/main/frontend/components/block.cljs

@@ -38,7 +38,6 @@
             [frontend.persist-db.browser :as db-browser]
             [frontend.state :as state]
             [frontend.util :as util]
-            [frontend.util.persist-var :as persist-var]
             [goog.object :as gobj]
             [lambdaisland.glogi :as log]
             [promesa.core :as p]))
@@ -193,10 +192,7 @@
                                    (reset! vector-search-flows/*infer-worker-ready true))))
                         nil))))
 
-     (util/<app-wake-up-from-sleep-loop (atom false))
-
-     (when-not (util/mobile?)
-       (persist-var/load-vars)))))
+     (util/<app-wake-up-from-sleep-loop (atom false)))))
 
 (defn stop! []
   (prn "stop!"))

src/main/frontend/handler.cljs

@@ -7,17 +7,14 @@
             [frontend.db :as db]
             [frontend.db.async :as db-async]
             [frontend.db.model :as db-model]
-            [frontend.handler.file-based.property.util :as property-util]
             [frontend.handler.property.util :as pu]
             [frontend.mobile.haptics :as haptics]
             [frontend.modules.outliner.op :as outliner-op]
             [frontend.modules.outliner.ui :as ui-outliner-tx]
             [frontend.state :as state]
             [frontend.util :as util]
-            [frontend.util.file-based.drawer :as drawer]
             [goog.object :as gobj]
             [logseq.db :as ldb]
-            [logseq.db.sqlite.util :as sqlite-util]
             [logseq.graph-parser.block :as gp-block]
             [logseq.outliner.core :as outliner-core]
             [logseq.outliner.op]
@@ -124,13 +121,6 @@
                            :container-id container-id :direction direction :event event :pos pos}))
     (mark-last-input-time! repo)))
 
-(defn sanity-block-content
-  [repo format content]
-  (if (sqlite-util/db-based-graph? repo)
-    content
-    (-> (property-util/remove-built-in-properties format content)
-        (drawer/remove-logbook))))
-
 (defn block-unique-title
   "Multiple pages/objects may have the same `:block/title`.
    Notice: this doesn't prevent for pages/objects that have the same tag or created by different clients."
@@ -205,8 +195,7 @@
                             content
 
                             :else
-                            (subs content 0 pos))
-               content (sanity-block-content repo (get block :block/format :markdown) content)]
+                            (subs content 0 pos))]
            (state/clear-selection!)
            (edit-block-aux repo block content text-range (assoc opts :pos pos))))))))
 

src/main/frontend/handler/block.cljs

@@ -41,7 +41,6 @@
             [frontend.template :as template]
             [frontend.util :as util]
             [frontend.util.cursor :as cursor]
-            [frontend.util.file-based.drawer :as drawer]
             [frontend.util.keycode :as keycode]
             [frontend.util.list :as list]
             [frontend.util.ref :as ref]
@@ -66,7 +65,6 @@
             [logseq.graph-parser.block :as gp-block]
             [logseq.graph-parser.mldoc :as gp-mldoc]
             [logseq.graph-parser.property :as gp-property]
-            [logseq.graph-parser.text :as text]
             [logseq.graph-parser.utf8 :as utf8]
             [logseq.outliner.core :as outliner-core]
             [logseq.outliner.property :as outliner-property]
@@ -287,17 +285,12 @@
   ([block value
     {:keys [force?]
      :as opts}]
-   (let [{:block/keys [uuid format repo title]} block
-         format (or format :markdown)
+   (let [{:block/keys [uuid format repo]} block
          repo (or repo (state/get-current-repo))
-         format (or format (state/get-preferred-format))
          block-id (let [properties (:block/properties block)]
                     (when (and (not (config/db-based-graph? repo)) (map? properties))
                       (get properties :id)))
-         content (if (config/db-based-graph? repo)
-                   (:block/title (db/entity (:db/id block)))
-                   (-> (property-file/remove-built-in-properties-when-file-based repo format title)
-                       (drawer/remove-logbook)))]
+         content (:block/title (db/entity (:db/id block)))]
      (cond
        (another-block-with-same-id-exists? uuid block-id)
        (notification/show!
@@ -710,32 +703,11 @@
       (when-let [edit-block (state/get-edit-block)]
         (let [edit-input-id (state/get-edit-input-id)
               current-input (gdom/getElement edit-input-id)]
-          (if (config/db-based-graph? (state/get-current-repo))
-            (when-let [block (db/entity (:db/id edit-block))]
-              (let [pos (state/get-edit-pos)]
-                (p/do!
-                 (ui-outliner-tx/transact!
-                  {:outliner-op :cycle-todos}
-                  (db-based-cycle-todo! block))
-
-                 ;; FIXME: don't change current editor's position
-                 )))
-            (let [content (state/get-edit-content)
-                  format (or (db/get-page-format (state/get-current-page))
-                             (state/get-preferred-format))
-                  [new-content marker] (status/cycle-marker content nil nil format (state/get-preferred-workflow))
-                  new-pos (commands/compute-pos-delta-when-change-marker
-                           content marker (cursor/pos current-input))]
-              (state/set-edit-content! edit-input-id new-content)
-              (cursor/move-cursor-to current-input new-pos))))))))
-
-(defn set-priority
-  [{:block/keys [priority title] :as block} new-priority]
-  (when-not (config/db-based-graph? (state/get-current-repo))
-    (let [new-content (string/replace-first title
-                                            (util/format "[#%s]" priority)
-                                            (util/format "[#%s]" new-priority))]
-      (save-block-if-changed! block new-content))))
+          (when-let [block (db/entity (:db/id edit-block))]
+            (let [pos (state/get-edit-pos)]
+              (ui-outliner-tx/transact!
+               {:outliner-op :cycle-todos}
+               (db-based-cycle-todo! block)))))))))
 
 (defn delete-block-aux!
   [{:block/keys [uuid] :as _block}]
@@ -755,19 +727,10 @@
           {:prev-block sibling-entity
            :new-value (:block/title sibling-entity)
            :edit-block-f #(edit-block! sibling-entity :max)}
-          (let [db? (config/db-based-graph? repo)
-                original-content (if (= (:db/id sibling-entity) (:db/id (state/get-edit-block)))
+          (let [original-content (if (= (:db/id sibling-entity) (:db/id (state/get-edit-block)))
                                    (state/get-edit-content)
                                    (:block/title sibling-entity))
-                value' (if db?
-                         original-content
-                         (-> (property-file/remove-built-in-properties-when-file-based repo format original-content)
-                             (drawer/remove-logbook)))
-                value (if db?
-                        value
-                        (->> value
-                             (property-file/remove-properties-when-file-based repo format)
-                             (drawer/remove-logbook)))
+                value' original-content
                 new-value (str value' value)
                 tail-len (count value)
                 pos (max
@@ -1453,15 +1416,6 @@
            (js/console.error error)
            (log/error :save-block-failed error)))))))
 
-(defn- clean-content!
-  [repo format content]
-  (if (config/db-based-graph? repo)
-    content
-    (some->> (text/remove-level-spaces content format (config/get-block-pattern format))
-             (drawer/remove-logbook)
-             (property-file/remove-properties-when-file-based repo format)
-             string/trim)))
-
 (defn delete-asset-of-block!
   [{:keys [repo asset-block href full-text block-id local? delete-local?] :as _opts}]
   (let [block (db-model/query-block-by-uuid block-id)
@@ -2629,8 +2583,7 @@
              (when (and
                     uuid
                     (not (state/block-component-editing?))
-                    (not= (clean-content! repo format title)
-                          (string/trim value)))
+                    (not= title (string/trim value)))
                (save-block! repo uuid value))
 
              (cond
@@ -2699,7 +2652,7 @@
     (when sibling-block
       (let [content (:block/title block)
             value (state/get-edit-content)]
-        (when (and value (not= (clean-content! repo format content) (string/trim value)))
+        (when (and value (not= content (string/trim value)))
           (save-block! repo uuid value)))
       (let [sibling-block-id (dom/attr sibling-block "blockid")]
         (cond
@@ -3869,19 +3822,15 @@
 
 (defn replace-block-reference-with-content-at-point
   []
-  (let [repo (state/get-current-repo)]
-    (when-let [{:keys [start end link]} (thingatpt/block-ref-at-point)]
-      (when-let [block (db/entity [:block/uuid link])]
-        (let [block-content (:block/title block)
-              format (get block :block/format :markdown)
-              block-content-without-prop (-> (property-file/remove-properties-when-file-based repo format block-content)
-                                             (drawer/remove-logbook))]
-          (when-let [input (state/get-input)]
-            (when-let [current-block-content (gobj/get input "value")]
-              (let [block-content* (str (subs current-block-content 0 start)
-                                        block-content-without-prop
-                                        (subs current-block-content end))]
-                (state/set-block-content-and-last-pos! input block-content* 1)))))))))
+  (when-let [{:keys [start end link]} (thingatpt/block-ref-at-point)]
+    (when-let [block (db/entity [:block/uuid link])]
+      (let [block-content (:block/title block)]
+        (when-let [input (state/get-input)]
+          (when-let [current-block-content (gobj/get input "value")]
+            (let [block-content* (str (subs current-block-content 0 start)
+                                      block-content
+                                      (subs current-block-content end))]
+              (state/set-block-content-and-last-pos! input block-content* 1))))))))
 
 (defn copy-current-ref
   [block-id]
@@ -3903,13 +3852,9 @@
 (defn replace-ref-with-text!
   [block ref-id]
   (when (and block ref-id)
-    (let [repo (state/get-current-repo)
-          match (ref/->block-ref ref-id)
+    (let [match (ref/->block-ref ref-id)
           ref-block (db/entity [:block/uuid ref-id])
-          block-ref-content (->> (or (:block/title ref-block) "")
-                                 (property-file/remove-built-in-properties-when-file-based repo
-                                                                                           (get ref-block :block/format :markdown))
-                                 (drawer/remove-logbook))
+          block-ref-content (or (:block/title ref-block) "")
           content (string/replace-first (:block/title block) match
                                         block-ref-content)]
       (save-block! (state/get-current-repo)

src/main/frontend/handler/editor.cljs

@@ -0,0 +1,47 @@
+(ns frontend.util.clock
+  "Provides clock related functionality used by tasks"
+  (:require [frontend.util :as util]))
+
+(defn s->dhms-util
+  "A function that returns the values for easier testing.
+   Always in the order [days, hours, minutes, seconds]"
+  [seconds]
+  (let [days (quot (quot seconds 3600) 24)
+        n (mod seconds (* 24 3600))
+        hours (quot n 3600)
+        n (mod n 3600)
+        minutes (quot n 60)
+        secs (mod n 60)]
+    [days hours minutes secs]))
+
+(defn seconds->days:hours:minutes:seconds
+  [seconds]
+  (let [[days hours minutes seconds] (s->dhms-util seconds)]
+    (cond
+      (> days 0)
+      (util/format "%s%s"
+                   (if (zero? days) "" (str days "d"))
+                   (if (zero? hours) "" (str hours "h")))
+
+      (> minutes 0)
+      (util/format "%s%s"
+                   (if (zero? hours) "" (str hours "h"))
+                   (if (zero? minutes) "" (str minutes "m")))
+      :else
+      (if (> seconds 0)
+        (str seconds "s")
+        ""))))
+
+(comment
+  (defn minutes->hours:minutes
+    [minutes]
+    (let [hours (quot minutes 60)
+          minutes (mod minutes 60)]
+      (util/format "%02d:%02d" hours minutes)))
+
+  (defn seconds->hours:minutes:seconds
+    [seconds]
+    (let [hours (quot seconds 3600)
+          minutes (quot (- seconds (* hours 3600)) 60)
+          seconds (mod seconds 60)]
+      (util/format "%02d:%02d:%02d" hours minutes seconds))))