diff options
author | 2025-02-19 17:36:34 +0100 | |
---|---|---|
committer | 2025-02-19 17:36:34 +0100 | |
commit | d0d1215913dbdd44b62cf584100a9db18aaf83b2 (patch) | |
tree | dc90ef41dd679712dcd5a809560a5818ccaa7839 /common | |
parent | 1cd156c349d508f5e4638de0fc6370c30b0ac01d (diff) |
fix frontend build
Diffstat (limited to 'common')
-rw-r--r-- | common/common.cabal | 1 | ||||
-rw-r--r-- | common/src/Collection.hs | 14 |
2 files changed, 9 insertions, 6 deletions
diff --git a/common/common.cabal b/common/common.cabal index 2c98a47..d67e5d6 100644 --- a/common/common.cabal +++ b/common/common.cabal @@ -18,5 +18,6 @@ library build-depends: aeson, base, + miso, split, text diff --git a/common/src/Collection.hs b/common/src/Collection.hs index a23fd31..25cdec7 100644 --- a/common/src/Collection.hs +++ b/common/src/Collection.hs @@ -1,24 +1,26 @@ -{-# LANGUAGE RecordWildCards #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE RecordWildCards #-} {-# LANGUAGE ViewPatterns #-} + module Collection where -import Data.Text qualified as T +import Miso.String (MisoString, toMisoString) import Text.ParserCombinators.ReadP qualified as R import Text.ParserCombinators.ReadPrec qualified as R import Text.Read (Read (..)) -newtype Collection = Collection {name :: T.Text} +newtype Collection = Collection {name :: MisoString} deriving (Read, Eq, Show) data CollectionItem = CollectionItem { collection :: Collection, itemFileName :: FilePath - } deriving (Eq) + } + deriving (Eq) instance Read CollectionItem where readPrec = R.lift $ do - (Collection . T.pack -> collection) <- R.munch (/= '/') + (Collection . toMisoString -> collection) <- R.munch (/= '/') _ <- R.string "/" itemFileName <- do itemFileName <- R.munch (liftA2 (&&) (/= '.') (/= '/')) @@ -28,4 +30,4 @@ instance Read CollectionItem where instance Show CollectionItem where show (CollectionItem {collection = Collection cn, itemFileName}) = - show (cn <> "/" <> T.pack itemFileName) + show (cn <> "/" <> toMisoString itemFileName) |