refactor: move function around

srid · Dec 7, 2023 · 1fdeded · 1fdeded
1 parent fc1bc7a
commit 1fdeded
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/emanote/src/Emanote/Model/Graph.hs b/emanote/src/Emanote/Model/Graph.hs
@@ -11,7 +11,7 @@ import Emanote.Model.Link.Rel qualified as Rel
 import Emanote.Model.Link.Resolve qualified as Resolve
 import Emanote.Model.Meta (lookupRouteMeta)
 import Emanote.Model.Note qualified as MN
-import Emanote.Model.Type (Model, modelRels, resolveLmlRoute)
+import Emanote.Model.Type (Model, modelRels, parentLmlRoute)
 import Emanote.Route qualified as R
 import Emanote.Route.ModelRoute (ModelRoute)
 import Optics.Operators as Lens ((^.))
@@ -76,22 +76,6 @@ folgezettelParentsFor model r = do
       Rel.RRTFound x -> Just x
       _ -> Nothing
 
-{- | Return the route to parent folder (unless indexRoute is passed).
-
-  This will return the existing note (.org or .md) if possible. Otherwise
-  fallback to .md even if missing.
--}
-parentLmlRoute :: Model -> R.LMLRoute -> Maybe R.LMLRoute
-parentLmlRoute model r = do
-  pr <- do
-    let lmlR = R.lmlRouteCase r
-    -- Root index do not have a parent folder.
-    guard $ lmlR /= Left R.indexRoute && lmlR /= Right R.indexRoute
-    -- Consider the index route as parent folder for all
-    -- top-level notes.
-    pure $ fromMaybe R.indexRoute $ R.withLmlRoute R.routeParent r
-  pure $ resolveLmlRoute model . coerce $ pr
-
 modelLookupBacklinks :: ModelRoute -> Model -> [(R.LMLRoute, NonEmpty [B.Block])]
 modelLookupBacklinks r model =
   sortOn (Calendar.backlinkSortKey model . fst) $

diff --git a/emanote/src/Emanote/Model/Type.hs b/emanote/src/Emanote/Model/Type.hs
@@ -329,3 +329,19 @@ resolveLmlRouteIfExists notes r = do
       , N.lookupNotesByRoute (R.LMLRoute_Md $ coerce r) notes
       ]
   pure $ note ^. N.noteRoute
+
+{- | Return the route to parent folder (unless indexRoute is passed).
+
+  This will return the existing note (.org or .md) if possible. Otherwise
+  fallback to .md even if missing.
+-}
+parentLmlRoute :: Model -> R.LMLRoute -> Maybe R.LMLRoute
+parentLmlRoute model r = do
+  pr <- do
+    let lmlR = R.lmlRouteCase r
+    -- Root index do not have a parent folder.
+    guard $ lmlR /= Left R.indexRoute && lmlR /= Right R.indexRoute
+    -- Consider the index route as parent folder for all
+    -- top-level notes.
+    pure $ fromMaybe R.indexRoute $ R.withLmlRoute R.routeParent r
+  pure $ resolveLmlRoute model . coerce $ pr
diff --git a/emanote/src/Emanote/View/Export.hs b/emanote/src/Emanote/View/Export.hs
@@ -11,7 +11,6 @@ import Data.Aeson qualified as Aeson
 import Data.Map.Strict qualified as Map
 import Emanote.Model (Model)
 import Emanote.Model qualified as M
-import Emanote.Model.Graph qualified as G
 import Emanote.Model.Link.Rel qualified as Rel
 import Emanote.Model.Link.Resolve qualified as Resolve
 import Emanote.Model.Title qualified as Tit
@@ -62,7 +61,7 @@ renderJSONExport model =
                  in SourceFile
                       (Tit.toPlain tit)
                       k
-                      (toText . lmlSourcePath <$> G.parentLmlRoute model r)
+                      (toText . lmlSourcePath <$> M.parentLmlRoute model r)
                       (SR.siteRouteUrl model $ lmlSiteRoute (R.LMLView_Html, r))
                       meta_
                       (fromMaybe [] $ Map.lookup k rels)