From a5e968bb8d4c608c33463160ea2b583a3e34b8fc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 18 Sep 2017 13:57:25 -0400 Subject: add ExportTree table to export db New table needed to look up what filenames are used in the currently exported tree, for reasons explained in export.mdwn. Also, added smart constructors for ExportLocation and ExportDirectory to make sure they contain filepaths with the right direction slashes. And some code refactoring. This commit was sponsored by Francois Marier on Patreon. --- Types/Export.hs | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'Types') diff --git a/Types/Export.hs b/Types/Export.hs index cc1b8debf..0e86f9684 100644 --- a/Types/Export.hs +++ b/Types/Export.hs @@ -5,19 +5,41 @@ - Licensed under the GNU GPL version 3 or higher. -} -module Types.Export where +module Types.Export ( + ExportLocation, + mkExportLocation, + fromExportLocation, + ExportDirectory, + mkExportDirectory, + fromExportDirectory, + exportDirectories, +) where + +import Git.FilePath import qualified System.FilePath.Posix as Posix -- A location on a remote that a key can be exported to. -- The FilePath will be relative to the top of the export, --- and may contain unix-style path separators. +-- and uses unix-style path separators. newtype ExportLocation = ExportLocation FilePath deriving (Show, Eq) +mkExportLocation :: FilePath -> ExportLocation +mkExportLocation = ExportLocation . toInternalGitPath + +fromExportLocation :: ExportLocation -> FilePath +fromExportLocation (ExportLocation f) = f + newtype ExportDirectory = ExportDirectory FilePath deriving (Show, Eq) +mkExportDirectory :: FilePath -> ExportDirectory +mkExportDirectory = ExportDirectory . toInternalGitPath + +fromExportDirectory :: ExportDirectory -> FilePath +fromExportDirectory (ExportDirectory f) = f + -- | All subdirectories down to the ExportLocation, with the deepest ones -- last. Does not include the top of the export. exportDirectories :: ExportLocation -> [ExportDirectory] -- cgit v1.2.3