Correct directory reader

dspearson · May 29, 2023 · 7fe5faf · 7fe5faf
1 parent 8e60c2a
commit 7fe5faf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/src/phlegyas/sql/nodes.sql b/src/phlegyas/sql/nodes.sql
@@ -5,6 +5,7 @@
 create table nodes (
     parent blob not null,
     handler text not null,
+    dev integer not null default 0,
     type integer not null,
     vers integer not null,
     path blob primary key,
@@ -23,6 +24,7 @@ create table nodes (
 -- :doc Inserts node
 insert into nodes (parent,
                    handler,
+                   dev,
                    type,
                    vers,
                    path,
@@ -36,6 +38,7 @@ insert into nodes (parent,
                    muid)
 values (:parent,
         :handler,
+        :dev,
         :qid-type,
         :qid-vers,
         :qid-path,

diff --git a/src/phlegyas/sqlitefs.clj b/src/phlegyas/sqlitefs.clj
@@ -17,6 +17,7 @@
   (let [uuid  (uuid!)
         birth (epoch!)]
     {:qid-path uuid
+     :dev      0
      :handler  handler
      :qid-type (:dir qt-mode)
      :qid-vers 0
@@ -110,7 +111,6 @@
            last-path       nil
            data-size       0
            paths-remaining (get-directory-contents system directory)]
-      (println "iterating")
       (cond
         (> data-size max-size)
         [(-> accum rest flatten pack)
@@ -124,14 +124,8 @@
 
         :else
         (let [stat (first paths-remaining)
-              _ (println "Keys:" (keys stat))
-              data (for [typ layout] ((get put-operation typ) (get stat typ)))]
-          (println "In loop")
-          (println "First stat:" stat)
-          (println "Type of data:" (type data))
-          (clojure.pprint/pprint data)
-          (println "Count:" (count data))
-          (println "ok")
+              data (for [typ layout]
+                     ((get put-operation typ) (get stat typ)))]
           (recur (conj accum data)
                  (:qid-path stat)
                  (+ data-size (count data))

diff --git a/test/phlegyas/sqlitefs_test.clj b/test/phlegyas/sqlitefs_test.clj
@@ -34,8 +34,7 @@
           directory-contents (vfs/get-directory-contents system root-directory)
           _                  (println (first directory-contents))
           dir                (vfs/directory-reader system root-directory 8192)]
-      ;; FIXME: ^ dir read fails, run in non test context to debug
-
+      (println "Dir:" dir)
       (testing "Directory is successfully inserted and retrievable"
         (is (uuid= (:path sub-directory-1)
                    (:path fetched-directory))))